tags 310763 + patch thanks Hi,
A complete patch is attached to fix the build problems. Although the changelog says I've NMU'd it, I haven't uploaded it yet, since I thought you might prefer to check it yourself. If you like, I can NMU it. I'd just like to note that the bulk of the diff was the hard work of the jade maintainer, Neil Roeth. The files are here: http://people.debian.org/~rleigh/gnupg-doc_2003.04.06.orig.tar.gz http://people.debian.org/~rleigh/gnupg-doc_2003.04.06-3.diff.gz http://people.debian.org/~rleigh/gnupg-doc_2003.04.06-3.dsc http://people.debian.org/~rleigh/gnupg-doc_2003.04.06-3.1_all.deb http://people.debian.org/~rleigh/gnupg-doc_2003.04.06-3.1_powerpc.changes http://people.debian.org/~rleigh/gnupg-doc_2003.04.06-3.1_20050601-1435 [build log] Here's the patch: diff -urN gnupg-doc-2003.04.06.old/debian/changelog gnupg-doc-2003.04.06/debian/changelog --- gnupg-doc-2003.04.06.old/debian/changelog 2005-06-01 12:16:22.000000000 +0100 +++ gnupg-doc-2003.04.06/debian/changelog 2005-06-01 14:10:06.001009984 +0100 @@ -1,3 +1,19 @@ +gnupg-doc (2003.04.06-3.1) unstable; urgency=high + + * Non-maintainer upload. + * gph/db2any: + - Fix jadetex checks by searching for "(^e-TeX|^TeX)" rather than + "^TeX", to work with both old and new jadetex versions. + - Applied patch from Neil Roeth to use openjade rather than jade. + - The remaining changes are to complete the change to openjade. + Closes: #310763 + * Updated build dependencies to depend on openjade1.3 and opensp, + rather than jade. + * debian/doc-base-gnu-privacy-handbook-it: Correct invalid doc-base URL. + * gph/common/rules.am: Clean manual.out files generated during the build. + + -- Roger Leigh <[EMAIL PROTECTED]> Wed, 1 Jun 2005 14:07:39 +0100 + gnupg-doc (2003.04.06-3) unstable; urgency=low * gph/db2any: add '/usr/share/sgml/docbook/stylesheet/dsssl/modular' as diff -urN gnupg-doc-2003.04.06.old/debian/control gnupg-doc-2003.04.06/debian/control --- gnupg-doc-2003.04.06.old/debian/control 2005-06-01 12:16:22.000000000 +0100 +++ gnupg-doc-2003.04.06/debian/control 2005-06-01 12:23:45.702962720 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: James Troup <[EMAIL PROTECTED]> Standards-Version: 3.5.9.0 -Build-Depends-Indep: sgmltools-lite, docbook-to-man, docbook-utils, autoconf, automake, linuxdoc-tools-latex, linuxdoc-tools-text, imagemagick, w3m, jade +Build-Depends-Indep: sgmltools-lite, docbook-to-man, docbook-utils, autoconf, automake, linuxdoc-tools-latex, linuxdoc-tools-text, imagemagick, w3m, openjade1.3, opensp Package: gnupg-doc Architecture: all diff -urN gnupg-doc-2003.04.06.old/debian/doc-base-gnu-privacy-handbook-it gnupg-doc-2003.04.06/debian/doc-base-gnu-privacy-handbook-it --- gnupg-doc-2003.04.06.old/debian/doc-base-gnu-privacy-handbook-it 2005-06-01 12:16:22.000000000 +0100 +++ gnupg-doc-2003.04.06/debian/doc-base-gnu-privacy-handbook-it 2005-06-01 13:36:47.802782288 +0100 @@ -8,5 +8,5 @@ Files: /usr/share/doc/gnupg-doc/GNU_Privacy_Handbook/it/manual.txt.gz Format: HTML -Index: /usr/share/doc/gnupg-doc/GNU_Privacy_Handbook/it/html/index.html +Index: /usr/share/doc/gnupg-doc/GNU_Privacy_Handbook/it/html/book1.html Files: /usr/share/doc/gnupg-doc/GNU_Privacy_Handbook/it/html/*.html diff -urN gnupg-doc-2003.04.06.old/gph/common/rules.am gnupg-doc-2003.04.06/gph/common/rules.am --- gnupg-doc-2003.04.06.old/gph/common/rules.am 2001-04-27 17:08:40.000000000 +0100 +++ gnupg-doc-2003.04.06/gph/common/rules.am 2005-06-01 13:25:33.775250048 +0100 @@ -11,3 +11,5 @@ %.texi : %.sgml $(DB2ANY) --mode texinfo $< + +CLEANFILES = manual.out diff -urN gnupg-doc-2003.04.06.old/gph/db2any gnupg-doc-2003.04.06/gph/db2any --- gnupg-doc-2003.04.06.old/gph/db2any 2005-06-01 12:16:22.000000000 +0100 +++ gnupg-doc-2003.04.06/gph/db2any 2005-06-01 12:18:56.815880232 +0100 @@ -221,17 +221,17 @@ # running on and where the Docbook tools are installed. # Tell about it when running in verbose mode. do_systemcheck () { - # look for Jade - jade_version=`jade -v </dev/null 2>&1 | \ - sed -n 's/.*:I:.*Jade version "\([0-9.]*\)"/\1/p'` + # look for OpenJade + jade_version=`openjade -v </dev/null 2>&1 | \ + sed -n 's/.*:I:.*\"openjade\" version "\([0-9.]*\)"/\1/p'` if [ -z "$jade_version" ]; then - echo "$pgm: error: jade not found" >&2 + echo "$pgm: error: openjade not found" >&2 exit 1 fi - [ $verbose = yes ] && echo "$pgm: Jade version $jade_version found" >&2 + [ $verbose = yes ] && echo "$pgm: OpenJade version $jade_version found" >&2 # look for JadeTeX - if ! jadetex -v 2>/dev/null | grep -q '^TeX' ; then + if ! jadetex -v 2>/dev/null | grep -q -E '(^e-TeX|^TeX)' ; then echo "$pgm: error: jadetex not found" >&2 exit 1 fi @@ -250,11 +250,11 @@ exit 1 fi [ $verbose = yes ] && echo "$pgm: docbook2texi found" >&2 - if ! sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then - echo "$pgm: error: sgml2xml not found" >&2 + if ! osx -v /dev/null 2>&1 | grep '"OpenSP" version' >/dev/null 2>&1 ; then + echo "$pgm: error: osx not found" >&2 exit 1 fi - [ $verbose = yes ] && echo "$pgm: sgml2xml found" >&2 + [ $verbose = yes ] && echo "$pgm: osx found" >&2 # figure out where our stylesheets are tex_stylesheet=none @@ -299,8 +299,8 @@ # --nosplts creates just one HTML file if test $nosplit = yes; then - echo "running jade on '$input' ..." >&2 - jade -d $tmpstyle -t sgml -i html -V nochunks $input > $output + echo "running openjade on '$input' ..." >&2 + openjade -d $tmpstyle -t sgml -i html -V '(define %html-ext% ".html")' -V nochunks $input > $output echo "$output created" return 0 fi @@ -336,15 +336,15 @@ inp="$input" fi - [ $verbose = yes ] && echo "running jade on '$inp' ..." >&2 - (cd $outputdir && jade -t sgml -i html -d $tmpstyle $inp ) + [ $verbose = yes ] && echo "running openjade on '$inp' ..." >&2 + (cd $outputdir && openjade -t sgml -i html -V '(define %html-ext% ".html")' -d $tmpstyle $inp ) [ $verbose = yes ] && echo "html version in '$outputdir' created" >&2 # break out all filerefs and copy them to the outputdirectory # fixme: handling of path components is wrong if test $copyfiles = yes; then echo "looking for filerefs ..." >&2 - for file in `nsgmls -i html $input \ + for file in `onsgmls -i html $input \ | awk '/^AFILEREF[ \t]+CDATA/ {print $3}'`; do d=$outputdir/`basename $file` if cat $file > $outputdir/`basename $file` ; then @@ -397,10 +397,10 @@ else tmpstyle="$tex_stylesheet" fi - [ $verbose = yes ] && echo "running jade on '$input' ..." >&2 - jade -t tex -i tex -d $tmpstyle $input + [ $verbose = yes ] && echo "running openjade on '$input' ..." >&2 + openjade -t tex -i tex -d $tmpstyle $input if ! tail $texfile | grep -q '\\endFOT{}'; then - echo "Jade failed" >&2 + echo "OpenJade failed" >&2 exit 1 fi @@ -436,8 +436,8 @@ output="`basename $input| sed 's/\.sgml$/.texi/'`" tmpxml="`basename $input| sed 's/\.sgml$/.xml/'`" - [ $verbose = yes ] && echo "running sgml2xml on '$input' ..." >&2 - sgml2xml -x lower $input > $tmpxml + [ $verbose = yes ] && echo "running osx on '$input' ..." >&2 + osx -x lower $input > $tmpxml [ $verbose = yes ] && echo "running docbook2texi on '$tmpxml' ..." >&2 docbook2texi $tmpxml | sed 's,--,---,' >$output rm $tmpxml @@ -470,7 +470,7 @@ case $mode in check) - nsgmls -vs $input + onsgmls -vs $input exit $? ;; html) Regards, Roger -- Roger Leigh Printing on GNU/Linux? http://gimp-print.sourceforge.net/ Debian GNU/Linux http://www.debian.org/ GPG Public Key: 0x25BFB848. Please sign and encrypt your mail. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
