[xml/sgml-commit] r703 - in packages/docbook2x/trunk/debian: . patches

Daniel Leidert dleidert-guest at alioth.debian.org
Thu Apr 12 14:18:47 UTC 2007 

Author: dleidert-guest
Date: 2007-04-12 14:18:47 +0000 (Thu, 12 Apr 2007)
New Revision: 703

Added:
   packages/docbook2x/trunk/debian/patches/
   packages/docbook2x/trunk/debian/patches/00list
   packages/docbook2x/trunk/debian/patches/01_fix_static_datadir_evaluation.dpatch
   packages/docbook2x/trunk/debian/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch
Modified:
   packages/docbook2x/trunk/debian/TODO
   packages/docbook2x/trunk/debian/changelog
   packages/docbook2x/trunk/debian/control
   packages/docbook2x/trunk/debian/rules
Log:
* debian/control (Build-Depends): Re-added dpatch.
* debian/rules: Re-added dpatch ruleset.
* 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.

* debian/TODO: The catalogs are registered now.



Modified: packages/docbook2x/trunk/debian/TODO
===================================================================
--- packages/docbook2x/trunk/debian/TODO	2007-04-12 10:15:29 UTC (rev 702)
+++ packages/docbook2x/trunk/debian/TODO	2007-04-12 14:18:47 UTC (rev 703)
@@ -2,8 +2,7 @@
 
   * make the package XML policy compliant.
 
-    - move the stylesheets into /usr/share/xml
-    - register the catalog
+    - 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,

Modified: packages/docbook2x/trunk/debian/changelog
===================================================================
--- packages/docbook2x/trunk/debian/changelog	2007-04-12 10:15:29 UTC (rev 702)
+++ packages/docbook2x/trunk/debian/changelog	2007-04-12 14:18:47 UTC (rev 703)
@@ -3,10 +3,19 @@
   * NOT RELEASED YET
 
   [ Daniel Leidert ]
-  * debian/control (Build-Depends): Added xml-core.
+  * debian/control (Build-Depends): Added xml-core and re-added dpatch..
   * debian/docbook2x.xmlcatalogs: Added to register XML catalogs.
-  * debian/rules (binary-install/docbook2x): Register the XML catalogs shipped
-    with the package source (closes: #418703).
+  * 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 at wgdd.de>  Tue, 10 Apr 2007 23:16:07 +0200
 

Modified: packages/docbook2x/trunk/debian/control
===================================================================
--- packages/docbook2x/trunk/debian/control	2007-04-12 10:15:29 UTC (rev 702)
+++ packages/docbook2x/trunk/debian/control	2007-04-12 14:18:47 UTC (rev 703)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Ardo van Rangelrooij <ardo at debian.org>, W. Borgert <debacle at debian.org>, Rafael Laboissiere <rafael at debian.org>, Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>= 4.2), cdbs (>= 0.4.21), libxml-sax-perl, opensp, sp, texinfo, xml-core, xsltproc
+Build-Depends: debhelper (>= 4.2), cdbs (>= 0.4.21), dpatch, libxml-sax-perl, opensp, sp, texinfo, xml-core, xsltproc
 Build-Conflicts: libxml2-utils, tidy
 Standards-Version: 3.7.2
 XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook2x/trunk/

Added: packages/docbook2x/trunk/debian/patches/00list
===================================================================
--- packages/docbook2x/trunk/debian/patches/00list	2007-04-12 10:15:29 UTC (rev 702)
+++ packages/docbook2x/trunk/debian/patches/00list	2007-04-12 14:18:47 UTC (rev 703)
@@ -0,0 +1,2 @@
+01_fix_static_datadir_evaluation
+02_fix_418703_dont_use_abbreviated_sfnet_address

Added: packages/docbook2x/trunk/debian/patches/01_fix_static_datadir_evaluation.dpatch
===================================================================
--- packages/docbook2x/trunk/debian/patches/01_fix_static_datadir_evaluation.dpatch	2007-04-12 10:15:29 UTC (rev 702)
+++ packages/docbook2x/trunk/debian/patches/01_fix_static_datadir_evaluation.dpatch	2007-04-12 14:18:47 UTC (rev 703)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_static_datadir_evaluation.dpatch by Daniel Leidert (dale) <daniel.leidert at 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.
+
+ at 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=""
+diff -urNad docbook2x-0.8.8~/configure.ac docbook2x-0.8.8/configure.ac
+--- docbook2x-0.8.8~/configure.ac	2007-03-03 14:44:14.000000000 +0100
++++ docbook2x-0.8.8/configure.ac	2007-04-12 16:04:28.000000000 +0200
+@@ -148,7 +148,7 @@
+ dnl they will reside and should use these static_* values.
+ dnl Ensure that all static_* are fully expanded.
+ 
+-eval static_datadir="$datadir"
++eval eval static_datadir="$datadir"
+ 
+ eval static_bindir="$bindir"
+ old_val=""


Property changes on: packages/docbook2x/trunk/debian/patches/01_fix_static_datadir_evaluation.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/docbook2x/trunk/debian/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch
===================================================================
--- packages/docbook2x/trunk/debian/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch	2007-04-12 10:15:29 UTC (rev 702)
+++ packages/docbook2x/trunk/debian/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch	2007-04-12 14:18:47 UTC (rev 703)
@@ -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 at 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.
+
+ at 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) {


Property changes on: packages/docbook2x/trunk/debian/patches/02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/docbook2x/trunk/debian/rules
===================================================================
--- packages/docbook2x/trunk/debian/rules	2007-04-12 10:15:29 UTC (rev 702)
+++ packages/docbook2x/trunk/debian/rules	2007-04-12 14:18:47 UTC (rev 703)
@@ -1,6 +1,7 @@
 #!/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

More information about the debian-xml-sgml-commit mailing list