Skip to content

Conversation

@df7cb
Copy link
Contributor

@df7cb df7cb commented Oct 29, 2022

PG15 removes this header, and it doesn't seem necessary on PG10 either, so remove it unconditionally.

@wieck: This is the build problem I mentioned at pgconf.eu.

PG15 removes this header, and it doesn't seem necessary on PG10 either,
so remove it unconditionally.
@ssinger
Copy link
Owner

ssinger commented Oct 29, 2022

@df7cb Thanks.
I had fixed this a few weeks ago on the REL_2_2_STABLE branch, I just hadn't merged it back to master.
I've now done that.
Versions of PG < 10 still require the include though.

@ssinger
Copy link
Owner

ssinger commented Oct 29, 2022

If there is desire/interest to release a 2.2.11 with this I can do that.

@df7cb
Copy link
Contributor Author

df7cb commented Oct 29, 2022

If there is desire/interest to release a 2.2.11 with this I can do that.

That would be nice so I can sync the Debian package.

@ssinger
Copy link
Owner

ssinger commented Oct 31, 2022

@df7cb Do you build the slony documentation as part of packaging or just use the generated -docs tar we put on the website? If your building them which of pg_autodoc are you using to build slony? (or are you using the
Historically I feel like I've used the version that shipped with debian <=10 which I think is autodoc 1.40 and is very old.

I think more recent debian versions are maybe using https://salsa.debian.org/debian/postgresql-autodoc/ which appears to be imported from https://github.com/cbbrowne/autodoc maybe sometime in the past few years and claims to be 1.41

1.40 doesn't work wth PG >11
1.41 doesn't seem to place nicely with some of the SGML in the slony docs.

If I change things to require the newer postgres_autodoc will the help,hurt, or make no difference.

@df7cb
Copy link
Contributor Author

df7cb commented Oct 31, 2022

Hmm, it's been a while since I last looked at the details of the package.

The current package uses this:
Build-Depends: bison, debhelper-compat (= 10), docbook (>= 4.2), docbook-dsssl, docbook-utils, docbook-xml (>= 4.2), docbook2x (>= 0.8.8-4), flex, ghostscript, groff, libjpeg-turbo-progs | libjpeg-progs, libpq-dev, netpbm, openjade, opensp, postgresql-server-dev-all (>= 148~)
so pg-autodoc isn't involved.

The build log is this:

make[3]: Entering directory '/<<PKGBUILDDIR>>/doc'
make[4]: Entering directory '/<<PKGBUILDDIR>>/doc/adminguide'
LC_ALL=C /usr/bin/perl /usr/bin/collateindex.pl -f -g -o bookindex.sgml -N -i 'bookindex'
{ \
echo "<!entity version \"2.2.10\">"; \
echo "<!entity majorversion \"`expr 2.2.10 : '\([0-9][0-9]*\.[0-9][0-9]*\)'`\">"; \
} >version.sgml
sed 's,/>,>,g' schemadoc.xml >schemadoc.sgml
osx  -x lower slony.sgml | \
  sed -e 's/\[\(lt\|gt\|amp\|nbsp\|copy\|quot\|ouml\|uuml\|egrave\) *\]/\&\1;/g' \
      -e '1a\' -e '<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">' \
  >slony.xml
docbook2x-man slony.xml
error : xmlAddEntity: invalid redeclaration of predefined entity
docbook2man://qandaentry[@id='missingoids']: Erroneous request for title for this element
docbook2man://qandaentry[@id='missingoids']: Erroneous request for title for this element
mkdir -p man1 man7
mv *.1 man1/
mv *.7 man7/
make html
make[5]: Entering directory '/<<PKGBUILDDIR>>/doc/adminguide'
make[5]: Circular HTML.index <- html dependency dropped.
LC_ALL=C /usr/bin/perl /usr/bin/collateindex.pl -f -g -i 'bookindex' -o bookindex.sgml HTML.index
Processing HTML.index...
171 entries loaded...
0 entries ignored...
Done.
make[5]: Leaving directory '/<<PKGBUILDDIR>>/doc/adminguide'
make[4]: Leaving directory '/<<PKGBUILDDIR>>/doc/adminguide'
make[3]: Leaving directory '/<<PKGBUILDDIR>>/doc'
All of Slony-I is successfully made. Ready to install
make[2]: Leaving directory '/<<PKGBUILDDIR>>'

Not sure what that means with the question of which files from doc/ are shipped unmodified from the tarball from http://www.slony.info/downloads/2.2/source/, and which we are rebuilding.

The list of files in the -doc package is this:
https://packages.debian.org/sid/all/slony1-2-doc/filelist

... but overall, if the doc package breaks we can probably fix it, or perhaps go without it on the Debian side. That shouldn't stop a new release.

@ssinger
Copy link
Owner

ssinger commented Oct 31, 2022

https://www.slony.info/downloads/2.2/source/slony1-2.2.10-docs.tar.bz2 Is an example of what I mean by the docs from the website
but it looks like the generated doc files are also included in the slony1-2.2.10.tar.bz2 files

This answers my question, your using the docs .html files I generate as part of packaging.

@ssinger
Copy link
Owner

ssinger commented Oct 31, 2022

This answers my question, your using the docs .html files I generate as part of packaging.

well for SOME of the files, but other parts of the doc get generated from that.
This is kind of messy but a problem for another day I guess.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants