RC bug #482140 - RfC for upcoming changes
Hi,
With the help of Nico Tyni and Agustin Martin Domingo I think, the RC
bug #482140 [1] can be solved by changing docbook-xml and xml-core. I
already did some cleaning in these two package related to packaging
stuff and I would like to know, if you allow uploading of the proposed
changes for #482140 *together* with these clean-up-changes or if I have
to separate them. I attach the diffs for an upload containing all
changes, so you get an impression of the changes.
[1] http://bugs.debian.org/482140
Regards, Daniel
diff -puN --recursive --exclude=.svn ../tags/0.11/debhelper/dh_installxmlcatalogs ./debhelper/dh_installxmlcatalogs
--- ../tags/0.11/debhelper/dh_installxmlcatalogs 2007-04-18 19:28:50.000000000 +0200
+++ ./debhelper/dh_installxmlcatalogs 2008-10-11 15:30:22.000000000 +0200
@@ -121,7 +121,7 @@ use strict;
use Debian::Debhelper::Dh_Lib;
## ----------------------------------------------------------------------
-my $xmlcorever = "0.05";
+my $xmlcorever = "0.12";
## ----------------------------------------------------------------------
my $debug_update_xmlcatalog = 0;
diff -puN --recursive --exclude=.svn ../tags/0.11/debian/changelog ./debian/changelog
--- ../tags/0.11/debian/changelog 2007-04-18 19:28:50.000000000 +0200
+++ ./debian/changelog 2008-10-11 15:37:10.000000000 +0200
@@ -1,8 +1,32 @@
+xml-core (0.12) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * debhelper/dh_installxmlcatalogs (xmlcorever): Increased to 0.12 ("fixed"
+ version, see #482140).
+ * tools/update-xmlcatalog: Use File::Spec instead of File::Spec::Functions
+ for catfile (see #482140). Thanks to Agustin Martin Domingo.
+
+ * Fixed Kurt Roeckx name in the 0.11 changelog entry. Sorry Kurt.
+ * debian/compat: Raised to v5.
+ * debian/control: Vcs fields transition. Added DM-Upload-Allowed.
+ (Vcs-Svn): Fixed location.
+ (Build-Depends): Raised debhelper to v5.
+ (Standards-Version): Raised to 3.7.3.
+ (Description): Fixed reference to directories in /usr/local.
+ * debian/lintian-overrides/xml-core: Added. The empty directories are
+ shipped by intention.
+ * debian/rules (clean): Remove the created manual pages.
+ (binary-indep): Added call to dh_install. Only depend on perl-base
+ (see #482140).
+ * debian/xml-core.install: Added to install lintian override.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Mon, 16 Apr 2007 20:36:43 +0200
+
xml-core (0.11) unstable; urgency=low
[ Daniel Leidert ]
* debian/xml-core.postrm: Only try to remove /var/lib/xml-core, if it
- exists (closes: #358364). Thanks to Kurt Roecks, who catched this issue.
+ exists (closes: #358364). Thanks to Kurt Roeckx, who catched this issue.
-- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Mon, 16 Apr 2007 19:17:50 +0200
diff -puN --recursive --exclude=.svn ../tags/0.11/debian/compat ./debian/compat
--- ../tags/0.11/debian/compat 2007-04-18 19:28:50.000000000 +0200
+++ ./debian/compat 2008-01-14 17:15:58.000000000 +0100
@@ -1 +1 @@
-4
+5
diff -puN --recursive --exclude=.svn ../tags/0.11/debian/control ./debian/control
--- ../tags/0.11/debian/control 2007-04-18 19:28:50.000000000 +0200
+++ ./debian/control 2008-02-14 04:16:29.000000000 +0100
@@ -3,11 +3,12 @@ Section: text
Priority: optional
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
Uploaders: Ardo van Rangelrooij <ardo@debian.org>, Daniel Leidert (dale) <daniel.leidert@wgdd.de>
-Build-Depends: debhelper (>= 4.1.75)
+Build-Depends: debhelper (>= 5)
Build-Depends-Indep: perl
-Standards-Version: 3.7.2
-XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/
-XS-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xml-core/
+Standards-Version: 3.7.3
+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xml-core/trunk/
+DM-Upload-Allowed: yes
Package: xml-core
Section: text
@@ -23,7 +24,7 @@ Description: XML infrastructure and XML
* infrastructure directories:
- /etc/xml
- /usr/share/xml/{declaration,entities,misc,schema}
- - /usr/share/local/xml/{declaration,entities,misc,schema}
+ - /usr/local/share/xml/{declaration,entities,misc,schema}
.
* XML catalog schema: OASIS XML Catalog Committee Specification 1.0
.
diff -puN --recursive --exclude=.svn ../tags/0.11/debian/lintian-overrides/xml-core ./debian/lintian-overrides/xml-core
--- ../tags/0.11/debian/lintian-overrides/xml-core 1970-01-01 01:00:00.000000000 +0100
+++ ./debian/lintian-overrides/xml-core 2008-05-01 03:45:27.000000000 +0200
@@ -0,0 +1,5 @@
+## The xml-core package creates/provides the core XML infrastructure,
+## including these empty directories.
+xml-core binary: package-contains-empty-directory usr/share/xml/misc/
+xml-core binary: package-contains-empty-directory usr/share/xml/entities/
+xml-core binary: package-contains-empty-directory usr/share/xml/declaration/
diff -puN --recursive --exclude=.svn ../tags/0.11/debian/rules ./debian/rules
--- ../tags/0.11/debian/rules 2007-04-18 19:28:50.000000000 +0200
+++ ./debian/rules 2008-10-11 15:23:54.000000000 +0200
@@ -16,6 +16,7 @@ PACKAGE = xml-core
clean:
dh_testdir
dh_testroot
+ rm -f tools/update-xmlcatalog.8 debhelper/dh_installxmlcatalogs.1
dh_clean
rm -f build-stamp install-stamp
@@ -40,6 +41,7 @@ binary-indep: build install
dh_installdocs
dh_installexamples
dh_installchangelogs
+ dh_install
DH_AUTOSCRIPTDIR=debhelper debhelper/dh_installxmlcatalogs
dh_installcatalogs
dh_link
@@ -47,7 +49,7 @@ binary-indep: build install
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
+ dh_perl -d
dh_gencontrol
dh_md5sums
dh_builddeb
diff -puN --recursive --exclude=.svn ../tags/0.11/debian/xml-core.install ./debian/xml-core.install
--- ../tags/0.11/debian/xml-core.install 1970-01-01 01:00:00.000000000 +0100
+++ ./debian/xml-core.install 2008-05-01 03:51:31.000000000 +0200
@@ -0,0 +1 @@
+debian/lintian-overrides/xml-core usr/share/lintian/overrides/
diff -puN --recursive --exclude=.svn ../tags/0.11/tools/update-xmlcatalog ./tools/update-xmlcatalog
--- ../tags/0.11/tools/update-xmlcatalog 2007-04-18 19:28:50.000000000 +0200
+++ ./tools/update-xmlcatalog 2008-10-11 15:22:04.000000000 +0200
@@ -3,6 +3,7 @@
## Debian update-xmlcatalog
## ----------------------------------------------------------------------
## Copyright (c) 2003-2004 Ardo van Rangelrooij
+## Copyright (c) 2008 Daniel Leidert
##
## This is free software; see the GNU General Public Licence version 2
## or later for copying conditions. There is NO warranty.
@@ -121,7 +122,7 @@ Ardo van Rangelrooij <ardo@debian.org>
use strict;
## ----------------------------------------------------------------------
-use File::Spec::Functions;
+use File::Spec;
use Getopt::Long;
## ----------------------------------------------------------------------
@@ -196,7 +197,7 @@ if ( defined( $add ) )
{
if ( defined( $package ) )
{
- my $catalog = catfile( $catalog_dir, "$package.xml" );
+ my $catalog = File::Spec->catfile( $catalog_dir, "$package.xml" );
if ( ! -f $catalog )
{
print STDERR "$name: error: package catalog $catalog not found\n";
@@ -261,7 +262,7 @@ elsif ( defined( $del ) )
{
if ( defined( $root ) )
{
- my $catalog = catfile( $catalog_dir, 'catalog' );
+ my $catalog = File::Spec->catfile( $catalog_dir, 'catalog' );
if ( ! -f $catalog )
{
print STDERR "$name: error: root catalog $catalog not found\n";
@@ -275,7 +276,7 @@ elsif ( defined( $del ) )
}
elsif ( defined( $package ) )
{
- my $catalog = catfile( $catalog_dir, "$package.xml" );
+ my $catalog = File::Spec->catfile( $catalog_dir, "$package.xml" );
if ( ! -f $catalog )
{
print STDERR "$name: error: package catalog $catalog not found\n";
@@ -333,8 +334,8 @@ if ( ! defined( $id ) )
if ( defined( $root ) )
{
$catalog = 'catalog';
- $catalog_data = catfile( $catalog_data_dir, $catalog );
- $catalog = catfile( $catalog_dir, $catalog );
+ $catalog_data = File::Spec->catfile( $catalog_data_dir, $catalog );
+ $catalog = File::Spec->catfile( $catalog_dir, $catalog );
my $start = $type;
$start .= 'Id' unless $type eq 'uri';
$start .= 'StartString';
@@ -347,8 +348,8 @@ if ( defined( $root ) )
}
elsif ( defined( $package ) )
{
- $catalog_data = catfile( $catalog_data_dir, $package );
- $catalog = catfile( $catalog_dir, "$package.xml" );
+ $catalog_data = File::Spec->catfile( $catalog_data_dir, $package );
+ $catalog = File::Spec->catfile( $catalog_dir, "$package.xml" );
my $start = $type;
$start .= 'Id' unless $type eq 'uri';
$start .= 'StartString';
@@ -364,7 +365,7 @@ elsif ( defined( $local ) )
$catalog = $local;
$catalog_data = $local;
$catalog_data =~ tr|/|_|;
- $catalog_data = catfile( $catalog_data_dir, $catalog_data );
+ $catalog_data = File::Spec->catfile( $catalog_data_dir, $catalog_data );
my $start = ( $type eq 'uri' ) ? 'name' : $type;
$start .= 'Id' unless $type eq 'uri';
$id = "$start=\"$id\"";
diff -puN --recursive --exclude=.svn ../tags/4.5-5/debian/changelog ./debian/changelog
--- ../tags/4.5-5/debian/changelog 2008-10-11 22:52:29.000000000 +0200
+++ ./debian/changelog 2008-10-11 23:19:27.000000000 +0200
@@ -1,3 +1,23 @@
+docbook-xml (4.5-6) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * debian/compat: Raised to v5.
+ * debian/control: Vcs fields transition. Added DM-Upload-Allowed.
+ (Vcs-Svn): Fixed location.
+ (Build-Depends): Raised debhelper to v5.
+ (Depends): Moved xml-core to Pre-Depends and increased the version to 0.12
+ (closes: #482140).
+ (Standards-Version): Raised to 3.7.3.
+ * debian/rules (debian/docbook-xml.install): Fixed to not put non-existent
+ files into the .install file.
+ (debian/docbook-xml.xmlcatalogs): Use `sed -i' and do not create a
+ temporary file.
+ * debian/source.lintian-overrides: Added to override
+ patch-system-but-direct-changes-in-diff warning, because file creation is
+ intended.
+
+ -- Daniel Leidert (dale) <daniel.leidert@wgdd.de> Thu, 27 Sep 2007 00:26:53 +0200
+
docbook-xml (4.5-5) unstable; urgency=low
* debian/control: Homepage field transition.
diff -puN --recursive --exclude=.svn ../tags/4.5-5/debian/compat ./debian/compat
--- ../tags/4.5-5/debian/compat 2008-10-11 22:52:29.000000000 +0200
+++ ./debian/compat 2008-10-11 23:03:06.000000000 +0200
@@ -1 +1 @@
-4
+5
diff -puN --recursive --exclude=.svn ../tags/4.5-5/debian/control ./debian/control
--- ../tags/4.5-5/debian/control 2008-10-11 22:52:29.000000000 +0200
+++ ./debian/control 2008-10-11 23:00:02.000000000 +0200
@@ -3,15 +3,17 @@ Section: text
Priority: optional
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
Uploaders: Adam Di Carlo <aph@debian.org>, Daniel Leidert (dale) <daniel.leidert@wgdd.de>
-Build-Depends: debhelper (>= 4.1.31), dpatch
+Build-Depends: debhelper (>= 5), dpatch
Build-Depends-Indep: xml-core (>= 0.6)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://www.oasis-open.org/docbook/xml/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/
-XS-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xml/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xml/trunk/
+DM-Upload-Allowed: yes
Package: docbook-xml
Architecture: all
+Pre-Depends: xml-core (>= 0.12)
Depends: sgml-data (>= 2.0.2), ${misc:Depends}
Suggests: docbook, docbook-dsssl, docbook-xsl, docbook-defguide
Provides: docbk-xml
diff -puN --recursive --exclude=.svn ../tags/4.5-5/debian/rules ./debian/rules
--- ../tags/4.5-5/debian/rules 2008-10-11 22:52:29.000000000 +0200
+++ ./debian/rules 2008-10-11 23:09:44.000000000 +0200
@@ -15,10 +15,12 @@ debian/docbook-xml.install:
for dbx in docbook-* ; do \
dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
for file in $${dbx}/*.dtd $${dbx}/*.ent $${dbx}/*.mod $${dbx}/*.ver ; do \
- if [ $${file} != $${dbx}/dbgenent.* ] ; then \
- echo "$${file} usr/share/xml/docbook/schema/dtd/$${dbxver}" >> $@ ; \
- else \
- echo "$${file} etc/sgml/docbook-xml/$${dbxver}" >> $@ ; \
+ if [ -f $${file} ] ; then \
+ if [ $${file} != $${dbx}/dbgenent.* ] ; then \
+ echo "$${file} usr/share/xml/docbook/schema/dtd/$${dbxver}" >> $@ ; \
+ else \
+ echo "$${file} etc/sgml/docbook-xml/$${dbxver}" >> $@ ; \
+ fi ; \
fi ; \
done ; \
[ -f $${dbx}/catalog.xml ] && \
@@ -57,29 +59,27 @@ debian/docbook-xml.sgmlcatalogs:
debian/docbook-xml.xmlcatalogs:
set -ex ; \
- touch $@ $@.tmp ; \
- cat $@.in >> $@.tmp ; \
+ touch $@ ; \
+ cat $@.in >> $@ ; \
for dbx in docbook-* ; do \
dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
if [ -f $${dbx}/catalog.xml ] ; then \
- echo "local;$${dbx}/catalog.xml;/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@.tmp ; \
+ echo "local;$${dbx}/catalog.xml;/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
sysids=`egrep -e "<system systemId=\"[^\"]+\"" $${dbx}/catalog.xml | \
sed -e 's/<system systemId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
echo $${sysids} | while read id ; do \
- echo "package;system;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@.tmp ; \
+ echo "package;system;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
done ; \
pubids=`egrep -e "<public publicId=\"[^\"]+\"" $${dbx}/catalog.xml | \
sed -e 's/<public publicId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
echo $${pubids} | while read id ; do \
- echo "package;public;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@.tmp ; \
+ echo "package;public;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
done ; \
- echo >> $@.tmp ; \
+ echo >> $@ ; \
fi ; \
done ; \
fpiregex="s/^.*\-\/\/OASIS\/\/DTD XML Exchange Table Model 19990315\/\/EN.*\/dtd\/4\.[^5].*//g" ; \
- sed -e 's/\ ;\/usr/;\/usr/g' \
- -e $${fpiregex} \
- < $@.tmp > $@ && rm -f $@.tmp
+ sed -i -e 's/\ ;\/usr/;\/usr/g' -e $${fpiregex} $@
build: patch-stamp build-stamp
@@ -95,7 +95,6 @@ clean: unpatch
debian/docbook-xml.links \
debian/docbook-xml.sgmlcatalogs \
debian/docbook-xml.xmlcatalogs \
- debian/docbook-xml.xmlcatalogs.tmp
dh_clean
install: build
diff -puN --recursive --exclude=.svn ../tags/4.5-5/debian/source.lintian-overrides ./debian/source.lintian-overrides
--- ../tags/4.5-5/debian/source.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ ./debian/source.lintian-overrides 2008-10-11 23:14:33.000000000 +0200
@@ -0,0 +1,3 @@
+## Because this is a compilation of upstream sources and because I don't want
+## to create files by a patch system, I hereby overwrite the lintian warnings:
+docbook-xml source: patch-system-but-direct-changes-in-diff
Reply to: