debian/0000775000000000000000000000000012043533304007165 5ustar debian/watch0000664000000000000000000000015112024122507010211 0ustar version=3 ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-([\d\.]+)\.tar\.gz debian/rules0000775000000000000000000000052112024122507010241 0ustar #!/usr/bin/make -f # export DH_VERBOSE=1 %: dh $@ --with autotools_dev override_dh_auto_configure: dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man override_dh_auto_install: dh_auto_install -- prefix=$(DESTDIR)/usr docdir=$(DESTDIR)/usr/share/doc/docbook-utils get-orig-source: uscan --verbose --force-download debian/docbook-utils.docs0000664000000000000000000000001412024122507012606 0ustar README TODO debian/TODO0000664000000000000000000000420412024122507007653 0ustar ------------------------------------------------------------------------------ To do list for docbook-utils ------------------------------------------------------------------------------ BUGS: ------------------------------------------------------------------------------ Number Description ------------------------------------------------------------------------------ 146814 multiple space not collapsed into one within 147182 docbook2* crashes if there is spaces in name or in path of the sgml file 152100 jw can't cope with spaces in the name of the current directory 204599 qandaset bug with db2html 205249 apt_preferences(5) uses hyphens instead of minus signs 208967 docbook2man uses hyphens instead of minus signs 212088 docbook frontend runs sgmlnorm on xml input, causing long delays 214982 docbook2man has a locale-dependent output 215286 jw pollutes stdout 222744 jw -b txt --nochunks creates a bogus .html file 236050 Improper page size with letter paper 271611 docbook2man doesn't understands much of SDATA and dies on it 275206 docbook2rtf not including images 275715 update docbook2man-spec.pl ------------------------------------------------------------------------------ WISHLIST: ------------------------------------------------------------------------------ Number Description ------------------------------------------------------------------------------ 173214 please could you lower dependency heavyness 175846 docbook2man: some strange output 176974 registering docbook-utils.dsl ? 180066 jw and backends make debugging nearly impossible 189951 docbook2man could support XML as well as SGML 249290 allow opensp instead of sp dependency 253085 please i18n/l10n docbook2man-spec.pl ------------------------------------------------------------------------------ VARIOUS: ------------------------------------------------------------------------------ Description ------------------------------------------------------------------------------ * added friendly error message if no text backend found * improve error message in general (?) * make lintian-free ------------------------------------------------------------------------------ debian/docbook-utils.links0000664000000000000000000000075212024122507013007 0ustar usr/bin/docbook2dvi usr/bin/db2dvi usr/bin/docbook2ps usr/bin/db2ps usr/bin/docbook2rtf usr/bin/db2rtf usr/bin/docbook2pdf usr/bin/db2pdf usr/share/man/man1/jw.1 usr/share/man/man1/docbook2txt.1 usr/share/man/man1/jw.1 usr/share/man/man1/db2html.1 usr/share/man/man1/docbook2dvi.1 usr/share/man/man1/db2dvi.1 usr/share/man/man1/docbook2ps.1 usr/share/man/man1/db2ps.1 usr/share/man/man1/docbook2rtf.1 usr/share/man/man1/db2rtf.1 usr/share/man/man1/docbook2pdf.1 usr/share/man/man1/db2pdf.1 debian/README.Debian0000664000000000000000000000025012024122507011221 0ustar docbook-utils for Debian ------------------------ This package replace docbook2man, docbook2texi and cygnus-stylesheets. -- Christian Marillat debian/changelog0000664000000000000000000002205612043533262011047 0ustar docbook-utils (0.6.14-3ubuntu1) raring; urgency=low * Merge from Debian unstable. Remaining changes: - Move the Multi-Arch header from the source to the binary. -- Adam Conrad Mon, 29 Oct 2012 17:02:27 +0000 docbook-utils (0.6.14-3) unstable; urgency=medium * Redo patch for 212088, it breaks on some system. Closes: #685766 edited in place: debian/patches/bug_212088.patch -- Mathieu Malaterre Wed, 12 Sep 2012 11:47:57 +0200 docbook-utils (0.6.14-2ubuntu1) quantal; urgency=low * Merge from Debian testing. Remaining changes: - Move the Multi-Arch header from the source to the binary. -- Adam Conrad Tue, 17 Jul 2012 04:24:04 -0600 docbook-utils (0.6.14-2) unstable; urgency=low * Bump Std-Vers to 3.9.3, no changes needed * Switch to dpkg-source 3.0 (quilt) format * Add Multi-Arch: foreign. Closes: #665991 * Add myself as Uploaders * support links2. Closes: #472330 * Apply patches from the bug trackers: Closes: #212088, #214982, #394511, #528334 -- Mathieu Malaterre Wed, 09 May 2012 19:23:52 +0200 docbook-utils (0.6.14-1.1ubuntu1) precise; urgency=low * Make docbook-utils Multi-Arch: foreign (LP: 950886) -- Wookey Fri, 09 Mar 2012 12:31:48 +0000 docbook-utils (0.6.14-1.1) unstable; urgency=medium * Non-maintainer upload. * Fix bashism in 'jw' script (Closes: #472894) * Apply patch to escape "." and "'" properly which was causing breakage in some manpages. Patch by Nicolas François. (Closes: #399947) * Bump Standards-Version to 3.7.3 -- Chris Lamb Mon, 02 Jun 2008 03:40:32 +0100 docbook-utils (0.6.14-1) unstable; urgency=low * New upstream release * debian/control: added 'w3m' to 'Depends' as 'docbook2txt' now also supports 'w3m' as backend * debian/TODO: updated * Added 'debian/watch' -- Ardo van Rangelrooij Sat, 20 Nov 2004 13:09:46 -0600 docbook-utils (0.6.13-7) unstable; urgency=low * debian/db2html: removed executable file permissions * debian//rules: added 'chmod +x debian/db2html' (closes: Bug#247415) -- Ardo van Rangelrooij Thu, 20 May 2004 20:17:08 -0500 docbook-utils (0.6.13-6) unstable; urgency=low * debian/db2html: fixed permissions (closes: Bug#247415) -- Ardo van Rangelrooij Sun, 16 May 2004 09:16:43 -0500 docbook-utils (0.6.13-5) unstable; urgency=low * Moved backends to '/usr/share/docbook-utils/backends': - backends/Makefile.am: - backends/Makefile.in: - doc/man/jw.1 - doc/ref/jw.sgml - bin/jw.in * Moved frontends to '/usr/share/docbook-utils/frontends': - bin/jw.in - doc/ref/jw.sgml - doc/man/jw.1 - frontends/Makefile.am - frontends/Makefile.in * Moved helpers to '/usr/share/perl5/sgmlspl-specs': - backends/man.in - backends/texi.in - doc/ref/jw.sgml - doc/man/jw.1 - helpers/Makefile.am - helpers/Makefile.in * Moved 'docbook-utils.dsl' to '/usr/share/docbook-utils': - Makefile.am - Makefile.in - frontends/docbook.in * Folded debian/patches/* into source * debian/control: changed 'Maintainer' to 'Debian XML/SGML Group ' and added current maintainer to 'Uploaders' -- Ardo van Rangelrooij Tue, 20 Apr 2004 22:41:15 -0500 docbook-utils (0.6.13-4) unstable; urgency=low * New maintainer (closes: Bug#211053) * Added debian/TODO -- Ardo van Rangelrooij Sun, 12 Oct 2003 15:29:03 -0500 docbook-utils (0.6.13-3.1) unstable; urgency=low * NMU * Use /etc/sgml/catalog for both SGML and XML. Same issue as bugs 119498 and 119355, but for XML rather than SGML. (closes: #211617) -- Neil Roeth Tue, 23 Sep 2003 11:51:29 -0400 docbook-utils (0.6.13-3) unstable; urgency=low * I don't use this package anymore, orphaned. -- Christian Marillat Mon, 15 Sep 2003 17:24:00 +0200 docbook-utils (0.6.13-2) unstable; urgency=low * Remove my docbook hack, not necessary (Closes: #197603) -- Christian Marillat Mon, 16 Jun 2003 18:34:15 +0200 docbook-utils (0.6.13-1) unstable; urgency=low * New upstream release. -- Christian Marillat Sat, 10 May 2003 17:11:11 +0200 docbook-utils (0.6.12-4) unstable; urgency=low * Move helpers file in the right place (CLoses: #184216) * Improve description (Closes: #185825) -- Christian Marillat Sun, 23 Mar 2003 16:03:51 +0100 docbook-utils (0.6.12-3) unstable; urgency=low * Add patche stolen from CVS who add localization in docbook2man (Closes: #153091, #154301) * Apply patche from Daniel Schepler to fix mixed output in ps file (Closes: #176204, #174787, #171985) * Bump Standards-Version to 3.5.8 * Work with dash (Closes: #170039) -- Christian Marillat Mon, 13 Jan 2003 16:56:28 +0100 docbook-utils (0.6.12-2) unstable; urgency=low * Add docbook-dsssl in build-depends (Closes: #165299) -- Christian Marillat Fri, 18 Oct 2002 11:40:36 +0200 docbook-utils (0.6.12-1) unstable; urgency=low * New upstream release. * Remove docbook2man-spec.pl included by upstream * docbook2texi doesn't mix log with output (Closes: #115329) -- Christian Marillat Mon, 14 Oct 2002 18:30:47 +0200 docbook-utils (0.6.11-2) unstable; urgency=low * Update to standards version 3.5.7 -- Christian Marillat Sat, 21 Sep 2002 14:50:58 +0200 docbook-utils (0.6.11-1) unstable; urgency=low * New upstream release. * Fix problem when building java-common (Closes: #146482) -- Christian Marillat Mon, 8 Jul 2002 15:54:49 +0200 docbook-utils (0.6.10-2) unstable; urgency=low * Should build-depends on jade (Closes: #145986) * Fix title in doc-base (Closes: #146996) * Fix path for xml.dcl (Closes: #149414) -- Christian Marillat Wed, 12 Jun 2002 08:28:18 +0200 docbook-utils (0.6.10-1) unstable; urgency=low * New upstream release. * docbook2pdf work with a _ in the sgml filename (Closes: #144867) * Add links in depends (lynx | links) * More robust XML/SGML detection (Closes: #115329) -- Christian Marillat Wed, 1 May 2002 20:31:38 +0200 docbook-utils (0.6.9-12) unstable; urgency=low * Little hack against db2html to work with xml files (Closes: #134597) * Call docbook2txt with html instaed of print (Closes: #133933) * Call lynx with -nolist for the txt backend. -- Christian Marillat Thu, 28 Feb 2002 17:46:59 +0100 docbook-utils (0.6.9-11) unstable; urgency=low * Need to depends on lynx for docbook2txt, and hack the txt backend to pipe the output to lynx instead of writing to a temporary file (Closes: #133633) -- Christian Marillat Wed, 13 Feb 2002 17:13:56 +0100 docbook-utils (0.6.9-10) unstable; urgency=low * Instal db2html with install instead of cp (Closes: #131941) * New patche against the txt backends to fix a typo (Closes: #132462) -- Christian Marillat Tue, 5 Feb 2002 15:23:52 +0100 docbook-utils (0.6.9-9) unstable; urgency=low * Add docbook-xml in recommends * Move package from Conflicts to Replaces (Closes: #131306) -- Christian Marillat Wed, 30 Jan 2002 01:06:15 +0100 docbook-utils (0.6.9-8) unstable; urgency=low * debian/control Spell check (Closes: #124561) * Add patch from Jochen Voss (Closes: #128794) -- Christian Marillat Fri, 11 Jan 2002 20:53:03 +0100 docbook-utils (0.6.9-7) unstable; urgency=low * Change the path to find xml.dcl (Closes: #121202) * Patch for a working 'ULINK, &ndash' (Closes: #120564) -- Christian Marillat Mon, 26 Nov 2001 12:43:19 +0100 docbook-utils (0.6.9-6) unstable; urgency=low * set SGML_CATALOG_FILES to /etc/sgml/catalog (Closes: #119498) -- Christian Marillat Tue, 20 Nov 2001 19:18:54 +0100 docbook-utils (0.6.9-5) unstable; urgency=low * Add two spaces in description list (Closes: #114874) * Call docbook2man with -n (Closes: #119355) * debian/control Add cygnus-stylesheets in conflicts -- Christian Marillat Wed, 14 Nov 2001 11:55:46 +0100 docbook-utils (0.6.9-4) unstable; urgency=low * Depends on docbook-dsssl (Closes: #114109) -- Christian Marillat Mon, 1 Oct 2001 20:40:26 +0200 docbook-utils (0.6.9-3) unstable; urgency=low * Add a symlink docbook2pdf -> db2pdf (Closes: #113563) * Build-depends on automake (Closes: #113937) -- Christian Marillat Sun, 30 Sep 2001 10:39:23 +0200 docbook-utils (0.6.9-2) unstable; urgency=low * Dpends on sp and sgmlspl (Closes: #113174) -- Christian Marillat Sat, 22 Sep 2001 22:16:18 +0200 docbook-utils (0.6.9-1) unstable; urgency=low * Initial Release (Closes: #112666) -- Christian Marillat Tue, 18 Sep 2001 15:38:59 +0200 debian/docbook-utils.doc-base0000664000000000000000000000042312024122507013337 0ustar Document: docbook-utils Title: Docbook-utils Manual Author: Eric Bischoff Abstract: This manual describes docbook-utils Section: Text Format: HTML Index: /usr/share/doc/docbook-utils/html/index.html Files: /usr/share/doc/docbook-utils/html/*.html debian/copyright0000664000000000000000000000104412024122507011115 0ustar This package was debianized by Christian Marillat on Wed, 8 Aug 2001 11:22:50 +0200. It was downloaded from ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/ Upstream Author: Eric Bischoff Copyright: 2000, 2001 Eric Bischoff You should have received a copy of the GNU General Public License with the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA debian/compat0000664000000000000000000000000212024122507010361 0ustar 5 debian/docbook-utils.install0000664000000000000000000000002712024122507013330 0ustar debian/db2html usr/bin debian/source/0000775000000000000000000000000012024122507010463 5ustar debian/source/format0000664000000000000000000000001412024122507011671 0ustar 3.0 (quilt) debian/control0000664000000000000000000000260112024122507010565 0ustar Source: docbook-utils Section: text Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian XML/SGML Group Uploaders: Ardo van Rangelrooij , Mathieu Malaterre Standards-Version: 3.9.3 Build-Depends-Indep: debhelper (>= 7.0.50~), docbook-dsssl, jade, perl, sgmlspl, sp, autotools-dev Homepage: http://sources.redhat.com/docbook-tools/ Vcs-Browser: http://anonscm.debian.org/viewvc/debian-xml-sgml/packages/docbook-utils/ Vcs-Svn: svn://svn.debian.org/debian-xml-sgml/packages/docbook-utils/trunk/ Package: docbook-utils Architecture: all Depends: docbook-dsssl, jadetex, lynx | links | links2| w3m, sgmlspl, sp, ${perl:Depends}, ${misc:Depends} Recommends: docbook-xml Replaces: docbook2man, docbook2texi, docbk-xml2x, docbook2x-doc, cygnus-stylesheets Multi-Arch: foreign Description: Convert DocBook files to other formats (HTML, RTF, PS, man, PDF) The docbook-utils is a set of a few small programs intended to ease everyday use of technical documentation software and more generally use of SGML and XML. . Tasks they currently accomplish are: * jw: convert DocBook files to other formats (HTML, RTF, Postscript, PDF). * sgmldiff: detect the differences in markup between two SGML files. * docbook2man: converts a DocBook refentry to a man page. debian/patches/0000775000000000000000000000000012024122507010612 5ustar debian/patches/spellingtypo.patch0000664000000000000000000001007412024122507014366 0ustar Description: Fix some typos in man pages Author: Mathieu Malaterre Index: docbook-utils-0.6.14/doc/man/docbook2man-spec.pl.1 =================================================================== --- docbook-utils-0.6.14.orig/doc/man/docbook2man-spec.pl.1 2012-05-09 18:39:17.932819095 +0200 +++ docbook-utils-0.6.14/doc/man/docbook2man-spec.pl.1 2012-05-09 18:39:24.780818845 +0200 @@ -17,7 +17,7 @@ .SH "DESCRIPTION" .PP \fBdocbook2man\fR is a sgmlspl spec file that produced man -pages (using the -man macros) from DocBook RefEntry markup. +pages (using the \-man macros) from DocBook RefEntry markup. .PP The program reads ESIS produced by nsgmls (or other SGML parsers) from standard input. Markup not found in RefEntry is discarded. Index: docbook-utils-0.6.14/doc/man/frontend-spec.7 =================================================================== --- docbook-utils-0.6.14.orig/doc/man/frontend-spec.7 2012-05-09 18:41:45.172813778 +0200 +++ docbook-utils-0.6.14/doc/man/frontend-spec.7 2012-05-09 18:42:03.176813129 +0200 @@ -10,7 +10,7 @@ .SH "DESCRIPTION" .PP \fBjw\fR(1) calls frontends like -\fIfrontends/docbook\fR to get the informations +\fIfrontends/docbook\fR to get the information specific to a given input format. The frontend knows which information to return from the first command line parameter. It gets all necessary data via environment variables ready to use. Index: docbook-utils-0.6.14/doc/man/jw.1 =================================================================== --- docbook-utils-0.6.14.orig/doc/man/jw.1 2012-05-09 18:39:35.612818456 +0200 +++ docbook-utils-0.6.14/doc/man/jw.1 2012-05-09 18:40:51.736815708 +0200 @@ -142,7 +142,7 @@ The following options apply to the conversion script: .TP \fB -f \fIfrontend\fB | --frontend \fIfrontend\fB \fR -Allows to specify another frontend than default \fIdocbook\fR\&. +Allows one to specify another frontend than default \fIdocbook\fR\&. The list of currently available frontends is: .RS .TP @@ -156,13 +156,13 @@ .RE .TP \fB -b \fIbackend\fB | --backend \fIbackend\fB \fR -Allows to specify another backend than default +Allows one to specify another backend than default \fIHTML\fR\&. The list of currently available backends is: .RS .TP \fB\fIdvi\fB\fR -Converts to DVI (DeVice Independant +Converts to DVI (DeVice Independent files) by calling \fBJade\fR or \fBOpenJade\fR\&. .TP @@ -210,7 +210,7 @@ .RE .TP \fB -c \fIfile\fB | --cat \fIfile\fB \fR -Allows to use an extra SGML Open Catalog that will list +Allows one to use an extra SGML Open Catalog that will list other files like customization style sheets, adaptations to the DocBook Document Type Definition, special character entities, etc. This catalog is added to the list of catalogs determined @@ -241,7 +241,7 @@ are specified on the command line. .TP \fB -d \fIfile\fB|default|none | --dsl \fIfile\fB|default|none \fR -Allows to use a customized style sheet instead +Allows one to use a customized style sheet instead of the default one. A "target" starting with a hash mark "#" can be appended Index: docbook-utils-0.6.14/doc/man/sgmldiff.1 =================================================================== --- docbook-utils-0.6.14.orig/doc/man/sgmldiff.1 2012-05-09 18:41:13.316814927 +0200 +++ docbook-utils-0.6.14/doc/man/sgmldiff.1 2012-05-09 18:41:38.032814038 +0200 @@ -17,7 +17,7 @@ .SH "DESCRIPTION" .PP -This perl script allows to determine the structural differences +This perl script allows one to determine the structural differences between two SGML files. It compares the files, regardless of what is in between the tags, to only focus on the markup. Its output is similar to \fBdiff\fR(1)\&. @@ -62,8 +62,8 @@ Lines 5 to 7 of the first file have been changed into lines 8 to 10 of the second line. In addition to those summaries, the lines of the first file are -shown preceeded by '<' and the lines of the second file are -shown preceeded by '>". +shown preceded by '<' and the lines of the second file are +shown preceded by '>". .SH "OPTIONS" .PP Here is the list of actions that can be requested to debian/patches/bug_528334.patch0000664000000000000000000000247212024122507013245 0ustar Description: incorrectly strips whitespace (patch included) In the previous upload, docbook2man was patched to escape the special characters . and ' at the beginning of a line (see #399947). Unfortunately that patch was incorrect -- as well as escaping the special characters, it also removes all whitespace from the beginning of affected lines. As a result, if you are in a block where whitespace matters (such as ...) then the output is now incorrect. This is very easy to fix -- just match the whitespace and preserve it, instead of tossing it away. The full patch (just two lines) is included below. Author: Ben Burton Forwarded: not-needed Bug-Debian: http://bugs.debian.org/528334 Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl =================================================================== --- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:59:42.584774885 +0200 +++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 19:00:34.788773002 +0200 @@ -1212,8 +1212,8 @@ $_[0] =~ s/\\/\\\\/g; # Escape dots and single quotes in column 1 - $_[0] =~ s/^[ \t]*\./\\\&\./; - $_[0] =~ s/^[ \t]*\'/\\\&\'/; + $_[0] =~ s/^([ \t]*)\./$1\\\&\./; + $_[0] =~ s/^([ \t]*)\'/$1\\\&\'/; # In non-'pre'-type elements: if(!$nocollapse_whitespace) { debian/patches/bug_214982.patch0000664000000000000000000000354312024122507013246 0ustar Description: patch to get the from the sgml file For the moment, docbook2man doesn't use the tag date in to but `date "+%d %B %Y"`, and thus depend on the current locale. 06 September 2003 A patch against /usr/share/perl5/sgmlspl-specs/docbook2man-spec.pl allows to use the date written in the source SGML file (which can be localized) instead of the current date. However, if no correct date tag is present in the SGML file, the date written in the manpage will depend on the current locale. Author: Simon Paillard Forwarded: not-needed Bug-Debian: http://bugs.debian.org/214982 Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl =================================================================== --- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:27:28.000000000 +0200 +++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 18:55:53.276783163 +0200 @@ -278,8 +278,9 @@ .\\" etc. to Steve Cheng . _END_BANNER - my $manpage_date = `date "+%d %B %Y"`; - + my $date = `date "+%d %B %Y"`; + my $manpage_date = $manpage_date || $date ; + output '.TH "'; # If the title is not mixed-case, convention says to @@ -292,7 +293,7 @@ } output '" "', fold_string($manpage_sect), - '" "', fold_string(`date "+%d %B %Y"`), + '" "', fold_string($manpage_date), '" "', $manpage_misc, '" "', $manpage_manual, "\"\n"; @@ -568,6 +569,15 @@ sgml('', sub { $_[0]->parent->ext->{'attribution'} = pop_output(); }); +sgml('', sub { + save_cdata(); +}); +sgml('', sub { + $manpage_date = fold_string(pop_output()); + $raw_cdata--; +}); + + # IGNORE. sgml('', sub { push_output('nul'); }); sgml('', sub { pop_output(); }); debian/patches/series0000664000000000000000000000015312024122507012026 0ustar autotools_dev.patch spellingtypo.patch bug_212088.patch bug_214982.patch bug_394511.patch bug_528334.patch debian/patches/bug_394511.patch0000664000000000000000000000271012024122507013236 0ustar Description: docbook2man should translate the NAME section according to the REFENTRY's lang attribute Currently, docbook2man translates the NAME section according to the lang attribute provided to the REFNAMEDIV tag. When a lang attribute is specified in the REFENTRY tag and no lang attribute is specified with the REFNAMEDIV, the lang attribute of the REFENTRY should be used. Author: Nicolas François Forwarded: not-needed Bug-Debian: http://bugs.debian.org/394511 Index: docbook-utils-0.6.14/helpers/docbook2man-spec.pl =================================================================== --- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl 2012-05-09 18:55:53.276783163 +0200 +++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2012-05-09 18:58:04.792778418 +0200 @@ -359,11 +359,14 @@ # NAME section man_sgml('', sub { my %words = qw( fr NOM es NOMBRE de NAME ); - if (defined($_[0]->attribute('LANG')->value)) { - my $id = $_[0]->attribute('LANG')->value; - my $ad = $words{$id}; - output("\n.SH $ad\n");} - else {output("\n.SH NAME\n");} + # Use the REFNAMEDIV's lang attribute, and default to the + # REFENTRY's lang attribute. + my $lang = $_[0]->attribute('LANG')->value; + $lang = $manpage_lang unless defined $lang; + if (defined($lang) and defined $words{lc($lang)}) { + my $ad = $words{lc($lang)}; + output("\n.SH $ad\n");} + else { output("\n.SH NAME\n");} }); sgml('', \&save_cdata); debian/patches/bug_212088.patch0000664000000000000000000000326512024122507013242 0ustar Definition: docbook frontend runs sgmlnorm on xml input, WARNING: I know very little about the docbook toolchain! Please double-check and triple-check my suggestion. Works For Me (tm) Running db2html foo.xml causes unnecessary long waits (up to 30 seconds or so) if the input document is an XML document. I traced down the problem to the file /usr/share/sgml/docbook/utils-0.6.13/frontend/docbook (which is called from /usr/bin/jw). Apparently it runs 'sgmlnorm' even over XML documents (which should be expected to be well-formed, no?). This is because $SGML_NORM is set to either 'sgml' or 'xml' in /usr/bin/jw in any case (and exported), so that the check in docbook will always lead to sgmlnorm being used. To me it seems unnecessary to run sgmlnorm over XML input, but I may well be wrong :) If there is something to it, please have a look at the attached patch, which works fine for me and fixes those long waits for me. Author: Tim-Philipp Müller Forwarded: not-needed Bug-Debian: http://bugs.debian.org/212088 Index: docbook-utils-0.6.14/frontends/docbook.in =================================================================== --- docbook-utils-0.6.14.orig/frontends/docbook.in 2012-05-09 19:15:17.396741140 +0200 +++ docbook-utils-0.6.14/frontends/docbook.in 2012-05-09 19:15:34.988740507 +0200 @@ -6,7 +6,7 @@ # Give the location of the centralized catalog # First try the one with a version matching the version that is indicated in the document centralized-catalog) - if [ -n "$SGML_NORM" ]; then + if [ -n "$SGML_NORM" ] && [ "$SGML_XML" = "sgml" ]; then SGML_NORM_OPTS='-d' else SGML_NORM=cat debian/patches/autotools_dev.patch0000664000000000000000000003137612024122507014534 0ustar Description: autotools_dev results Author: Mathieu Malaterre --- docbook-utils-0.6.14.orig/Makefile.in +++ docbook-utils-0.6.14/Makefile.in @@ -128,7 +128,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = backends bin doc frontends helpers -sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@ +sgmldudir = $(prefix)/share/docbook-utils sgmldu_DATA = docbook-utils.dsl EXTRA_DIST = AUTHORS README COPYING INSTALL NEWS ChangeLog TODO \ $(sgmldu_DATA) docbook-utils.spec --- docbook-utils-0.6.14.orig/Makefile.am +++ docbook-utils-0.6.14/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = backends bin doc frontends helpers -sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@ +sgmldudir = $(prefix)/share/docbook-utils sgmldu_DATA = docbook-utils.dsl EXTRA_DIST = AUTHORS README COPYING INSTALL NEWS ChangeLog TODO \ --- docbook-utils-0.6.14.orig/backends/Makefile.in +++ docbook-utils-0.6.14/backends/Makefile.in @@ -104,7 +104,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@ +sgmldudir = $(prefix)/share/docbook-utils sgmldubedir = $(sgmldudir)/backends sgmldube_DATA = dvi html man pdf ps rtf tex texi txt EXTRA_DIST = dvi html man.in pdf ps rtf tex texi.in txt --- docbook-utils-0.6.14.orig/backends/Makefile.am +++ docbook-utils-0.6.14/backends/Makefile.am @@ -1,4 +1,4 @@ -sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@ +sgmldudir = $(prefix)/share/docbook-utils sgmldubedir = $(sgmldudir)/backends sgmldube_DATA = dvi html man pdf ps rtf tex texi txt --- docbook-utils-0.6.14.orig/backends/man.in +++ docbook-utils-0.6.14/backends/man.in @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to *roff -HELPER=$SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2man-spec.pl +HELPER=docbook2man-spec.pl TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \ { echo >&2 "man backend: could not create secure temporary directory"; exit 1;} trap 'rm -rf "${TMPDIR}"' EXIT --- docbook-utils-0.6.14.orig/backends/texi.in +++ docbook-utils-0.6.14/backends/texi.in @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to texinfo -nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi +nsgmls $SGML_FILE | sgmlspl docbook2texi-spec.pl >$SGML_FILE_NAME.texi if [ $? -ne 0 ] then exit 1 fi --- docbook-utils-0.6.14.orig/bin/jw.in +++ docbook-utils-0.6.14/bin/jw.in @@ -87,10 +87,10 @@ then fi # Set frontend to use -SGML_FRONTEND="$SGML_BASE_DIR/docbook/utils-@VERSION@/frontends/docbook" +SGML_FRONTEND="@prefix@/share/docbook-utils/frontends/docbook" # Set backend to use -SGML_BACKEND="$SGML_BASE_DIR/docbook/utils-@VERSION@/backends/html" +SGML_BACKEND="@prefix@/share/docbook-utils/backends/html" # Set main stylesheet SGML_STYLESHEET="default" @@ -120,14 +120,14 @@ while [ $# -gt 0 ] do case $1 in -f|--frontend) case "$2" in /*) SGML_FRONTEND="$2" ;; - *) d=$SGML_BASE_DIR/docbook/utils-@VERSION@/frontends + *) d=@prefix@/share/docbook-utils/frontends SGML_FRONTEND="$d/$2" ;; esac shift 2 ;; -b|--backend) case "$2" in /*) SGML_BACKEND="$2" ;; - *) d=$SGML_BASE_DIR/docbook/utils-@VERSION@/backends + *) d=@prefix@/share/docbook-utils/backends SGML_BACKEND="$d/$2" ;; esac shift 2 @@ -186,8 +186,8 @@ do case $1 in shift 2 ;; -w|--warning) case $2 in - list) echo -e "List of allowed warning types (multiple -w options are allowed):\n" - echo -e $SGML_WARNINGS_LIST + list) printf "List of allowed warning types (multiple -w options are allowed):\n\n" + printf "$SGML_WARNINGS_LIST\n" exit 0 ;; xml|mixed|sgmldecl|should|default|duplicate|undefined|unclosed|empty|net|min-tag|unused-map|unused-param|notation-sysid|all|no-xml|no-mixed|no-sgmldecl|no-should|no-default|no-duplicate|no-undefined|no-unclosed|no-empty|no-net|no-min-tag|no-unused-map|no-unused-param|no-notation-sysid) \ @@ -195,14 +195,14 @@ do case $1 in shift 2 ;; *) echo "Unknown warning type \"$2\". Allowed warning types are:" >&2 - echo -e $SGML_WARNINGS_LIST >&2 + printf "$SGML_WARNINGS_LIST\n" >&2 exit 1 ;; esac ;; -e|--error) case $2 in - list) echo -e "List of allowed error types (multiple -e options are allowed):\n" - echo -e $SGML_ERRORS_LIST + list) printf "List of allowed error types (multiple -e options are allowed):\n\n" + printf "$SGML_ERRORS_LIST\n" exit 0 ;; no-idref|no-significant|no-valid) \ @@ -210,19 +210,19 @@ do case $1 in shift 2 ;; *) echo "Unknown error type \"$2\". Allowed error types are:" >&2 - echo -e $SGML_ERRORS_LIST >&2 + printf "$SGML_ERRORS_LIST\n" >&2 exit 1 ;; esac ;; - -h|--help) echo -e "`basename $0` - Jade Wrapper\n" - echo -e "$SGML_HELP_MESSAGE" + -h|--help) printf "`basename $0` - Jade Wrapper\n\n" + printf "$SGML_HELP_MESSAGE\n" exit 0 ;; - -v|--version) echo -e "$SGML_VERSION_MESSAGE" + -v|--version) printf "$SGML_VERSION_MESSAGE\n" exit 0 ;; - -*) echo -e "$SGML_HELP_MESSAGE" >&2 + -*) printf "$SGML_HELP_MESSAGE\n" >&2 exit 1 ;; *) if [ -z "$SGML_FILE" ] @@ -233,7 +233,7 @@ do case $1 in esac shift 1 else - echo -e "$SGML_HELP_MESSAGE" >&2 + printf "$SGML_HELP_MESSAGE\n" >&2 exit 1 fi ;; @@ -243,7 +243,7 @@ done # Check that we have a frontend if [ -z "$SGML_FRONTEND" ] then - echo -e $SGML_HELP_MESSAGE >&2 + printf "$SGML_HELP_MESSAGE\n" >&2 exit 1 fi if [ ! -s $SGML_FRONTEND ] @@ -255,7 +255,7 @@ fi # Check that we have a backend if [ -z "$SGML_BACKEND" ] then - echo -e $SGML_HELP_MESSAGE >&2 + printf "$SGML_HELP_MESSAGE\n" >&2 exit 1 fi if [ ! -s $SGML_BACKEND ] @@ -267,7 +267,7 @@ fi # Check that we have a file to process if [ -z "$SGML_FILE" ] then - echo -e $SGML_HELP_MESSAGE >&2 + printf "$SGML_HELP_MESSAGE\n" >&2 exit 1 fi if [ ! -s $SGML_FILE ] @@ -290,7 +290,7 @@ fi # Use SGML declaration for XML if needed if [ "$SGML_DECL" = "" -a "$SGML_XML" = "xml" ] -then SGML_DECL=${SGML_BASE_DIR}/xml.dcl +then SGML_DECL=${SGML_BASE_DIR}/declaration/xml.dcl fi # Try to find the SGML normalizer @@ -402,7 +402,7 @@ fi # Create output directory if not available if [ -z "$SGML_OUTPUT_DIRECTORY" ] then - echo -e $SGML_HELP_MESSAGE >&2 + printf "$SGML_HELP_MESSAGE\n" >&2 exit 1 fi if [ ! -d $SGML_OUTPUT_DIRECTORY ] --- docbook-utils-0.6.14.orig/doc/refentry/jw.sgml +++ docbook-utils-0.6.14/doc/refentry/jw.sgml @@ -230,7 +230,7 @@ Here we have chosen to generate HTML output. In fact we can use any of the backends stored in the backends/ subdirectory of the DocBook-utils distribution directory (usually - /usr/share/sgml/docbook/utils-&version;). + /usr/share/docbook-utils). Similarly, you can use any frontend defined in the frontends/ subdirectory to convert from another input format. @@ -592,21 +592,21 @@ - /usr/share/sgml/docbook/utils-&version;/backends + /usr/share/docbook-utils/backends The various backends - /usr/share/sgml/docbook/utils-&version;/frontends + /usr/share/docbook-utils/frontends The various frontends - /usr/share/sgml/docbook/utils-&version;/helpers + /usr/share/perl5/sgmlspl-specs The various helper scripts like docbook2man or docbook2texi --- docbook-utils-0.6.14.orig/doc/man/jw.1 +++ docbook-utils-0.6.14/doc/man/jw.1 @@ -128,7 +128,7 @@ be in any other directory than the curre Here we have chosen to generate HTML output. In fact we can use any of the backends stored in the \fIbackends/\fR subdirectory of the DocBook-utils distribution directory (usually -\fI/usr/share/sgml/docbook/utils-0.6.14\fR). +\fI/usr/share/docbook-utils\fR). Similarly, you can use any frontend defined in the \fIfrontends/\fR subdirectory to convert from another input format. @@ -355,13 +355,13 @@ Centralized SGML open catalog. This file vary if another frontend than \fIdocbook\fR is used. .TP -\fB\fI/usr/share/sgml/docbook/utils-0.6.14/backends\fB\fR +\fB\fI/usr/share/docbook-utils/backends\fB\fR The various backends .TP -\fB\fI/usr/share/sgml/docbook/utils-0.6.14/frontends\fB\fR +\fB\fI/usr/share/docbook-utils/frontends\fB\fR The various frontends .TP -\fB\fI/usr/share/sgml/docbook/utils-0.6.14/helpers\fB\fR +\fB\fI/usr/share/perl5/sgmlspl-specs\fB\fR The various helper scripts like docbook2man or docbook2texi .SH "AUTHORS" .PP --- docbook-utils-0.6.14.orig/doc/HTML/Makefile.in +++ docbook-utils-0.6.14/doc/HTML/Makefile.in @@ -103,7 +103,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -htmldir = $(docdir)/html/docbook-utils-@VERSION@ +htmldir = $(docdir)/html/ html_DATA = api.html \ backend-spec.html \ docbook2man.html \ --- docbook-utils-0.6.14.orig/frontends/Makefile.in +++ docbook-utils-0.6.14/frontends/Makefile.in @@ -104,7 +104,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@ +sgmldudir = $(prefix)/share/docbook-utils sgmldufedir = $(sgmldudir)/frontends sgmldufe_DATA = docbook all: all-am --- docbook-utils-0.6.14.orig/frontends/Makefile.am +++ docbook-utils-0.6.14/frontends/Makefile.am @@ -1,3 +1,3 @@ -sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@ +sgmldudir = $(prefix)/share/docbook-utils sgmldufedir = $(sgmldudir)/frontends sgmldufe_DATA = docbook --- docbook-utils-0.6.14.orig/frontends/docbook.in +++ docbook-utils-0.6.14/frontends/docbook.in @@ -27,10 +27,7 @@ case "$1" in done if [ -z "$SGML_CATALOG" ] then - if [ "${SGML_XML}" != "sgml" ] - then SGML_CATALOG=${SGML_CATALOGS_DIR}/${SGML_XML}-docbook.cat - else SGML_CATALOG=${SGML_CATALOGS_DIR}/catalog - fi + SGML_CATALOG=${SGML_CATALOGS_DIR}/catalog fi echo "$SGML_CATALOG" ;; @@ -38,7 +35,7 @@ case "$1" in style-sheet) case $SGML_STYLESHEET in default) - echo "${SGML_BASE_DIR}/docbook/utils-@VERSION@/docbook-utils.dsl#${SGML_TYPE}" + echo "/usr/share/docbook-utils/docbook-utils.dsl#${SGML_TYPE}" ;; none) find $SGML_BASE_DIR -name docbook.dsl | grep "$SGML_TYPE/docbook.dsl" | awk '{print $1}' --- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl +++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl @@ -1199,8 +1199,8 @@ sgml('cdata', sub $_[0] =~ s/\\/\\\\/g; # Escape dots and single quotes in column 1 - $_[0] =~ s/^\./\\\&\./; - $_[0] =~ s/^\'/\\\&\'/; + $_[0] =~ s/^[ \t]*\./\\\&\./; + $_[0] =~ s/^[ \t]*\'/\\\&\'/; # In non-'pre'-type elements: if(!$nocollapse_whitespace) { --- docbook-utils-0.6.14.orig/helpers/Makefile.in +++ docbook-utils-0.6.14/helpers/Makefile.in @@ -103,8 +103,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@ -sgmlduhedir = $(sgmldudir)/helpers +sgmldudir = $(prefix)/share +sgmlduhedir = $(sgmldudir)/perl5/sgmlspl-specs sgmlduhe_DATA = docbook2man-spec.pl docbook2texi-spec.pl EXTRA_DIST = $(sgmlduhe_DATA) all: all-am --- docbook-utils-0.6.14.orig/helpers/Makefile.am +++ docbook-utils-0.6.14/helpers/Makefile.am @@ -1,5 +1,5 @@ -sgmldudir = $(prefix)/share/sgml/docbook/utils-@VERSION@ -sgmlduhedir = $(sgmldudir)/helpers +sgmldudir = $(prefix)/share +sgmlduhedir = $(sgmldudir)/perl5/sgmlspl-specs sgmlduhe_DATA = docbook2man-spec.pl docbook2texi-spec.pl EXTRA_DIST = $(sgmlduhe_DATA) --- docbook-utils-0.6.14.orig/helpers/docbook2texi-spec.pl +++ docbook-utils-0.6.14/helpers/docbook2texi-spec.pl @@ -774,7 +774,7 @@ texi_sgml('', "\n\@page\n"); ## Print the URL sgml('', sub { if($skip_inline++) { return; } # hopefully doesn't happen - output '@uref{', output $_[0]->attribute('URL'), ', ' + output '@uref{', $_[0]->attribute('URL')->value, ', ' }); sgml('', sub { output '}' unless --$skip_inline; @@ -807,6 +807,7 @@ sgml('', sub { sgml('|[lt ]|', "<"); sgml('|[gt ]|', ">"); sgml('|[amp ]|', "&"); +sgml('|[ndash ]|', "-"); # # Default handlers (uncomment these if needed). Right now, these are set debian/db2html0000775000000000000000000000075512024122507010454 0ustar #! /bin/sh output=docbook2html-dir skip=0 for arg in $* do if [ $skip -gt 0 ] then skip=$(($skip - 1)) continue fi case $arg in -h|--help|-v|--version) break ;; -n|--nostd|-u|--nochunks) ;; -*) skip=1 ;; *) output="$(echo $arg | sed 's,\.sgml$,,;s,\.sgm$,,;s,\.xml$,,')" echo "output is $output" break ;; esac done if [ -d ${output} ] then rm -rf ${output}.junk mv ${output} ${output}.junk fi mkdir ${output} jw -f docbook -b html -o ${output} "$@"