diff options
Diffstat (limited to 'source/ap/linuxdoc-tools')
10 files changed, 145 insertions, 1893 deletions
diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt index cf2cf9a20..23ce0aa37 100644 --- a/source/ap/linuxdoc-tools/ChangeLog.txt +++ b/source/ap/linuxdoc-tools/ChangeLog.txt @@ -1,3 +1,35 @@ +Fri Aug 14 09:23:02 BST 2015 + Stuart Winter <mozes@slackware.com> + linuxdoc-tools 0.9.69, build 4. + * Upgraded to gtk-doc-1.24 + * Moved from i486 to i586 target on Intel 32bit + +Mon Apr 27 21:07:41 BST 2015 + Stuart Winter <mozes@slackware.com> + linuxdoc-tools 0.9.69, build 3. + * Upgraded to asciidoc-8.6.9 + * Upgraded to gtk-doc-1.21 + * linuxdoc-tools: Removed dead code to copy 'sgml2{txt,latex,info}' in to + /usr/bin. These used to be supplied as shell wrappers, but the 'make install' + now creates symlinks to 'linuxdoc'. + +Tue Jul 15 08:57:22 BST 2014 + Stuart Winter <mozes@slackware.com> + linuxdoc-tools 0.9.69, build 2. + * The latest Debian patch set for libsgmls renamed /usr/bin/sgmlspl + to /usr/bin/sgmlspl.pl to match their own source management requirements. + This file has been renamed back to /usr/bin/sgmlspl + Thanks to Matteo Bernardini for the report. + +Fri May 16 00:50:09 BST 2014 + Stuart Winter <mozes@slackware.com> + linuxdoc-tools 0.9.69, build 1. + * Upgraded to linuxdoc-tools-0.9.69 + * Upgraded to gtk-doc-1.20 + * Upgraded to xmlto-0.0.26 + * Updated build script to cater for some small changes in source archive + presentation. + Sun Jun 23 20:56:24 BST 2013 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.68, build 4. diff --git a/source/ap/linuxdoc-tools/arm/build b/source/ap/linuxdoc-tools/arm/build index f217b40f9..a4a6410a9 100755 --- a/source/ap/linuxdoc-tools/arm/build +++ b/source/ap/linuxdoc-tools/arm/build @@ -9,12 +9,12 @@ source /usr/share/slackdev/buildkit.sh # Package metadata: export PKGNAM=linuxdoc-tools -export VERSION=${VERSION:-0.9.68} +export VERSION=${VERSION:-0.9.69} export PKGARCH=${PKGARCH:-arm} export BUILD=${BUILD:-4} export PKGSERIES=${PKGSERIES:-ap} -export SLACKPACKAGE=$PKGNAM-$VERSION-$PKGARCH-$BUILD.tgz -export PKGEXT=${PKGEXT:-tgz} +export SLACKPACKAGE=$PKGNAM-$VERSION-$PKGARCH-$BUILD.txz +export PKGEXT=${PKGEXT:-txz} # Ensure base ARM packages are installed first: slackbasedeps @@ -26,13 +26,13 @@ slackfailpkgdeps $PKGNAM || removepkg $PKGNAM # There are many more dependencies but these are the core ones I picked out # as I was building the software included within this package. # -#slackcheckpkgdeps libxml2 || installpkg $PKGSTORE/l/libxml2-*.tgz +#slackcheckpkgdeps libxml2 || installpkg $PKGSTORE/l/libxml2-*.t?z # to unpack some SRPMs: -#slackcheckpkgdeps rpm || installpkg $PKGSTORE/ap/rpm-*.tgz +#slackcheckpkgdeps rpm || installpkg $PKGSTORE/ap/rpm-*.t?z # for OpenJade: -#slackcheckpkgdeps tetex || installpkg $PKGSTORE/t/tetex-[0-9]*.tgz +#slackcheckpkgdeps tetex || installpkg $PKGSTORE/t/tetex-[0-9]*.t?z # for AsciiDoc: -#slackcheckpkgdeps python || installpkg $PKGSTORE/d/python-[0-9]*.tgz +#slackcheckpkgdeps python || installpkg $PKGSTORE/d/python-[0-9]*.t?z # Ensure the packages are installed; exit if not. #slackcheckpkgdeps python,libxml2,rpm,tetex || exit 99 @@ -40,7 +40,7 @@ slackfailpkgdeps $PKGNAM || removepkg $PKGNAM altertrackprep # Launch the package build script: -BUILDLOG=$( basename $SLACKPACKAGE .tgz ).build.log +BUILDLOG=$( basename $SLACKPACKAGE .t?z ).build.log # ( ./$PKGNAM.SlackBuild ) >& /dev/stdout | tee $BUILDLOG ( ./trackbuild.$PKGNAM ) >& /dev/stdout | tee $BUILDLOG diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build index 520e8a2a5..2cf8aca9a 100755 --- a/source/ap/linuxdoc-tools/linuxdoc-tools.build +++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build @@ -17,7 +17,7 @@ LINUXDOCTOOLSVER=$PKGVERSION # Bundled package versions: -ASCIIDOCVER=8.6.8 +ASCIIDOCVER=8.6.9 DSSSLSTYLESHEETSVER=1.79 XSLSTYLESHEETSVER=1.78.1 DOCBOOKUTILSVER=0.6.14 @@ -25,12 +25,12 @@ SGMLDTD3VER=3.1 SGMLDTD4VER=4.5 XMLDTDVER=4.5 GNOMEDOCUTILSVER=0.20.10 -GTKDOCVER=1.19 +GTKDOCVER=1.24 SGMLSPLVER=1.03ii OPENJADEVER=1.3.3-pre1 OPENSPVER=1.5.2 SGMLCOMMONVER=0.6.3 -XMLTOVER=0.0.25 +XMLTOVER=0.0.26 DOCBOOK2XVER=0.8.8 # Determine the general CFLAGS for the known architectures: @@ -43,7 +43,7 @@ case $ARCH in export LIBDIRSUFFIX="" export HOSTTARGET="-gnueabi" ;; - i486) export SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i586) export SLKCFLAGS="-O2 -march=i586 -mtune=i686" export LIBDIRSUFFIX="" export HOSTTARGET="" ;; @@ -75,9 +75,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Revert a change that breaks processing the git documentation: -# xz -dc $CWD/sources/asciidoc.asciidoc7compatible.revertbrokenchange.diff.xz | patch --verbose -p1 || exit 1 - # Configure: ./configure \ --prefix=/usr \ @@ -279,6 +276,9 @@ sed -i 's:LITLEN 240 :LITLEN 8092:' unicode/{gensyntax.pl,unic # Stop OpenJade from segfaulting: patch --verbose -p1 < ../opensp-sigsegv.patch || exit 1 +# Inconsistency between help & man page: +patch --verbose -p1 < ../opensp-manpage.patch || exit 1 +patch --verbose -p1 < ../opensp-nodeids.patch || exit 1 # Configure without optimisation. OpenSP & OpenJade # are sensitive to optimisations, resulting in segfaults, @@ -784,9 +784,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Apply patches: -patch -p1 < ../xmlto-noextensions.patch || exit 1 - # Configure: ./configure \ --prefix=/usr \ @@ -818,7 +815,10 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -xz -dc $CWD/sources/libsgmls-perl_$SGMLSPLVER-*.diff.xz | patch -p1 || exit 1 +tar xvvf $CWD/sources/libsgmls-perl_$SGMLSPLVER-*.debian.tar.xz || exit 1 + +# Apply patches from Debian: +cat debian/patches/series | while read dpf ; do patch -p1 --verbose < debian/patches/$dpf || exit 1 ; done || exit 1 # Configure: perl Makefile.PL INSTALLDIRS=vendor || exit 1 @@ -830,6 +830,7 @@ make OPTIMIZE="$SLKCFLAGS" || exit 1 # Install: make install PREFIX=/usr sed 's?usr/share/doc/sgmls-doc/?usr/doc/sgmlspl-'"$SGMLSPLVER"'/?g' sgmlspl.1 > /usr/man/man1/sgmlspl.1 +mv -fv /usr/bin/sgmlspl{.pl,} # Copy docs: mkdir -vpm755 /usr/doc/sgmlspl-$SGMLSPLVER @@ -845,8 +846,9 @@ cp -fav \ # Extract source: cd $TMP mkdir linuxdoc-tools && cd linuxdoc-tools -rpm2cpio $CWD/sources/linuxdoc-tools-${LINUXDOCTOOLSVER}*.src.rpm | cpio -div || exit 1 -tar xvf linuxdoc-tools_$LINUXDOCTOOLSVER.tar.gz +#rpm2cpio $CWD/sources/linuxdoc-tools-${LINUXDOCTOOLSVER}*.src.rpm | cpio -div || exit 1 +#tar xvf linuxdoc-tools_$LINUXDOCTOOLSVER.tar.gz +tar xvf $CWD/sources/linuxdoc-tools_$LINUXDOCTOOLSVER.tar.xz cd linuxdoc-tools-$LINUXDOCTOOLSVER || exit 1 chown -R root:root . @@ -862,12 +864,12 @@ find . \ OPATH=$PATH export PATH=$( echo $PATH | sed -e 's?:/usr/share/texmf/bin??g' -e 's?/usr/share/texmf/bin:??g' ) -# Apply patches (these are included in the source rpm): +# Apply patches (these were originally taken from the Fedora SRPM but broken out later +# when the 'original' source from Debian began to be used) for i in \ - linuxdoc-tools-0.9.13-letter.patch \ - linuxdoc-tools-0.9.68-flex.patch \ - linuxdoc-tools-0.9.20-lib64.patch ; do - patch --verbose -p1 < ../$i + linuxdoc-tools-0.9.13-letter.patch.xz \ + linuxdoc-tools-0.9.20-lib64.patch.xz ; do + xzcat $CWD/sources/$i | patch -p1 || exit 1 done || exit 1 # Find out what our Vendor perl directory is: @@ -909,12 +911,6 @@ make install \ DESTDIR=/ \ LINUXDOCDOC=/usr/doc/linuxdoc-tools-$LINUXDOCTOOLSVER || exit 1 -# Install shell scripts for sgml2{txt,latex,info} -for i in txt latex info; do \ - install -vpm755 debian/addition/sgml2$i \ - /usr/bin/sgml2$i; \ -done - # Install info page: cat debian/linuxdoc-tools.info-base doc/guide.info > /usr/info/linuxdoc-sgml.info @@ -1051,13 +1047,14 @@ find . \ -exec chmod 644 {} \; # Apply patches: -xz -dc $CWD/sources/docbook2x*diff* | patch -p1 || exit 1 +tar xvvf $CWD/sources/docbook2x*debian*z || exit 1 for i in \ - 01_fix_static_datadir_evaluation.dpatch \ - 02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch \ - 03_fix_420153_filename_whitespace_handling \ - 04_fix_442782_preprocessor_declaration_syntax.dpatch \ - 05_fix_439214_error_on_missing_refentry.dpatch ; do + 01_fix_static_datadir_evaluation.patch \ + 02_fix_418703_dont_use_abbreviated_sfnet_address.patch \ + 03_fix_420153_filename_whitespace_handling.patch \ + 04_fix_442782_preprocessor_declaration_syntax.patch \ + 05_fix_439214_error_on_missing_refentry.patch \ + 06_fix_man_typo.patch ; do patch --verbose -p1 < debian/patches/$i || exit 1 done diff --git a/source/ap/linuxdoc-tools/sources/docbook2x_0.8.8-8.diff b/source/ap/linuxdoc-tools/sources/docbook2x_0.8.8-8.diff deleted file mode 100644 index 90188b436..000000000 --- a/source/ap/linuxdoc-tools/sources/docbook2x_0.8.8-8.diff +++ /dev/null @@ -1,886 +0,0 @@ ---- docbook2x-0.8.8.orig/debian/changelog -+++ docbook2x-0.8.8/debian/changelog -@@ -0,0 +1,219 @@ -+docbook2x (0.8.8-8) unstable; urgency=low -+ -+ * debian/rules (binary-post-install): Fix manpages to talk about the renamed -+ commands. -+ -+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Sat, 06 Sep 2008 10:59:50 +0200 -+ -+docbook2x (0.8.8-7) unstable; urgency=low -+ -+ * debian/docbook2x.doc-base (Section): Fixed accordingly to version 0.8.10 -+ of the doc-base manual. -+ * debian/watch: Fixed. -+ -+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Tue, 08 Jul 2008 14:53:08 +0200 -+ -+docbook2x (0.8.8-6) unstable; urgency=low -+ -+ * debian/compat: Raised to v5. -+ * debian/control: Added DM-Upload-Allowed for DM status. -+ (Build-Depends): Raised debhelper to v5. -+ (Standards-Version): Raised to 3.7.3. -+ * debian/copyright: Fixed typo. Thanks to lintian. -+ * debian/docbook2x.doc-base (Document): Fixed uppercase letter. Thanks to -+ lintian. -+ * debian/patches/05_fix_439214_error_on_missing_refentry.dpatch: Added. -+ - xslt/man/docbook.xsl: Print a warning if no refentry element can be -+ found (closes: #439214). -+ * debian/patches/00list: Adjusted. -+ -+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Wed, 13 Feb 2008 18:08:08 +0100 -+ -+docbook2x (0.8.8-5) unstable; urgency=low -+ -+ * debian/control: Homepage field transition. -+ * debian/rules (DEB_CONFIGURE_EXTRA_FLAGS): Added --with-html-xsl configure -+ option to prevent docbook2X FTBFS building twice in a row. Thanks to -+ Steven Cheng, Patrick Winnertz and Lucas Nussbaum (closes: #441700). -+ * debian/watch: Added. -+ * debian/patches/01_fix_static_datadir_evaluation.dpatch: Adjusted. -+ - Removed change in configure.ac to avoid rerunning all the autotools. -+ * debian/patches/04_fix_442782_preprocessor_declaration_syntax.dpatch: Added. -+ - Fixes preprocessor declaration syntax to be '\" (closes: #442782). -+ Thanks to Colin Watson for the report and the patch. -+ * debian/patches/00list: Adjusted. -+ -+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Sun, 25 Nov 2007 03:40:18 +0000 -+ -+docbook2x (0.8.8-4) unstable; urgency=high -+ -+ [ Daniel Leidert ] -+ * debian/control (Depends): Added xsltproc. Thanks to Peter Eisentraut and -+ Adeodato Simó for the hint (closes: #420345). Further added the necessary -+ sp | opensp and texinfo dependencies. -+ * debian/patches/03_fix_420153_filename_whitespace_handling.dpatch: Added. -+ - First normalize the refentrytitle content and then replace spaces with -+ underlines to create the manpage filename (closes: #420153). Thanks to -+ Peter Eisentraut for reporting this issue. -+ * debian/patches/00list: Adjusted. -+ - Added 03_fix_420153_filename_whitespace_handling.dpatch. -+ -+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Sat, 21 Apr 2007 21:05:46 +0200 -+ -+docbook2x (0.8.8-3) unstable; urgency=high -+ -+ [ Daniel Leidert ] -+ * debian/control (Depends): Added ${misc:Depends} variable to fix missing -+ dependency on xml-core (closes: #419419). Thanks to Kurt Roeckx for the -+ report. -+ -+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Sun, 15 Apr 2007 19:10:50 +0200 -+ -+docbook2x (0.8.8-2) unstable; urgency=high -+ -+ [ Daniel Leidert ] -+ * debian/control (Build-Depends): Added xml-core and re-added dpatch.. -+ * debian/docbook2x.xmlcatalogs: Added to register XML catalogs. -+ * debian/rules: Re-added dpatch ruleset. -+ (binary-install/docbook2x): Register the XML catalogs shipped with the -+ package source (closes: #418703). -+ * debian/patches/01_fix_static_datadir_evaluation.dpatch: Added. Fixes the -+ broken ${datadir} evaluation in configure(.ac) that leads to an unusable -+ package. -+ * debian/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch: -+ Added. Don't use the short sf.net URLs. This with the above issue probably -+ caused bug #418703. However, having the catalogs registered was already in -+ TODO. -+ * debian/patches/00list: Adjusted. -+ -+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Thu, 12 Apr 2007 16:27:10 +0200 -+ -+docbook2x (0.8.8-1) unstable; urgency=low -+ -+ * New upstream version 0.8.8. -+ * Upload to unstable (closes: #409524). -+ -+ [ Daniel Leidert ] -+ * debian/control: Added XS-Vcs-Browser and XS-Vcs-Svn fields. -+ (Build-Depends): Removed dpatch dependency. -+ * debian/rules: Removed dpatch ruleset inclusion. -+ (binary-install/docbook2x): Added the upstream changelog as well. -+ * debian/patches/00list: -+ * debian/patches/01_add_missing_documentation.dpatch: Removed. Fixed -+ upstream. -+ -+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Tue, 10 Apr 2007 22:54:42 +0200 -+ -+docbook2x (0.8.7-1) experimental; urgency=low -+ -+ * New upstream release 0.8.7 (closes: #292046). -+ - This release also doesn't fail to build any longer with the latest -+ libxml-sax-perl (closes: #409524). -+ -+ [ Daniel Leidert ] -+ * debian/control (Uploaders): Added myself. -+ (Build-Depends): Added dpatch, opensp, sp and xsltproc and removed -+ libxslt1-dev. -+ (Build-Conflicts): Added tidy to avoid further tests. -+ * debian/copyright: Small update. -+ * debian/docbook2x.doc-base: Added for registering the docbook2X HTML docs -+ with doc-base. -+ * debian/rules: Removed simple-patchsys.mk inclusion and made the makefile -+ smaller. Added the dpatch ruleset to apply changes. -+ (common-install-prehook-arch, binary-install): Fixed. The info files come -+ with a INFO-DIR-SECTION entry. Further there is also info documentation -+ for the xslt stylesheets. -+ (binary-post-install): Removed a lot of obsolete stuff. The Perl stuff is -+ not longer installed. No CVS content is installed. -+ (binary-post-install, DEB_CONFIGURE_EXTRA_FLAGS): Replaced the manual -+ program/man-page renaming with adding --program-transform-name to -+ configure flags. -+ (clean): Removed unused stuff and improved the rest a bit. -+ * debian/patches/01_add_missing_documentation.dpatch: Added. -+ - This patch adds the missing docbook2{man,texi}.html files to the -+ documentation. -+ * debian/patches/00list: Added. Apply patch(es). -+ -+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Sun, 25 Feb 2007 22:28:34 +0100 -+ -+docbook2x (0.8.3-1) unstable; urgency=low -+ -+ * New upstream release. Removed all the patches that used to be in -+ debian/patches, since they have been applied upstream. -+ * debian/control: -+ - In Build-Depends, dropped libxml-perl and added libxml-sax-perl. -+ - Added Build-Conflicts on libxml2-utils, because the presence of -+ /usr/bin/xmllint triggers unecessary buildings in the doc -+ directory. -+ * debian/rules: Added an extra clean target for files left after building -+ the upstream package that are not removed by make clean. Also, make -+ sure that debian/examples is clean. -+ -+ -- Rafael Laboissiere <rafael@debian.org> Sun, 18 Jul 2004 22:24:57 +0200 -+ -+docbook2x (0.8.2-6) unstable; urgency=low -+ -+ * debian/control: Added dependencies on ${perl:Depends}, libxml-perl, -+ and libtext-wrapi18n-perl. The variable ${perl:Depends} is set by -+ dh_perl. -+ -+ -- Rafael Laboissiere <rafael@debian.org> Thu, 29 Apr 2004 14:32:06 +0200 -+ -+docbook2x (0.8.2-5) unstable; urgency=low -+ -+ * debian/patches/50-malocc-return.patch: Added this patch to fix a -+ serious upstream bug which was preventing the package of being built -+ by the ia64, hppa, sparc, and powerpc build daemons. -+ -+ -- Rafael Laboissiere <rafael@debian.org> Thu, 29 Apr 2004 12:12:12 +0200 -+ -+docbook2x (0.8.2-4) unstable; urgency=low -+ -+ * debian/control: Added build-dependency on texinfo, since the makeinfo -+ program is needed for building the package. -+ -+ -- Rafael Laboissiere <rafael@debian.org> Sun, 25 Apr 2004 21:29:15 +0200 -+ -+docbook2x (0.8.2-3) unstable; urgency=low -+ -+ * debian/control: Added build-dependency on libxml-perl. -+ -+ -- Rafael Laboissiere <rafael@debian.org> Sun, 25 Apr 2004 17:09:09 +0200 -+ -+docbook2x (0.8.2-2) unstable; urgency=low -+ -+ * debian/patches/50-gentext-dingbat-template.patch: Patch for -+ xslt/common/gentext.xsl, defining the lacking gentext-dingbat template -+ (closes: #245340). -+ * debian/patches/50-i-element.patch: Patch for xslt/texi/biblio.xsl, -+ fixing wrong <I> elements (closes: #245343). -+ * debian/patches/50-xml-fixes.patch: Patch for fixing XML problems in -+ the upstream files doc/docbook2X.xml and doc/faq.xml. -+ * debian/rules: -+ - Include cdbs' simple-patchsys.mk for coping with the patches above. -+ - Removed hard-coded Perl version from some installation directories -+ names. There is now a PERL_INSTALLPRIVLIB variable, properly -+ initialized through the Perl Config module (closes: #245291). -+ - Install Perl module in standard place, complying with the Debian -+ Perl Policy (closes: #245305). -+ - Run make clean in perl/XML/Handler directory to avoid inclusion of -+ extraneous patches in the Debian diff.gz file. Remove also -+ Makefile.old. -+ * debian/control: -+ - Added versioned build-dependency on libxslt1-dev. Also, changed -+ Build-Depends-Indep to Build-Depends, since the package is -+ Architecture: any (closes: #245285). -+ - Cite upstream URL homepage in debian/control in accordance with the -+ Debian Best Packaging Practices manual (closes: #245447) -+ - Added Uploaders field with Ardo, Wolfgang, and Rafael. -+ -+ -- Rafael Laboissiere <rafael@debian.org> Sun, 25 Apr 2004 14:45:14 +0200 -+ -+docbook2x (0.8.2-1) unstable; urgency=low -+ -+ * Initial package. Closes: #185295. -+ * The file install.xml is missing from the upstream archive, but is -+ available at the web site. -+ * Beware: <qandaset> can only be handled with defaultlabel attribute. -+ -+ -- W. Borgert <debacle@debian.org> Sat, 13 Mar 2004 09:41:07 +0000 ---- docbook2x-0.8.8.orig/debian/control -+++ docbook2x-0.8.8/debian/control -@@ -0,0 +1,23 @@ -+Source: docbook2x -+Section: text -+Priority: optional -+Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org> -+Uploaders: Ardo van Rangelrooij <ardo@debian.org>, W. Borgert <debacle@debian.org>, Rafael Laboissiere <rafael@debian.org>, Daniel Leidert (dale) <daniel.leidert@wgdd.de> -+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.21), dpatch, libxml-sax-perl, opensp, sp, texinfo, xml-core, xsltproc -+Build-Conflicts: libxml2-utils, tidy -+Standards-Version: 3.7.3 -+Homepage: http://docbook2x.sourceforge.net -+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook2x/trunk/ -+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook2x/ -+DM-Upload-Allowed: yes -+ -+Package: docbook2x -+Architecture: any -+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, libxml-sax-expat-perl, libtext-wrapi18n-perl, opensp | sp, texinfo, xsltproc -+Recommends: docbook-xml, docbook-xsl -+Description: Converts DocBook/XML documents into man pages and TeXinfo -+ The main tools are: -+ * docbook2x-man: converts a DocBook/XML refentry into a manual page, -+ with table support -+ * docbook2x-texi: converts a DocBook/XML refentry into an info page, -+ most usable for Emacs users ---- docbook2x-0.8.8.orig/debian/compat -+++ docbook2x-0.8.8/debian/compat -@@ -0,0 +1 @@ -+5 ---- docbook2x-0.8.8.orig/debian/TODO -+++ docbook2x-0.8.8/debian/TODO -@@ -0,0 +1,22 @@ -+Things that should (IMHO definitely) be done in the near future: -+ -+ * make the package XML policy compliant. -+ -+ - move the stylesheets and DTDs into /usr/share/xml -+ -+ * solve the conflict with the docbook-utils package binaries -+ (including: man-pages and docs currently use the names chosen by upstream, -+ not "our" tranformed binary names) -+ -+ * the man-pages contain references to files in /usr/share -+ [.. citing Steve Cheng ..] So you have two choices: -+ -+ 1. You can either use a sed script afterwards to fix the paths in the -+ installed man pages (and HTML, Texinfo documentation). -+ -+ 2. Or, force the rebuild of the documentation at your end. -+ After running the configure --with-html-xsl, touch doc/docbook2X.xml and -+ then make. (Note: don't use VPATH builds in this situation; it breaks.) -+ Of course you will need the xsltproc and the DocBook XSL stylesheets for -+ this procedure. [..] -+ ---- docbook2x-0.8.8.orig/debian/watch -+++ docbook2x-0.8.8/debian/watch -@@ -0,0 +1,4 @@ -+# See uscan(1) for format -+ -+version=3 -+http://sf.net/docbook2x/docbook2X-([\d\.]+)\.tar\.gz ---- docbook2x-0.8.8.orig/debian/docbook2x.doc-base -+++ docbook2x-0.8.8/debian/docbook2x.doc-base -@@ -0,0 +1,13 @@ -+Document: docbook2x -+Title: docbook2X user documentation -+Author: Steve Cheng <stevecheng@users.sourceforge.net> -+Abstract: docbook2X converts DocBook documents into man pages and -+ Texinfo documents. This documentation contains the man-pages, a -+ quick start guide, the FAQ and some information about the -+ project (history). -+Section: Text -+ -+Format: HTML -+Index: /usr/share/doc/docbook2x/docbook2X/docbook2X.html -+Files: /usr/share/doc/docbook2x/docbook2X/*.html -+ ---- docbook2x-0.8.8.orig/debian/docbook2x.xmlcatalogs -+++ docbook2x-0.8.8/debian/docbook2x.xmlcatalogs -@@ -0,0 +1,19 @@ -+root;public;-//Steve Cheng//DTD -+root;public;-//Steve Cheng//DOCUMENT DocBook -+ -+root;system;http://docbook2x.sf.net/latest/ -+root;system;http://docbook2x.sourceforge.net/latest/ -+ -+local;dtd/catalog.xml;/usr/share/docbook2X/dtd/catalog.xml -+local;xslt/catalog.xml;/usr/share/docbook2X/xslt/catalog.xml -+ -+package;public;-//Steve Cheng//DTD Man-XML V0.8.6//EN;/usr/share/docbook2X/dtd/catalog.xml -+package;public;-//Steve Cheng//DTD Texi-XML V0.8.6//EN;/usr/share/docbook2X/dtd/catalog.xml -+package;system;http://docbook2x.sourceforge.net/latest/dtd/;/usr/share/docbook2X/dtd/catalog.xml -+package;system;http://docbook2x.sf.net/latest/dtd/;/usr/share/docbook2X/dtd/catalog.xml -+ -+package;public;-//Steve Cheng//DOCUMENT DocBook Texinfo Stylesheet//EN;/usr/share/docbook2X/xslt/catalog.xml -+package;public;-//Steve Cheng//DOCUMENT DocBook Man-page Stylesheet//EN;/usr/share/docbook2X/xslt/catalog.xml -+package;system;http://docbook2x.sourceforge.net/latest/xslt/;/usr/share/docbook2X/xslt/catalog.xml -+package;system;http://docbook2x.sf.net/latest/xslt/;/usr/share/docbook2X/xslt/catalog.xml -+ ---- docbook2x-0.8.8.orig/debian/docbook2x.examples -+++ docbook2x-0.8.8/debian/docbook2x.examples -@@ -0,0 +1 @@ -+debian/examples/* ---- docbook2x-0.8.8.orig/debian/copyright -+++ docbook2x-0.8.8/debian/copyright -@@ -0,0 +1,67 @@ -+This package was debianized by W. Borgert <debacle@debian.org> on -+Sat, 2004-03-13 17:04:55 GMT 2004. -+ -+It was downloaded from Sourceforge: -+ -+ <URL:http://docbook2x.sourceforge.net/> -+ -+Upstream Author: -+ -+ Steve Cheng <stevecheng@users.sourceforge.net> -+ -+Copyright: -+ -+ Copyright (C) 2000-2006 Steve Cheng <stevecheng@users.sourceforge.net>. -+ -+ Parts have been derived from the docbook-xsl stylesheet distribution, that -+ is: -+ -+ Copyright (C) 1999, 2000, 2001, 2002 Norman Walsh. -+ -+License and Warranty for docbook2X: -+ -+ Permission is hereby granted, free of charge, to any person obtaining -+ a copy of this software and associated documentation files (the -+ "Software"), to deal in the Software without restriction, including -+ without limitation the rights to use, copy, modify, merge, publish, -+ distribute, sublicense, and/or sell copies of the Software, and to -+ permit persons to whom the Software is furnished to do so, subject to -+ the following conditions: -+ -+ The above copyright notice and this permission notice shall be included -+ in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+ IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR -+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ OTHER DEALNGS IN THE SOFTWARE. -+ -+License and Warranty for derived parts: -+ -+ Permission is hereby granted, free of charge, to any person -+ obtaining a copy of this software and associated documentation -+ files (the ``Software''), to deal in the Software without -+ restriction, including without limitation the rights to use, -+ copy, modify, merge, publish, distribute, sublicense, and/or -+ sell copies of the Software, and to permit persons to whom the -+ Software is furnished to do so, subject to the following -+ conditions: -+ -+ The above copyright notice and this permission notice shall be -+ included in al copies or substantial portions of the Software. -+ -+ Except as contained in this notice, the names of individuals -+ credited with contribution to this software shall not be used in -+ advertising or otherwise to promote the sale, use or other -+ dealings in this Software without prior written authorization -+ from the individuals in question. -+ -+ Any stylesheet derived from this Software that is publicly -+ distributed will be identified with a different name and the -+ version strings in any derived Software will be changed s that -+ no possibility of confusion between the derived package and this -+ Software will exist. -+ ---- docbook2x-0.8.8.orig/debian/rules -+++ docbook2x-0.8.8/debian/rules -@@ -0,0 +1,38 @@ -+#!/usr/bin/make -f -+ -+include /usr/share/cdbs/1/rules/debhelper.mk -+include /usr/share/cdbs/1/rules/dpatch.mk -+include /usr/share/cdbs/1/class/autotools.mk -+ -+ -+PACKAGE := docbook2x -+ -+DEB_CONFIGURE_EXTRA_FLAGS := --program-transform-name="s/^docbook2/docbook2x-/" --with-html-xsl -+ -+ -+common-install-prehook-arch:: -+ sed "s/^INFO-DIR-SECTION Document Preparation/INFO-DIR-SECTION Text/" \ -+ doc/docbook2X.info > debian/docbook2X.info -+ sed "s/^INFO-DIR-SECTION Document Preparation/INFO-DIR-SECTION Text/" \ -+ xslt/documentation/docbook2man-xslt.info > debian/docbook2man-xslt.info -+ sed "s/^INFO-DIR-SECTION Document Preparation/INFO-DIR-SECTION Text/" \ -+ xslt/documentation/docbook2texi-xslt.info > debian/docbook2texi-xslt.info -+ -+binary-install/docbook2x:: -+ dh_installinfo -pdocbook2x debian/docbook2X.info \ -+ debian/docbook2man-xslt.info \ -+ debian/docbook2texi-xslt.info -+ dh_installchangelogs doc/changes.html -+ dh_installxmlcatalogs -+ -+binary-post-install/docbook2x:: -+ mv $(CURDIR)/debian/$(PACKAGE)/usr/share/doc/docbook2X \ -+ $(CURDIR)/debian/$(PACKAGE)/usr/share/doc/docbook2x -+ sed -i -e 's/docbook2man/docbook2x\\-man/g' \ -+ $(CURDIR)/debian/$(PACKAGE)/usr/share/man/man1/docbook2x-man.1 -+ sed -i -e 's/docbook2texi/docbook2x\\-texi/g' \ -+ $(CURDIR)/debian/$(PACKAGE)/usr/share/man/man1/docbook2x-texi.1 -+ -+clean:: -+ make -C debian/examples clean -+ rm -f debian/docbook2X.info ---- docbook2x-0.8.8.orig/debian/patches/00list -+++ docbook2x-0.8.8/debian/patches/00list -@@ -0,0 +1,5 @@ -+01_fix_static_datadir_evaluation -+02_fix_418703_dont_use_abbreviated_sfnet_address -+03_fix_420153_filename_whitespace_handling -+04_fix_442782_preprocessor_declaration_syntax -+05_fix_439214_error_on_missing_refentry ---- docbook2x-0.8.8.orig/debian/patches/03_fix_420153_filename_whitespace_handling -+++ docbook2x-0.8.8/debian/patches/03_fix_420153_filename_whitespace_handling -@@ -0,0 +1,43 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 03_fix_420153_filename_whitespace_handling.dpatch by -+## Daniel Leidert (dale) <daniel.leidert@wgdd.de> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Peter Eisentraut reported a regression in the whitespace handling of -+## DP: refentrytitle content during filename creation: -+## DP: http://bugs.debian.org/420153. The problem is, that upstream first -+## DP: replaces all spaces (but not linebreaks btw) with underlines and then -+## DP: it tries to normalize the result. This means, that a linebreak with -+## DP: additional whitespaces results in manpage names like 'foo_ ____bar.9'. -+## DP: So what we basically do in this patch is, that we first normalize the -+## DP: refentrytitle and then replace any spaces left with underlines. -+ -+@DPATCH@ -+diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/man/manpage.xsl -+--- docbook2x-0.8.8~/xslt/man/manpage.xsl 2006-04-20 15:45:55.000000000 +0200 -++++ docbook2x-0.8.8/xslt/man/manpage.xsl 2007-04-20 16:19:28.000000000 +0200 -+@@ -30,7 +30,7 @@ -+ -+ <xsl:template name="manpage-filename"> -+ <xsl:param name="filename" /> -+- <xsl:value-of select="normalize-space(translate($filename, " /", "__"))" /> -++ <xsl:value-of select="translate(normalize-space($filename), ' /', '__')" /> -+ </xsl:template> -+ -+ -+diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl docbook2x-0.8.8/xslt/man/refentry.xsl -+--- docbook2x-0.8.8~/xslt/man/refentry.xsl 2006-04-21 04:39:55.000000000 +0200 -++++ docbook2x-0.8.8/xslt/man/refentry.xsl 2007-04-20 16:21:53.000000000 +0200 -+@@ -38,7 +38,11 @@ -+ <xsl:template name="refentry-filename"> -+ <xsl:param name="title" /> -+ -+- <xsl:variable name="title2" select="translate($title, " /", "__")" /> -++ <xsl:variable name="title2"> -++ <xsl:call-template name="manpage-filename"> -++ <xsl:with-param name="filename" select="$title" /> -++ </xsl:call-template> -++ </xsl:variable> -+ -+ <!-- not using gentext here since man page names tend not to have -+ accented chars / non-Latin chars ... ---- docbook2x-0.8.8.orig/debian/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch -+++ docbook2x-0.8.8/debian/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch -@@ -0,0 +1,27 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Ondrej Certik reported a resolver issue: http://bugs.debian.org/418703. -+## DP: The error seems to be caused by using the abbreviated sf.net URLs. But -+## DP: it is possible, that this issue only occurs together with the issue -+## DP: described in 01_fix_static_datadir_evaluation.dpatch, because the path -+## DP: to the catalog also suffers from this issue. -+ -+@DPATCH@ -+diff -urNad docbook2x-0.8.8~/perl/db2x_xsltproc.pl docbook2x-0.8.8/perl/db2x_xsltproc.pl -+--- docbook2x-0.8.8~/perl/db2x_xsltproc.pl 2004-08-18 16:21:52.000000000 +0200 -++++ docbook2x-0.8.8/perl/db2x_xsltproc.pl 2007-04-12 16:07:20.000000000 +0200 -+@@ -110,10 +110,10 @@ -+ -+ if($options->{'stylesheet'} eq 'texi') { -+ $options->{'stylesheet'} = -+- "http://docbook2x.sf.net/latest/xslt/texi/docbook.xsl"; -++ "http://docbook2x.sourceforge.net/latest/xslt/texi/docbook.xsl"; -+ } elsif($options->{'stylesheet'} eq 'man') { -+ $options->{'stylesheet'} = -+- "http://docbook2x.sf.net/latest/xslt/man/docbook.xsl"; -++ "http://docbook2x.sourceforge.net/latest/xslt/man/docbook.xsl"; -+ } -+ -+ if(scalar(@argv) != 1) { ---- docbook2x-0.8.8.orig/debian/patches/04_fix_442782_preprocessor_declaration_syntax.dpatch -+++ docbook2x-0.8.8/debian/patches/04_fix_442782_preprocessor_declaration_syntax.dpatch -@@ -0,0 +1,90 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 04_fix_442782_preprocessor_declaration_syntax.dpatch by Colin Watson <cjwatson@debian.org>. -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Conventionally, preprocessor declarations should start with -+## DP: '\" -+## DP: rather than -+## DP: .\" -+## DP: Current man-db only supports the first (and recommended) syntax. So -+## DP: Colin Watson provided this patch to fix docbook2x. -+## DP: -+## DP: <URL:http://bugs.debian.org/442782> -+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html> -+ -+@DPATCH@ -+diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl -+--- trunk~/perl/db2x_manxml.pl 2006-04-22 17:21:32.000000000 +0200 -++++ trunk/perl/db2x_manxml.pl 2007-11-24 01:27:37.000000000 +0100 -+@@ -342,6 +342,25 @@ -+ $self->{line_start} = 1; -+ } -+ -++# -++# Print a comment in the output, without causing a break. -++# Params: comment - the comment text. -++# May use any characters; they need not be escaped. -++# -++sub comment_nobreak -++{ -++ my ($self, $comment) = @_; -++ $self->write("\n") unless $self->{line_start}; -++ -++ foreach my $line (split(/\n/, $comment)) { -++ $self->write('\'\" '); -++ $self->write($line); -++ $self->write("\n"); -++ } -++ -++ $self->{line_start} = 1; -++} -++ -+ -+ # -+ # Use a roff "escape" i.e. commands embedded in text starting with \ -+@@ -510,16 +529,20 @@ -+ -+ $self->{'adjust-stack'} = [ 'b' ]; -+ -+- $self->{rw}->comment($elem->attr('preprocessors')) -+- if($elem->attr('preprocessors') ne ''); -+- -++ my $preprocessors = $elem->attr('preprocessors'); -+ # I've dug through the Internet to see if there was any -+ # standard way to specify encoding with man pages. -+ # The following seems to be a reasonable proposal: -+ # <URL:http://mail.nl.linux.org/linux-utf8/2001-04/msg00168.html> -+ my $encoding = $self->{options}->{'encoding'}; -+ $encoding =~ s#//TRANSLIT$##i; -+- $self->{rw}->comment("-*- coding: $encoding -*-"); -++ $encoding = "-*- coding: $encoding -*-"; -++ if ($preprocessors eq '') { -++ $preprocessors = $encoding; -++ } else { -++ $preprocessors = "$preprocessors $encoding"; -++ } -++ $self->{rw}->comment_nobreak($preprocessors); -+ -+ # Define escapes for switching to and from monospace fonts (groff only) -+ $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC}); -+diff -urNad trunk~/xslt/backend/db2x_manxml.xsl trunk/xslt/backend/db2x_manxml.xsl -+--- trunk~/xslt/backend/db2x_manxml.xsl 2006-04-23 16:44:52.000000000 +0200 -++++ trunk/xslt/backend/db2x_manxml.xsl 2007-11-24 01:27:37.000000000 +0100 -+@@ -528,7 +528,7 @@ -+ <exslt:document method="text" -+ encoding="{$encoding}" -+ href="{$path}"> -+- <xsl:text>.\" -*- coding: </xsl:text> -++ <xsl:text>'\" -*- coding: </xsl:text> -+ <xsl:value-of select="$encoding" /> -+ <xsl:text> -*- </xsl:text> -+ <xsl:copy-of select="$content" /> -+@@ -538,7 +538,7 @@ -+ <saxon:output method="text" -+ encoding="{$encoding}" -+ href="{$path}"> -+- <xsl:text>.\" -*- coding: </xsl:text> -++ <xsl:text>'\" -*- coding: </xsl:text> -+ <xsl:value-of select="$encoding" /> -+ <xsl:text> -*- </xsl:text> -+ <xsl:copy-of select="$content" /> ---- docbook2x-0.8.8.orig/debian/patches/01_fix_static_datadir_evaluation.dpatch -+++ docbook2x-0.8.8/debian/patches/01_fix_static_datadir_evaluation.dpatch -@@ -0,0 +1,20 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 01_fix_static_datadir_evaluation.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: The evaluation of datadir results in "${prefix}/share" without -+## DP: evaluation of the ${prefix} variable with autoconf 2.60. -+ -+@DPATCH@ -+diff -urNad docbook2x-0.8.8~/configure docbook2x-0.8.8/configure -+--- docbook2x-0.8.8~/configure 2007-04-12 15:16:48.000000000 +0200 -++++ docbook2x-0.8.8/configure 2007-04-12 16:04:16.000000000 +0200 -+@@ -5265,7 +5265,7 @@ -+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -+ -+ -+-eval static_datadir="$datadir" -++eval eval static_datadir="$datadir" -+ -+ eval static_bindir="$bindir" -+ old_val="" ---- docbook2x-0.8.8.orig/debian/patches/05_fix_439214_error_on_missing_refentry.dpatch -+++ docbook2x-0.8.8/debian/patches/05_fix_439214_error_on_missing_refentry.dpatch -@@ -0,0 +1,33 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 05_fix_439214_error_on_missing_refentry.dpatch by Daniel Leidert <daniel.leidert@wgdd.de> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: If there is no refentry element, the manpage stylesheets silently -+## DP: "ignores" this. It has been requested to print at least a -+## DP: warning. -+## DP: -+## DP: <URL:http://bugs.debian.org/439214> -+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html> -+ -+@DPATCH@ -+diff -urNad trunk~/xslt/man/docbook.xsl trunk/xslt/man/docbook.xsl -+--- trunk~/xslt/man/docbook.xsl 2006-04-11 21:00:19.000000000 +0200 -++++ trunk/xslt/man/docbook.xsl 2008-02-05 03:31:48.000000000 +0100 -+@@ -111,11 +111,15 @@ -+ <xsl:when test="child::refentry"> -+ <xsl:apply-templates /> -+ </xsl:when> -+- -+- <xsl:otherwise> -++ <xsl:when test="descendant-or-self::refentry"> -+ <manpageset> -+ <xsl:apply-templates select="descendant-or-self::refentry" /> -+ </manpageset> -++ </xsl:when> -++ <xsl:otherwise> -++ <xsl:message terminate="no"> -++ <xsl:text>WARNING: Sorry, but I cannot find a refentry element in your source!</xsl:text> -++ </xsl:message> -+ </xsl:otherwise> -+ </xsl:choose> -+ </xsl:template> ---- docbook2x-0.8.8.orig/debian/examples/ttcn-el.dbk -+++ docbook2x-0.8.8/debian/examples/ttcn-el.dbk -@@ -0,0 +1,178 @@ -+<?xml version="1.0" encoding="utf-8"?> -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -+ <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> -+ <!ENTITY emacs "<abbrev>GNU Emacs</abbrev>"> -+ <!ENTITY ttcn3 "<acronym>TTCN-3</acronym>"> -+ <!ENTITY ttcnmp "<acronym>TTCN.MP</acronym>"> -+]> -+ -+<!-- Manual page for ttcn-el, DocBook source file (C) 2000 W. Borgert -+ debacle@debian.org -+ -+ $Id: ttcn-el.dbk,v 1.1 2007/02/24 06:33:26 dleidert-guest Exp $ --> -+ -+<refentry> -+ <refentryinfo> -+ <title>&emacs; modes for protocol testing languages</title> -+ <titleabbrev>TTCN-3 mode</titleabbrev> -+ <address> -+ <email>debacle@debian.org</email> -+ </address> -+ <author> -+ <firstname>W.</firstname> -+ <surname>Borgert</surname> -+ </author> -+ <copyright> -+ <year>2000</year> -+ <holder>W. Borgert</holder> -+ </copyright> -+ <date>2000-07-28</date> -+ </refentryinfo> -+ <refmeta> -+ <refentrytitle>ttcn-el</refentrytitle> -+ -+ <manvolnum>7</manvolnum> -+ <refmiscinfo role="infodirsection">Development</refmiscinfo> -+ </refmeta> -+ <refnamediv> -+ <refname>ttcn-el</refname> -+ -+ <refpurpose>&emacs; modes for protocol testing languages.</refpurpose> -+ </refnamediv> -+ <refsynopsisdiv> -+ <cmdsynopsis> -+ <command>ttcn-3-mode</command> -+ </cmdsynopsis> -+ <cmdsynopsis> -+ <command>ttcn-mode</command> -+ </cmdsynopsis> -+ <cmdsynopsis> -+ <command>tm-functions</command> -+ </cmdsynopsis> -+ </refsynopsisdiv> -+ <refsect1> -+ <title>Description</title> -+ -+ <para>The programming modes <command>ttcn-3-mode</command>, -+ <command>ttcn-mode</command>, and -+ <command>tm-functions</command> for &emacs; are for programming -+ in the &ttcn3;, core language (Testing and Test Control Notation -+ - 3), &ttcnmp; format (Tree and Tabulart Combined Notation), or -+ the Test Manager scripts, an enhancement to the Forth -+ programming language, used in the Tektronix -+ <productname>K1297</productname> protocol tester.</para> -+ -+ <para>The &ttcn3; programming mode -+ (<command>ttcn-3-mode</command>, file -+ <filename>ttcn3.el</filename>) does indentation, code -+ colourisation (so-called font-locking) and gives you an index of -+ test cases and other important definitions via the -+ <guimenu>Module-Index</guimenu>. With the command -+ <command>ttcn3-parse</command> you can run an external -+ TTCN3Parser or ttthreeparser, if available. The keywords are -+ according to the TTCN-3 BNF of 2001-10. To switch off the logo -+ splash screen, set the variable -+ <varname>ttcn3-show-logo</varname> to <constant>nil</constant> -+ in your <filename>~/.emacs</filename> file. The logo is by -+ Patrick Andrieu, the ASCII art version by W. Borgert. This mode -+ is based on <productname>CC Mode</productname>, please look in -+ the <productname>CC Mode</productname> documentation for further -+ information.</para> -+ -+ <para>The &ttcnmp; programming mode (<command>ttcn-mode</command>, -+ file <filename>ttcn.el</filename>) is not for writing test -+ suites from scratch, but for fixing small errors or doing little -+ changes or just looking at the MP format. No indentation is -+ done, but some code colourisation, an index, and a menu with -+ some navigation functions are given. Note: For large test -+ suites startup might become very slow.</para> -+ -+ <para>If one want that &emacs; treats files with the -+ <filename>.mp</filename> extension automatically as -+ &ttcnmp; files instead of MetaPost files, add the following -+ lines to your <filename>~/.emacs</filename> file: -+ <programlisting>(setq auto-mode-alist -+ (cons '("\\.mp\\'" . ttcn-mode) auto-mode-alist))</programlisting> -+ </para> -+ -+ <para>The Test Manager programming functions -+ (<command>tm-functions</command>, file <filename>tm.el</filename>)is -+ an addition to the Forth programming mode -+ (<command>forth-mode</command>, file -+ <filename>forth.el</filename>). It includes only minor -+ additions to the regular Forth mode, i.e. font-locking, index -+ menu, and support of the Test Manager specific words.</para> -+ -+ <para>To enable the <command>tm-functions</command> by default, -+ add the following line to your -+ <filename>~/.emacs</filename>: -+ <programlisting>(add-hook 'forth-mode-hook 'tm-functions) -+ </programlisting></para> -+ -+ </refsect1> -+ <refsect1> -+ <title>Files</title> -+ -+ <para>All lisp source files are in -+ <filename>/usr/share/emacs/site-lisp/ttcn-el/</filename>.</para> -+ </refsect1> -+ <refsect1> -+ <title>Author</title> -+ -+ <para>These programmes are made by <author><firstname>W.</firstname> -+ <surname>Borgert</surname></author> -+ <<email>debacle@debian.org</email>>, as well as this -+ documentation.</para> -+ -+ </refsect1> -+ <refsect1> -+ <title>Thanks</title> -+ -+ <para>All important ideas and some code are taken from other -+ &emacs; modes, and adapted to work with TTCN-3, &ttcnmp; and -+ Test Manager files. Thanks to Csaba Koppany and Theofanis -+ Vassiliou-Gioles for valuable hints on current TTCN-3 keywords -+ and regular expressions.</para> -+ -+ </refsect1> -+ <refsect1> -+ <title>Copyright</title> -+ -+ <para>Copyright 2000 W. Borgert and released under the -+ <acronym>GNU</acronym> General Public License -+ (<abbrev>GPL</abbrev>). Permission is granted to copy, -+ distribute and/or modify this document under the terms of the -+ <acronym>GNU</acronym> Free Documentation License, Version 1.1; -+ with no Invariant Sections, no Front-Cover Texts and no -+ Back-Cover Texts.</para> -+ </refsect1> -+ <refsect1> -+ <title>Bugs</title> -+ -+ <para>The indentation is not correct in many cases.</para> -+ </refsect1> -+ <refsect1> -+ <title>History</title> -+ -+ <para>Version 0.6 released on 2001-10-10. Updated -+ keywords.</para> -+ -+ <para>Version 0.5 released on 2001-05-05. Updated -+ keywords.</para> -+ -+ <para>Version 0.4 released on 2001-02-02. Calls external -+ parser.</para> -+ -+ <para>Version 0.3 released on 2001-01-31. -+ <filename>ttcn3.el</filename> should now work with GNU Emacs -+ 21.0 and XEmacs 21.1, too.</para> -+ -+ <para>Version 0.2 released on 2000-07-28. Includes updates for -+ &ttcn3; keywords in <filename>ttcn3.el</filename> and makes -+ <filename>tm.el</filename> a function library instead of a major -+ mode.</para> -+ -+ <para>Version 0.1 released on 2000-03-31. Initial release.</para> -+ </refsect1> -+</refentry> ---- docbook2x-0.8.8.orig/debian/examples/Makefile -+++ docbook2x-0.8.8/debian/examples/Makefile -@@ -0,0 +1,29 @@ -+# -*- makefile -*- -+ -+# Notes: -+# 1. you must have package libxml2-python2.3 installed -+# 2. your document must have a titleabbrev in the refentryinfo -+# 3. your document must have a refmiscinfo with role=infodirsection -+ -+XTR=python -c 'import sys, libxml2; \ -+print libxml2.parseFile(sys.argv[1]).xpathEval(sys.argv[2])[0].content' -+ -+all: $(patsubst %.dbk,%.info,$(wildcard *.dbk)) -+ -+%.info: %.dbk -+ docbook2x-texi --info --to-stdout $< | \ -+ awk -v base=`basename $< .dbk` \ -+ -v sect="`${XTR} $< '//refmiscinfo[@role="infodirsection"]'`" \ -+ -v title="`${XTR} $< '/refentry/refentryinfo/titleabbrev'`" \ -+ 'BEGIN { p=1 } \ -+ /^START-INFO-DIR-ENTRY/ { print \ -+ "INFO-DIR-SECTION " sect "\n" $$0; p=0 } \ -+ /^END-INFO-DIR-ENTRY/ { p=1 } \ -+ /^\* / { if (p==0) { gsub(/.*\./, ""); \ -+ print "* " title ": (" base ")." $$0 } } \ -+ /^File: stdout,/ { if (p==1) { \ -+ gsub(/File: stdout/, "File: " base ".info"); p=2 } } \ -+ { if (p) { print } }' > $@ -+ -+clean:: -+ rm -f *.info *~ diff --git a/source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii-32.diff b/source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii-32.diff deleted file mode 100644 index 917e834c0..000000000 --- a/source/ap/linuxdoc-tools/sources/libsgmls-perl_1.03ii-32.diff +++ /dev/null @@ -1,949 +0,0 @@ ---- libsgmls-perl-1.03ii.orig/sgmlspl.pl -+++ libsgmls-perl-1.03ii/sgmlspl.pl -@@ -238,7 +238,7 @@ - package main; - - $ARGV = shift; --unless ($ARGV eq '' || do $ARGV) { -+unless ($ARGV eq '' || do 'sgmlspl-specs/' . $ARGV || do $ARGV) { - if (!-e $ARGV) { - die "FATAL: $ARGV does not exist.\n"; - } elsif (!-r $ARGV) { ---- libsgmls-perl-1.03ii.orig/Refs.pm -+++ libsgmls-perl-1.03ii/Refs.pm -@@ -2,11 +2,11 @@ - - use Carp; - --$version = '$Id: Refs.pm,v 1.5 1995/12/03 21:28:36 david Exp $'; -+$version = '$Id: Refs.pm,v 1.1 1999/10/26 19:30:45 ardo Exp $'; - - =head1 NAME - --SGMLS::Refs -+SGMLS::Refs - Forward reference handling - - =head1 SYNOPSIS - ---- libsgmls-perl-1.03ii.orig/Output.pm -+++ libsgmls-perl-1.03ii/Output.pm -@@ -5,7 +5,7 @@ - @ISA = Exporter; - @EXPORT = qw(output push_output pop_output); - --$version = '$Id: Output.pm,v 1.6 1995/12/05 12:21:51 david Exp $'; -+$version = '$Id: Output.pm,v 1.1 1999/10/26 19:30:45 ardo Exp $'; - - =head1 NAME - ---- libsgmls-perl-1.03ii.orig/sgmlspl.1 -+++ libsgmls-perl-1.03ii/sgmlspl.1 -@@ -0,0 +1,47 @@ -+.\" -*- nroff -*- -+.\" ---------------------------------------------------------------------- -+.TH SGMLSPL 1 "October 26, 1999" "SGMLSPL" "SGMLSPL" -+.\" -+.\" ---------------------------------------------------------------------- -+.SH "NAME" -+sgmlspl \- a simple post-processor for nsgmls -+.\" -+.\" ---------------------------------------------------------------------- -+.SH "SYNOPSIS" -+.B sgmlspl -+.I "spec file" -+.\" -+.\" ---------------------------------------------------------------------- -+.SH "DESCRIPTION" -+sgmlspl is a sample application to convert SGML documents to other -+formats by providing a specification file detailing exactly how to -+handle each element, external data entity, subdocument entity, CDATA -+string, record end, SDATA string, and processing instruction. -+ -+To use sgmlspl, prepare a specification file containing regular perl5 -+code. If the SGML document were named doc.sgml, the sgmlspl -+specification file were named, spec.pl, and the name of the new file -+were doc.latex, then use the following command in a Unix shell to -+convert the SGML document: -+ -+nsgmls doc.sgml | sgmlspl spec.pl > doc.latex -+ -+sgmlspl will pass any additional arguments on to the specification -+file, which can then process them in the regular perl5 fashion. -+.\" -+.\" ---------------------------------------------------------------------- -+.SH "SEE ALSO" -+.TP -+.BR /usr/share/doc/sgmls-doc/sgmlspl/sgmlspl.html -+sgmlspl documentation in HTML format -+.TP -+.BR /usr/share/doc/sgmls-doc/SGMLSpm/sgmls.html -+SGMLS documentation in HTML format -+.TP -+.BR nsgmls (1) -+.\" -+.\" ---------------------------------------------------------------------- -+.SH "AUTHOR" -+Ardo van Rangelrooij <ardo@debian.org> -+.\" -+.\" ---------------------------------------------------------------------- ---- libsgmls-perl-1.03ii.orig/Makefile.PL -+++ libsgmls-perl-1.03ii/Makefile.PL -@@ -0,0 +1,17 @@ -+use ExtUtils::MakeMaker; -+# See lib/ExtUtils/MakeMaker.pm for details of how to influence -+# the contents of the Makefile that is written. -+WriteMakefile( -+ 'NAME' => 'SGMLS', -+ 'VERSION' => '1.03ii', -+ 'PM' => { 'SGMLS.pm' => '$(INST_LIBDIR)/SGMLS.pm', -+ 'Output.pm' => '$(INST_LIBDIR)/SGMLS/Output.pm', -+ 'Refs.pm' => '$(INST_LIBDIR)/SGMLS/Refs.pm', -+ 'skel.pl' => '$(INST_LIBDIR)/sgmlspl-specs/skel.pl', -+ }, -+ 'MAN3PODS'=> { 'SGMLS.pm' => '$(INST_MAN3DIR)/SGMLS.3pm', -+ 'Output.pm' => '$(INST_MAN3DIR)/SGMLS::Output.3pm', -+ 'Refs.pm' => '$(INST_MAN3DIR)/SGMLS::Refs.3pm', -+ }, -+ 'EXE_FILES' => [ 'sgmlspl', ], -+); ---- libsgmls-perl-1.03ii.orig/Makefile -+++ libsgmls-perl-1.03ii/Makefile -@@ -94,5 +94,5 @@ - mv /tmp/${DIST} SGMLSpm - - clean: -- cd DOC; make clean -+ #cd DOC; make clean - rm -f *~ core *.tar *.tar.gz ---- libsgmls-perl-1.03ii.orig/SGMLS.pm -+++ libsgmls-perl-1.03ii/SGMLS.pm -@@ -1,7 +1,7 @@ - package SGMLS; - use Carp; - --$version = '$Revision: 1.14 $'; -+$version = '$Revision: 1.1 $'; - - =head1 NAME - ---- libsgmls-perl-1.03ii.orig/debian/libsgmls-perl.examples -+++ libsgmls-perl-1.03ii/debian/libsgmls-perl.examples -@@ -0,0 +1 @@ -+DOC/sample.pl ---- libsgmls-perl-1.03ii.orig/debian/sgmls-doc.doc-base.SGMLSpm -+++ libsgmls-perl-1.03ii/debian/sgmls-doc.doc-base.SGMLSpm -@@ -0,0 +1,9 @@ -+Document: SGMLSpm -+Title: SGMLSpm -+Author: David Megginson -+Abstract: This manual describes the SGMLS Perl modules -+Section: Text -+ -+Format: HTML -+Index: /usr/share/doc/sgmls-doc/SGMLSpm/index.html -+Files: /usr/share/doc/sgmls-doc/SGMLSpm/*.html ---- libsgmls-perl-1.03ii.orig/debian/rules -+++ libsgmls-perl-1.03ii/debian/rules -@@ -0,0 +1,76 @@ -+#!/usr/bin/make -f -+## ---------------------------------------------------------------------- -+## debian/rules : package script for libsgmls-perl -+## ---------------------------------------------------------------------- -+ -+## ---------------------------------------------------------------------- -+## uncomment this to turn on verbose mode -+#export DH_VERBOSE=1 -+ -+## ---------------------------------------------------------------------- -+TMP_DIR := $(CURDIR)/debian/tmp -+ -+## ---------------------------------------------------------------------- -+CFLAGS = -Wall -g -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+ CFLAGS += -O0 -+else -+ CFLAGS += -O2 -+endif -+ -+## ---------------------------------------------------------------------- -+## targets -+ -+clean: -+ dh_testdir -+ dh_testroot -+ [ ! -f Makefile ] || $(MAKE) clean -+ dh_clean build-stamp install-stamp -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+ perl Makefile.PL INSTALLDIRS=vendor -+ $(MAKE) OPTIMIZE="$(CFLAGS)" -+ $(MAKE) test -+ touch build-stamp -+ -+install: install-stamp -+install-stamp: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ $(MAKE) install DESTDIR=$(TMP_DIR) PREFIX=/usr -+ touch install-stamp -+ -+binary-indep: build install -+ dh_testdir -+ dh_testroot -+ dh_install --sourcedir=$(TMP_DIR) -+ dh_installman -+ dh_installdocs -+ dh_installexamples -+ dh_installchangelogs ChangeLog -+ dh_link -+ dh_compress -+ dh_fixperms -+ dh_installdeb -+ dh_perl -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary-arch: -+ -+binary: binary-indep binary-arch -+ -+.PHONY: clean build install binary-indep binary-arch binary -+ -+## ---------------------------------------------------------------------- -+## Copyright 1994,1995 by Ian Jackson. -+## I hereby give you perpetual unlimited permission to copy, -+## modify and relicense this file, provided that you do not remove -+## my name from the file itself. (I assert my moral right of -+## paternity under the Copyright, Designs and Patents Act 1988.) -+## ---------------------------------------------------------------------- ---- libsgmls-perl-1.03ii.orig/debian/control -+++ libsgmls-perl-1.03ii/debian/control -@@ -0,0 +1,48 @@ -+Source: libsgmls-perl -+Section: perl -+Priority: optional -+Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org> -+Uploaders: Ardo van Rangelrooij <ardo@debian.org> -+Vcs-Browser: http://alioth.debian.org/plugins/scmcvs/cvsweb.php/packages/libsgmls-perl/?cvsroot=debian-xml-sgml -+Vcs-Cvs: :pserver:anonymous@cvs.alioth.debian.org:/cvsroot/debian-xml-sgml/packages/libsgmls-perl -+Standards-Version: 3.7.3 -+Build-Depends: debhelper (>= 5.0) -+Build-Depends-Indep: perl -+ -+Package: libsgmls-perl -+Section: perl -+Priority: optional -+Architecture: all -+Conflicts: sgmlspm -+Depends: ${perl:Depends} -+Recommends: sp -+Replaces: sgmlspm -+Suggests: sgmlspl, sgmls-doc -+Description: Perl modules for processing SGML parser output -+ This is a set of Perl5 routines for processing the output from the -+ sgmls and nsgmls SGML parsers. To make sensible use of this package -+ you will need to install a suitable SGML parser as well. -+ -+Package: sgmlspl -+Section: text -+Priority: optional -+Architecture: all -+Conflicts: sgmlspm -+Depends: ${perl:Depends}, libsgmls-perl -+Replaces: sgmlspm -+Suggests: sgmls-doc -+Description: SGMLS-based example Perl script for processing SGML parser output -+ This is an example of a Perl script to post-process SGML parser output -+ using the SGMLS Perl modules. To make sensible use of this package -+ you will need to install a suitable SGML parser as well. -+ -+Package: sgmls-doc -+Section: doc -+Priority: optional -+Architecture: all -+Conflicts: sgmlspm -+Replaces: sgmlspm -+Suggests: libsgmls-perl, sgmlspl -+Description: HTML documentation of libsgmls-perl and sgmlspl -+ This package contains the documentation in HTML format of the -+ packages libsgmls-perl and sgmlspl. ---- libsgmls-perl-1.03ii.orig/debian/sgmlspl.manpages -+++ libsgmls-perl-1.03ii/debian/sgmlspl.manpages -@@ -0,0 +1 @@ -+sgmlspl.1 ---- libsgmls-perl-1.03ii.orig/debian/changelog -+++ libsgmls-perl-1.03ii/debian/changelog -@@ -0,0 +1,262 @@ -+libsgmls-perl (1.03ii-32) unstable; urgency=low -+ -+ * Refs.pm: fixed typo -+ (closes: Bug#414110) -+ * debian/compat: bumped version to 5 -+ * debian/control: -+ * moved debhelper from 'Build-Depends-Indep' to 'Build-Depends' -+ (detected by lintian) -+ * changed build dependency on 'debhelper' to '(>= 5.0)' -+ * upgraded to Debian Policy 3.7.3 (no changes) -+ * added Vcs-Browser and Vcs-Cvs fields -+ * debian/watch: bumped version to 3 -+ * debian/copyright: updated FSF address -+ (detected by lintian) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Fri, 04 Jan 2008 10:48:06 -0600 -+ -+libsgmls-perl (1.03ii-31) unstable; urgency=low -+ -+ * Added 'debian/watch' -+ * debiam/rules: various small improvements -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Wed, 24 Nov 2004 12:23:21 -0600 -+ -+libsgmls-perl (1.03ii-30) unstable; urgency=low -+ -+ * Makefile: commented out documentation clean -+ (closes: Bug#240645) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sun, 28 Mar 2004 10:29:33 -0600 -+ -+libsgmls-perl (1.03ii-29) unstable; urgency=low -+ -+ * debian/control: changed maintainer's email address to the new Debian -+ XML/SGML Group's packages mailing list -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sun, 29 Feb 2004 10:48:45 -0600 -+ -+libsgmls-perl (1.03ii-28) unstable; urgency=low -+ -+ * debian/control: changed 'Maintainer' to 'Debian XML/SGML Group -+ <debian-xml-sgml-devel@lists.alioth.debian.org>' and added current -+ maintainer as 'Uploader' -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sun, 22 Feb 2004 19:38:41 -0600 -+ -+libsgmls-perl (1.03ii-27) unstable; urgency=low -+ -+ * debian/control: upgraded to Debian Policy 3.6.1 (no changes) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sat, 7 Feb 2004 22:31:22 -0600 -+ -+libsgmls-perl (1.03ii-26) unstable; urgency=low -+ -+ * Fixed missing documentation -+ (closes: Bug#226085) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sun, 4 Jan 2004 10:56:51 -0600 -+ -+libsgmls-perl (1.03ii-25) unstable; urgency=low -+ -+ * sgmlspl.1: fixed references to HTML documentation -+ (closes: Bug#202985) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sat, 26 Jul 2003 23:06:50 -0500 -+ -+libsgmls-perl (1.03ii-24) unstable; urgency=low -+ -+ * debian/rules: moved debhelper compatibility level setting to -+ 'debian/compat' per latest debhelper best practices -+ * debian/control: updated sections according to latest archive changes: -+ - 'libsgmls-perl' from 'text' to 'perl' -+ * debian/control: changed build dependency on 'debhelper' to '(>= 4.1)' -+ * debian/control: upgraded to Debian Policy 3.6.0 (no changes) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sat, 26 Jul 2003 22:15:48 -0500 -+ -+libsgmls-perl (1.03ii-23) unstable; urgency=low -+ -+ * debian/sgmls-doc.links: fixed broken symlink -+ (closes: Bug#158923) -+ * debian/control: added dependency on perl for sgmlspl (warning from linda) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Thu, 19 Sep 2002 19:45:17 -0500 -+ -+libsgmls-perl (1.03ii-22) unstable; urgency=low -+ -+ * debian/rules: added erroneously removed 'dh_testroot' to 'binary-indep' -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sun, 4 Aug 2002 16:33:00 -0500 -+ -+libsgmls-perl (1.03ii-21) unstable; urgency=low -+ -+ * debian/rules: upgraded to debhelper v4 -+ * debian/control: changed build dependency on debhelper accordingly -+ * debian/rules: migrated from 'dh_movefiles' to 'dh_install' -+ * debian/rules: split off 'install' target from 'binary-indep' target -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sun, 4 Aug 2002 09:41:59 -0500 -+ -+libsgmls-perl (1.03ii-20) unstable; urgency=low -+ -+ * Removed explicit support of dhelp since doc-base now takes care of this -+ * debian/control: upgraded to Debian Policy 3.5.6 -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sun, 4 Nov 2001 16:13:15 -0600 -+ -+libsgmls-perl (1.03ii-19) unstable; urgency=low -+ -+ * debian/control: upgraded to Debian Policy 3.5.5 -+ * debian/control: upgraded to Debian Perl Policy 1.20 -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sat, 1 Sep 2001 22:03:51 -0500 -+ -+libsgmls-perl (1.03ii-18) unstable; urgency=low -+ -+ * Makefile.PL: removed handling of manpage sgmlspl.1 -+ * debian/control: added handling of manpage sgmlspl.1 -+ (closes: Bug#94518) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Mon, 30 Apr 2001 21:26:08 -0500 -+ -+libsgmls-perl (1.03ii-17) unstable; urgency=low -+ -+ * debian/control: updated debhelper dependency to remove dh_testversion -+ * debian/control: upgraded to Debian Policy 3.5.2 -+ * debian/control: upgraded to Debian Perl Policy 1.17 -+ * debian/rules: upgraded to Debian Perl Policy 1.17 -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sat, 14 Apr 2001 20:49:19 -0500 -+ -+sgmlspm (1.03ii-16) unstable; urgency=low -+ -+ * debian/control: upgraded to Debian Policy 3.2.1 -+ * debian/rules: upgraded to debhelper v3 -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Mon, 15 Jan 2001 19:35:32 -0600 -+ -+sgmlspm (1.03ii-15) unstable; urgency=low -+ -+ * debian/control: updated short descriptions -+ * debian/control: added missing Build-Depends -+ * debian/rules: added missing `$(MAKE) test` -+ * debian/rules: added missing build-stamp stuff -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sun, 11 Jun 2000 19:40:09 +0200 -+ -+sgmlspm (1.03ii-14) frozen unstable; urgency=high -+ -+ * sgmlspl.pl: updated to reflect change in spec files location -+ (closes: #58443) (thanks Yann!!!) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sun, 20 Feb 2000 09:35:08 +0100 -+ -+sgmlspm (1.03ii-13) unstable; urgency=high -+ -+ * sgmlspl.pl: updated to reflect change in spec files location -+ (closes: #58443) (thanks Yann!!!) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Sat, 19 Feb 2000 19:38:22 +0100 -+ -+sgmlspm (1.03ii-12) unstable; urgency=low -+ -+ * Moved HTML documentation to separate package sgmls-doc -+ (closes: #52856) (thanks Andreas!) -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Thu, 30 Dec 1999 11:42:02 +0100 -+ -+sgmlspm (1.03ii-11) unstable; urgency=low -+ -+ * Removed test-SGMLS.pl from examples -+ * Moved skel.pl from libsgmls-perl to sgmlspl and into a new direcotry -+ /usr/lib/perl5/sgmlspl-specs -+ (closes: #52169) (thanks Yann!) -+ * Upgraded to Debian Policy 3.1.1 -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Mon, 13 Dec 1999 21:54:48 +0100 -+ -+sgmlspm (1.03ii-10) unstable; urgency=low -+ -+ * Split binary package into libsgmls-perl and sgmlspl. The former only -+ contains the SGMLS Perl modules, documentation and examples. The -+ latter only contains the (example) Perl script `sgmlspl' and its -+ documentation -+ * Turned libsgmls-perl into a 'real' Perl package with Makefile.PL and all -+ (closes: #39684) -+ * Added doc-base support -+ (closes: #31181) -+ * Added manual page for sgmlspl -+ (closes: #17909) -+ * Upgraded to Debian Policy 3.0.1 -+ * Upgraded to Debian Perl Policy 1.1 -+ * Made lintian-free -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Tue, 26 Oct 1999 19:58:37 +0200 -+ -+sgmlspm (1.03ii-9) unstable; urgency=low -+ -+ * Complies with Perl packaging standard 1.0 -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Tue, 13 Jul 1999 19:19:39 -0500 -+ -+sgmlspm (1.03ii-8) unstable; urgency=low -+ -+ * debian/control: fixed typo in description -+ (closes: Bug#27441) -+ * Maintainer's email address changed -+ -+ -- Ardo van Rangelrooij <ardo@debian.org> Mon, 5 Oct 1998 19:14:22 +0200 -+ -+sgmlspm (1.03ii-7) frozen unstable; urgency=low -+ -+ * debian/rules: corrected upstream ChangeLog installation (lintian bug) -+ * debian/copyright: updated postal address of the FSF (lintian bug) -+ -+ -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl> Sun, 26 Apr 1998 17:03:11 +0200 -+ -+sgmlspm (1.03ii-6) frozen unstable; urgency=low -+ -+ * debian/rules: added sgmlspl man page as undocumented man page -+ * debian/rules: changed to use debhelper -+ * debian/rules: removed handling of index.html links -+ * Makefile: added handling of index.html links -+ * debian/control: updated to debian standard 2.4.0.0 -+ * debian/rules: removed installation of DocBook examples -+ (closes: Bug#19689) -+ -+ -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl> Mon, 6 Apr 1998 19:37:59 +0200 -+ -+sgmlspm (1.03ii-5) unstable; urgency=low -+ -+ * Fixed permissions bug -+ (closes: Bug#17490) -+ -+ -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl> Wed, 18 Feb 1998 21:30:57 +0100 -+ -+sgmlspm (1.03ii-4) unstable; urgency=low -+ -+ * New maintainer. -+ -+ -- Ardo van Rangelrooij <ardo.van.rangelrooij@tip.nl> Wed, 14 Jan 1998 21:29:45 +0100 -+ -+sgmlspm (1.03ii-3) frozen unstable; urgency=low -+ -+ * Updated Standards-Version to 2.1.3.0. -+ * New maintainer. -+ -+ -- Christian Schwarz <schwarz@debian.org> Thu, 17 Apr 1997 15:53:51 +0200 -+ -+sgmlspm (1.03ii-2) unstable; urgency=low -+ -+ * Split binary target into binary-indep and binary-arch. -+ * Updated Standards-Version. -+ * Released into unstable. -+ -+ -- Ian Jackson <ian@chiark.chu.cam.ac.uk> Fri, 23 Aug 1996 12:11:40 +0100 -+ -+sgmlspm (1.03ii-1) experimental; urgency=LOW -+ -+ * Initial Debian release. -+ -+ -- Ian Jackson <ian@chiark.chu.cam.ac.uk> Sat, 10 Aug 1996 01:47:30 +0100 ---- libsgmls-perl-1.03ii.orig/debian/sgmls-doc.docs -+++ libsgmls-perl-1.03ii/debian/sgmls-doc.docs -@@ -0,0 +1,2 @@ -+DOC/HTML/SGMLSpm -+DOC/HTML/sgmlspl ---- libsgmls-perl-1.03ii.orig/debian/libsgmls-perl.install -+++ libsgmls-perl-1.03ii/debian/libsgmls-perl.install -@@ -0,0 +1,2 @@ -+usr/share/perl5/SGMLS* -+usr/share/man/man3 ---- libsgmls-perl-1.03ii.orig/debian/sgmls-doc.doc-base.sgmlspl -+++ libsgmls-perl-1.03ii/debian/sgmls-doc.doc-base.sgmlspl -@@ -0,0 +1,9 @@ -+Document: sgmlspl -+Title: sgmlspl -+Author: David Megginson -+Abstract: This manual describes the (example) sgmlspl Perl script -+Section: Text -+ -+Format: HTML -+Index: /usr/share/doc/sgmls-doc/sgmlspl/index.html -+Files: /usr/share/doc/sgmls-doc/sgmlspl/*.html ---- libsgmls-perl-1.03ii.orig/debian/copyright -+++ libsgmls-perl-1.03ii/debian/copyright -@@ -0,0 +1,28 @@ -+This is Debian GNU/Linux's prepackaged version of David Megginson's -+sgmlspm-1.03ii Perl modules for processing sgmls and nsgmls output. -+ -+This package was put together by me, Ian Jackson -+<ijackson@gnu.ai.mit.edu>, from the sources on src.doc.ic.ac.uk in -+/packages/perl/CPAN/modules/by-module/SGMLS/SGMLSpm-1.03ii.tar.gz. -+The changes were very minimal - merely adding support for the Debian -+package maintenance scheme, by adding various debian/* files. -+ -+Program Copyright (C)1994,1995 David Megginson. -+Modifications for Debian Copyright (C)1996 Ian Jackson. -+Modifications for Debian Copyright (C) 1998,1999 Ardo van Rangelrooij -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+This program is distributed in the hope that it will be useful, but -+WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+General Public License for more details. -+ -+You should have received a copy of the GNU General Public License with -+your Debian GNU/Linux system, in /usr/share/common-licenses/GPL-2, or -+with the Debian GNU/Linux hello source package as the file COPYING. -+If not, write to the Free Software Foundation, Inc., 51 Franklin -+Street, Fifth Floor, Boston, MA 02110-1301 USA. ---- libsgmls-perl-1.03ii.orig/debian/compat -+++ libsgmls-perl-1.03ii/debian/compat -@@ -0,0 +1 @@ -+5 ---- libsgmls-perl-1.03ii.orig/debian/sgmls-doc.links -+++ libsgmls-perl-1.03ii/debian/sgmls-doc.links -@@ -0,0 +1,2 @@ -+usr/share/doc/sgmls-doc/SGMLSpm/sgmlspm.html usr/share/doc/sgmls-doc/SGMLSpm/index.html -+usr/share/doc/sgmls-doc/sgmlspl/sgmlspl.html usr/share/doc/sgmls-doc/sgmlspl/index.html ---- libsgmls-perl-1.03ii.orig/debian/watch -+++ libsgmls-perl-1.03ii/debian/watch -@@ -0,0 +1,2 @@ -+version=3 -+http://www.cpan.org/modules/by-module/SGMLS/SGMLSpm-([\d.]+[\w]+).tar.gz ---- libsgmls-perl-1.03ii.orig/debian/sgmlspl.install -+++ libsgmls-perl-1.03ii/debian/sgmlspl.install -@@ -0,0 +1,2 @@ -+usr/bin -+/usr/share/perl5/sgmlspl-specs ---- libsgmls-perl-1.03ii.orig/debian/libsgmls-perl.docs -+++ libsgmls-perl-1.03ii/debian/libsgmls-perl.docs -@@ -0,0 +1,2 @@ -+BUGS -+TODO ---- libsgmls-perl-1.03ii.orig/sgmlspl -+++ libsgmls-perl-1.03ii/sgmlspl -@@ -0,0 +1,326 @@ -+#!/usr/bin/perl -+######################################################################## -+# sgmlspl: a simple SGML postprocesser for the SGMLS and NSGMLS -+# parsers (requires SGMLS.pm library). -+# -+# Copyright (c) 1995 by David Megginson <dmeggins@aix1.uottawa.ca> -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+# -+# $Log: sgmlspl,v $ -+# Revision 1.2 2008-01-03 23:49:25 ardo -+# applied patch for 414110 & upgraded policy -+# -+# Revision 1.1 2004/02/23 01:23:07 ardo -+# Added debian changes for version 1.03ii-27. -+# -+# Revision 1.1 2001/04/15 14:42:01 ardo -+# *** empty log message *** -+# -+# Revision 1.8 1995/12/03 21:46:31 david -+# Eliminated all use of the SGMLS_Event::key method. -+# -+# Revision 1.7 1995/11/15 20:22:24 david -+# Changed "use Output" to "use SGMLS::Output". Qualified the STDIN -+# filehandle for the SGMLS object with the main:: package name. -+# -+# Revision 1.6 1995/08/12 16:15:14 david -+# Revised version for 1.01 distribution. -+# -+# Revision 1.5 1995/04/27 11:52:25 david -+# Changed 'print' to 'main::output' for re handler; empty string -+# translates into an empty sub {} rather than a sub printing an empty -+# string; instead of evaluating every argument as a perl script, take -+# only the first as a perl script and the rest as its arguments; allow -+# empty scripts or scripts which do not end with '1;'; pass the event -+# itself as the second argument to each handler, after the event data. -+# -+# Revision 1.4 1995/04/23 14:44:58 david -+# Use the Output package. Fixed the $version variable. -+# -+# Revision 1.3 1995/04/22 21:02:49 david -+# Added some missing 'last SWITCH;' statements in the sgmls function. -+# -+# Revision 1.2 1995/04/22 20:58:48 david -+# Added $SGMLS_PL::version variable and changed SDATA notation from -+# [SDATA] to |SDATA|. -+# -+# Revision 1.1 1995/04/22 14:40:50 david -+# Initial revision -+# -+######################################################################## -+ -+use SGMLS::Output; -+ -+package SGMLS_PL; -+use SGMLS; -+ -+$version = '$Id: sgmlspl,v 1.2 2008-01-03 23:49:25 ardo Exp $'; -+ -+# -+# Set up handler defaults. -+# -+$start_document_handler = sub {}; -+$end_document_handler = sub {}; -+$start_element_handlers = { '' => sub {} }; -+$end_element_handlers = { '' => sub {} }; -+$cdata_handler = sub { main::output($_[0]); }; -+$sdata_handlers = { '' => sub { main::output($_[0]);} }; -+$re_handler = sub { main::output("\n"); }; -+$pi_handler = sub { '' => sub {} }; -+$entity_handlers = { '' => sub {} }; -+$start_subdoc_handlers = { '' => sub {} }; -+$end_subdoc_handlers = { '' => sub {} }; -+$conforming_handler = sub {}; -+ -+# -+# Main access point: declare handlers for different SGML events. -+# -+# Usage: sgml(event, handler); -+# -+# The event may be one of the following strings, or a special pattern. -+# The generic events are as follow: -+# -+# 'start' The beginning of the document. -+# 'end' The end of the document. -+# 'start_element' The beginning of an element. -+# 'end_element' The end of an element. -+# 'cdata' Regular character data. -+# 'sdata' Special system-specific data. -+# 're' A record-end. -+# 'pi' A processing instruction. -+# 'entity' An external-entity reference. -+# 'start_subdoc' The beginning of a subdocument entity. -+# 'end_subdoc' The end of a subdocument entity. -+# 'conforming' The document is conforming. -+# -+# In addition to these generic events, it is possible to handlers -+# for certain specific, named events, as follow: -+# -+# '<GI>' The beginning of element GI. -+# '</GI>' The end of element GI. -+# '[SDATA]' The system-specific data SDATA. -+# '&ENAME;' A reference to the external entity ENAME. -+# '{ENAME}' The beginning of the subdocument-entity ENAME. -+# '{/ENAME}' The end of the subdocument-entity ENAME. -+# -+# -+# The handler may be a string, which will simply be printed when the -+# event occurs (this is usually useful only for the specific, named -+# events), or a reference to an anonymous subroutine, which will -+# receive two arguments: the event data and the event itself. For -+# example, -+# -+# sgml('<FOO>', "\n\\begin{foo}\n"); -+# -+# and -+# -+# sgml('<FOO>', sub { output("\n\\begin{foo}\n"); }); -+# -+# will have identical results. -+# -+sub main::sgml { -+ my ($spec,$handler) = (@_); -+ if (ref($handler) ne 'CODE') { -+ $handler =~ s/\\/\\\\/g; -+ $handler =~ s/'/\\'/g; -+ if ($handler eq '') { -+ $handler = sub {}; -+ } else { -+ $handler = eval "sub { main::output('$handler'); };"; -+ } -+ } -+ SWITCH: { -+ # start-document handler -+ $spec eq 'start' && do { -+ $start_document_handler = $handler; -+ last SWITCH; -+ }; -+ # end-document handler -+ $spec eq 'end' && do { -+ $end_document_handler = $handler; -+ last SWITCH; -+ }; -+ # start-element handler -+ $spec =~ /^<([^\/].*|)>$/ && do { -+ $start_element_handlers->{$1} = $handler; -+ last SWITCH; -+ }; -+ # generic start-element handler -+ $spec eq 'start_element' && do { -+ $start_element_handlers->{''} = $handler; -+ last SWITCH; -+ }; -+ # end-element handler -+ $spec =~ /^<\/(.*)>$/ && do { -+ $end_element_handlers->{$1} = $handler; -+ last SWITCH; -+ }; -+ # generic end-element handler -+ $spec =~ 'end_element' && do { -+ $end_element_handlers->{''} = $handler; -+ last SWITCH; -+ }; -+ # cdata handler -+ $spec eq 'cdata' && do { -+ $cdata_handler = $handler; -+ last SWITCH; -+ }; -+ # sdata handler -+ $spec =~ /^\|(.*)\|$/ && do { -+ $sdata_handlers->{$1} = $handler; -+ last SWITCH; -+ }; -+ # generic sdata handler -+ $spec eq 'sdata' && do { -+ $sdata_handlers->{''} = $handler; -+ last SWITCH; -+ }; -+ # record-end handler -+ $spec eq 're' && do { -+ $re_handler = $handler; -+ last SWITCH; -+ }; -+ # processing-instruction handler -+ $spec eq 'pi' && do { -+ $pi_handler = $handler; -+ last SWITCH; -+ }; -+ # entity-reference handler -+ $spec =~ /^\&(.*);$/ && do { -+ $entity_handlers->{$1} = $handler; -+ last SWITCH; -+ }; -+ # generic entity-reference handler -+ $spec eq 'entity' && do { -+ $entity_handlers->{''} = $handler; -+ last SWITCH; -+ }; -+ # start-subdoc handler -+ $spec =~ /^\{([^\/].*|)\}$/ && do { -+ $start_subdoc_handlers->{$1} = $handler; -+ last SWITCH; -+ }; -+ # generic start-subdoc handler -+ $spec eq 'start_subdoc' && do { -+ $start_subdoc_handlers->{''} = $handler; -+ last SWITCH; -+ }; -+ # end-subdoc handler -+ $spec =~ /^\{\/(.*)\}$/ && do { -+ $end_subdoc_handlers->{$1} = $handler; -+ last SWITCH; -+ }; -+ # generic end-subdoc handler -+ $spec eq 'end_subdoc' && do { -+ $end_subdoc_handlers->{''} = $handler; -+ last SWITCH; -+ }; -+ # conforming handler -+ $spec eq 'conforming' && do { -+ $conforming_handler = $handler; -+ last SWITCH; -+ }; -+ -+ die "Bad SGML handler pattern: $spec\n"; -+ } -+} -+ -+ -+# -+# The first argument on the command line is a perl module which will be -+# read here and evaluated in the 'main' package -- everything else will -+# be an argument to it. -+# -+package main; -+ -+$ARGV = shift; -+unless ($ARGV eq '' || do 'sgmlspl-specs/' . $ARGV || do $ARGV) { -+ if (!-e $ARGV) { -+ die "FATAL: $ARGV does not exist.\n"; -+ } elsif (!-r $ARGV) { -+ die "FATAL: $ARGV exists but is read-protected.\n"; -+ } elsif ($@) { -+ die "FATAL: $@\n"; -+ } -+} -+ -+ -+# -+# Do the actual work, using the SGMLS package. -+# -+package SGMLS_PL; -+ -+$parse = new SGMLS(main::STDIN); # a new parse object -+ -+&{$start_document_handler}(); # run the start handler. -+ -+ # run the appropriate handler for each -+ # event -+while ($event = $parse->next_event) { -+ my $type = $event->type; -+ SWITCH: { -+ $type eq 'start_element' && do { -+ &{($start_element_handlers->{$event->data->name}|| -+ $start_element_handlers->{''} || sub {})}($event->data,$event); -+ last SWITCH; -+ }; -+ $type eq 'end_element' && do { -+ &{($end_element_handlers->{$event->data->name}|| -+ $end_element_handlers->{''} || sub {})}($event->data,$event); -+ last SWITCH; -+ }; -+ $type eq 'cdata' && do { -+ &{$cdata_handler}($event->data,$event); -+ last SWITCH; -+ }; -+ $type eq 'sdata' && do { -+ &{($sdata_handlers->{$event->data}|| -+ $sdata_handlers->{''} || sub {})}($event->data,$event); -+ last SWITCH; -+ }; -+ $type eq 're' && do { -+ &{$re_handler}($event->data,$event); -+ last SWITCH; -+ }; -+ $type eq 'pi' && do { -+ &{$pi_handler}($event->data,$event); -+ last SWITCH; -+ }; -+ $type eq 'entity' && do { -+ &{($entity_handlers->{$event->data->name}|| -+ $entity_handlers->{''} || sub {})}($event->data,$event); -+ last SWITCH; -+ }; -+ $type eq 'start_subdoc' && do { -+ &{($start_subdoc_handlers->{$event->data->name}|| -+ $start_subdoc_handlers->{''} || sub {})}($event->data,$event); -+ last SWITCH; -+ }; -+ $type eq 'end_subdoc' && do { -+ &{($end_subdoc_handlers->{$event->data->name}|| -+ $end_subdoc_handlers->{''} || sub {})}($event->data,$event); -+ last SWITCH; -+ }; -+ $type eq 'conforming' && do { -+ &{$conforming_handler}($event->data,$event); -+ last SWITCH; -+ }; -+ -+ die "Unknown SGML event type: $type\n"; -+ } -+} -+ -+&{$end_document_handler}(); # run the end handler diff --git a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.13-letter.patch b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.13-letter.patch new file mode 100644 index 000000000..232d1307c --- /dev/null +++ b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.13-letter.patch @@ -0,0 +1,24 @@ +--- linuxdoc-tools-0.9.13/perl5lib/LinuxDocTools.pm.letter Mon Nov 26 16:09:37 2001 ++++ linuxdoc-tools-0.9.13/perl5lib/LinuxDocTools.pm Mon Nov 26 16:09:49 2001 +@@ -108,7 +108,7 @@ + { option => "pass", type => "s", short => "P" } + ]; + $global->{backend} = "linuxdoc"; +- $global->{papersize} = "a4"; ++ $global->{papersize} = "letter"; + $global->{language} = "en"; + $global->{charset} = "ascii"; + $global->{style} = ""; +--- linuxdoc-tools-0.9.13/man/linuxdoc.1.letter Mon Nov 26 16:10:04 2001 ++++ linuxdoc-tools-0.9.13/man/linuxdoc.1 Mon Nov 26 16:10:42 2001 +@@ -46,8 +46,8 @@ + format, but just output the usage of this suites. + Available formats are: html, info, latex, lyx, rtf, txt, check. + .IP "--papersize=\fIsize\fR, -p +-Set the paper size. Default is ``a4'' (European 297x210mm paper). +-You may also specify ``letter'' size. ++Set the paper size. Default is ``letter''. ++You may also specify ``a4'' size (European 297x210mm paper). + .IP "--language=\fIlang\fR, -l" + Specify the language of the document (this may change which style + files are used for formatting by a back end). The default language is diff --git a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.20-lib64.patch b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.20-lib64.patch new file mode 100644 index 000000000..66ff2a31e --- /dev/null +++ b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.20-lib64.patch @@ -0,0 +1,10 @@ +--- linuxdoc-tools-0.9.60/bin/linuxdoc.in.orig ++++ linuxdoc-tools-0.9.60/bin/linuxdoc.in +@@ -23,6 +23,7 @@ + $AuxBinDir = "@auxbindir@"; + + use lib "@pkgdatadir@"; ++use lib "@prefix@/lib64/perl5"; + use lib "@perl5libdir@"; + + # --------------------------------------------------------------------- diff --git a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch new file mode 100644 index 000000000..ba3da2ee8 --- /dev/null +++ b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch @@ -0,0 +1,17 @@ +--- linuxdoc-tools-0.9.68/rtf-fix/rtf2rtf.l 2008-05-28 18:16:36.000000000 +0200 ++++ linuxdoc-tools-0.9.68/rtf-fix/rtf2rtf.l-patched 2013-02-19 11:10:25.367016000 +0100 +@@ -72,7 +72,14 @@ + int skipnewline = 0; + + extern char *yytext; ++ ++#if YY_FLEX_MAJOR_VERSION > 2 \ ++ || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 5) \ ++ || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION > 35) ++extern yy_size_t yyleng; ++#else + extern int yyleng; ++#endif + + #define CHAPTER 1 + #define SECTION 2 diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download index e82436972..d723574cb 100755 --- a/source/ap/linuxdoc-tools/sources/source.download +++ b/source/ap/linuxdoc-tools/sources/source.download @@ -6,14 +6,18 @@ # Some sources have been recompressed with LZMA for better compression results. # linuxdoc-tools: +# https://packages.debian.org/sid/linuxdoc-tools +# # This provides things such as sgml2txt. -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/l/linuxdoc-tools-0.9.68-3.fc19.src.rpm +wget -c http://ftp.de.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.69.orig.tar.gz +# We're taking some patches from here - now separated out: +#wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/l/linuxdoc-tools-0.9.68-3.fc19.src.rpm # OpenSP: # http://openjade.sourceforge.net/download.html # wget -c http://kent.dl.sourceforge.net/sourceforge/openjade/OpenSP-1.5.2.tar.gz # -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/opensp-1.5.2-16.fc19.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/opensp-1.5.2-22.fc23.src.rpm # OpenJade: # http://openjade.sourceforge.net/ @@ -27,7 +31,7 @@ wget -c http://downloads.sourceforge.net/openjade/openjade-1.3.3-pre1.tar.gz # sgmltools-common. # It's broken and needs patching so we'll use Fedora's. #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/s/sgml-common-0.6.3-39.fc19.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/s/sgml-common-0.6.3-43.fc23.src.rpm # DocBook docs: @@ -36,6 +40,7 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/ #wget -c http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip #wget -c http://www.docbook.org/sgml/4.5/docbook-4.5.zip # We use Debian's source because it's more convenient since they package all versions in one archive: +# https://packages.debian.org/search?keywords=docbook&searchon=names&suite=all§ion=all wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz # # http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html @@ -45,12 +50,14 @@ wget -c ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/docbook-dsssl-1.79.tar wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1.79.tar.bz2 # Why don't they put the patches into the distributed source...??? #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-utils-0.6.14-35.fc19.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-utils-0.6.14-39.fc23.src.rpm # # +# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook.html wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip # https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608 -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-style-xsl-1.78.1-1.fc20.src.rpm +# +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-style-xsl-1.78.1-4.fc23.src.rpm # # We use the Fedora "docbook-style-xsl" SRPM for this rather than the original source which is why # these "docbook-xsl*" files aren't in our sources directory. @@ -63,13 +70,13 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/ # I guess this mirror is out of date now. It's easier to just look at Fedora's development # directory anyway :-) # wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.0.tar.bz2 -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/g/gnome-doc-utils-0.20.10-4.fc19.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/g/gnome-doc-utils-0.20.10-7.fc23.src.rpm # gtk-doc: -# When upgrading this, it's worth checking the Fedora SRPM. For version 1.13 -# we're carrying a fix for gtk-doc-fixref. Make sure newer versions don't need -# any patches! -wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gtk-doc/1.19/gtk-doc-1.19.tar.xz +# There aren't any patches taken from the SRPM, but you can check the version used in Fedora +# and see if any are being applied. We will pull the source archive from the SRPM: +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/g/gtk-doc-1.24-2.fc23.src.rpm +#wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gtk-doc/1.21/gtk-doc-1.21.tar.xz # http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 # sgmlspl @@ -77,27 +84,27 @@ wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gtk-doc/1.19/gtk-doc-1.19.tar.xz # http://packages.debian.org/search?keywords=sgmlspl&searchon=names&suite=all§ion=all # There's nothing in the FTP download site at this time, so I'll take it from Debian. wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz -wget -c http://ftp.de.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-32.diff.gz +wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-33.debian.tar.xz # xmlto # https://fedorahosted.org/releases/x/m/xmlto # wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2 # Fedora includes a patch, so we'll take it: -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/x/xmlto-0.0.25-6.fc20.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/x/xmlto-0.0.26-4.fc23.src.rpm # AsciiDoc # http://www.methods.co.nz/asciidoc/ -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/a/asciidoc-8.6.8-1.fc19.src.rpm +#wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/a/asciidoc-8.6.8-1.fc19.src.rpm # docbook2X: # # Pre-requisite PERL modules for docbook2X: -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-NamespaceSupport-1.11-10.fc19.src.rpm -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-SAX-Base-1.08-7.fc19.src.rpm -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-SAX-0.99-9.fc19.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-NamespaceSupport-1.11-16.fc23.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-SAX-Base-1.08-14.fc23.src.rpm +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-SAX-0.99-15.fc23.src.rpm # #http://packages.debian.org/sid/docbook2x # Fedora keep it here, but Debian have a couple of (what look to be useful) patches. #wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook2X-0.8.8-14.fc19.src.rpm wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8.orig.tar.gz -wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8-8.diff.gz +wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8-9.debian.tar.gz diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools index 4e3b2b3cf..16bb30246 100755 --- a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools +++ b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools @@ -24,7 +24,7 @@ PKGNAM=linuxdoc-tools # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=armv7hl ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -32,8 +32,8 @@ if [ -z "$ARCH" ]; then esac fi -export PKGVERSION=0.9.68 # use the version of linuxdoc-tools as the package version. -BUILD=${BUILD:-4} +export PKGVERSION=0.9.69 # use the version of linuxdoc-tools as the package version. +BUILD=${BUILD:-5} PKGEXT=${PKGEXT:-txz} export CWD=$PWD |