Author: arekm Date: Sun May 30 20:31:29 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 4; debian patch
---- Files affected: packages/docbook-utils: docbook-utils.spec (1.42 -> 1.43) , docbook-utils-debian.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/docbook-utils/docbook-utils.spec diff -u packages/docbook-utils/docbook-utils.spec:1.42 packages/docbook-utils/docbook-utils.spec:1.43 --- packages/docbook-utils/docbook-utils.spec:1.42 Mon Aug 6 01:06:05 2007 +++ packages/docbook-utils/docbook-utils.spec Sun May 30 22:31:24 2010 @@ -5,7 +5,7 @@ Summary(pl.UTF-8): Skrypty do obróbki dokumentów DocBook Name: docbook-utils Version: 0.6.14 -Release: 3 +Release: 4 License: Eric Bischoff, Mark Galassi, Jochem Huhmann, Steve Cheng, and Frederik Fouvry; GPL 2.0 Group: Applications/Publishing/SGML Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tar.gz @@ -14,6 +14,7 @@ Source2: db2html Patch1: %{name}-roff_includes_in_man_pages.patch Patch2: %{name}-catalog.patch +Patch3: %{name}-debian.patch URL: http://sources.redhat.com/docbook-tools/ BuildRequires: autoconf BuildRequires: automake @@ -42,6 +43,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__aclocal} @@ -89,6 +91,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.43 2010/05/30 20:31:24 arekm +- rel 4; debian patch + Revision 1.42 2007/08/05 23:06:05 wolvverine - add todo, rel.3 ================================================================ Index: packages/docbook-utils/docbook-utils-debian.patch diff -u /dev/null packages/docbook-utils/docbook-utils-debian.patch:1.1 --- /dev/null Sun May 30 22:31:29 2010 +++ packages/docbook-utils/docbook-utils-debian.patch Sun May 30 22:31:24 2010 @@ -0,0 +1,33 @@ +--- docbook-utils-0.6.14.orig/helpers/docbook2man-spec.pl ++++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl +@@ -1199,8 +1199,8 @@ + $_[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/docbook2texi-spec.pl ++++ docbook-utils-0.6.14/helpers/docbook2texi-spec.pl +@@ -774,7 +774,7 @@ + ## Print the URL + sgml('<ULINK>', sub { + if($skip_inline++) { return; } # hopefully doesn't happen +- output '@uref{', output $_[0]->attribute('URL'), ', ' ++ output '@uref{', $_[0]->attribute('URL')->value, ', ' + }); + sgml('</ULINK>', sub { + output '}' unless --$skip_inline; +@@ -807,6 +807,7 @@ + sgml('|[lt ]|', "<"); + sgml('|[gt ]|', ">"); + sgml('|[amp ]|', "&"); ++sgml('|[ndash ]|', "-"); + + # + # Default handlers (uncomment these if needed). Right now, these are set + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/docbook-utils/docbook-utils.spec?r1=1.42&r2=1.43&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
