Bug#687763: unblock: xml-core/0.13+nmu2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package xml-core
Fixes RC bug #687109
unblock xml-core/0.13+nmu2
debdiff follows:
diff -Nru xml-core-0.13+nmu1/debhelper/dh_installxmlcatalogs xml-core-0.13+nmu2/debhelper/dh_installxmlcatalogs
--- xml-core-0.13+nmu1/debhelper/dh_installxmlcatalogs 2008-10-14 13:36:31.000000000 +0100
+++ xml-core-0.13+nmu2/debhelper/dh_installxmlcatalogs 2012-09-10 20:59:43.000000000 +0100
@@ -108,6 +108,12 @@
## ----------------------------------------------------------------------
use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Version;
+
+$Debian::Debhelper::Dh_Version::version =~ /^(\d+)\.(\d+)/
+ or error("Unexpected debhelper version format");
+# For the "sub" argument to autoscript:
+$1 > 9 or ($1 == 9 and $2 >= '20120909') or error('debhelper 9.20120909 or later required');
## ----------------------------------------------------------------------
my $xmlcorever = "0.12";
@@ -124,7 +130,7 @@
my $cmd = 'update-xmlcatalog';
$cmd .= ' --add';
$cmd .= " --type $type";
- $cmd .= " --id \\\"$id\\\"";
+ $cmd .= " --id \"$id\"";
$cmd .= " --package $pkg";
if ( $local ) {
$cmd .= " --local $local";
@@ -141,7 +147,7 @@
my $cmd = 'update-xmlcatalog';
$cmd .= ' --del';
$cmd .= " --type $type";
- $cmd .= " --id \\\"$id\\\"";
+ $cmd .= " --id \"$id\"";
if ( $root ) {
$cmd .= " --root";
} else {
@@ -216,8 +222,8 @@
die("error: package command with ID '$id' uses non-existent catalog '$local'\n");
}
- $ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . "\\n";
- $DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . "\\n";
+ $ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . "\n";
+ $DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . "\n";
}
} elsif ( $line->[0] eq 'root' ) {
@@ -225,8 +231,8 @@
my $type = $line->[1];
my $id = $line->[2];
- $ADD_ROOT .= "\t" . add_xmlcat_cmd($package, $type, $id) . "\\n";
- $DEL_ROOT .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . "\\n";
+ $ADD_ROOT .= "\t" . add_xmlcat_cmd($package, $type, $id) . "\n";
+ $DEL_ROOT .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . "\n";
}
} elsif ( $line->[0] eq 'root-and-package' ) {
@@ -242,10 +248,10 @@
die("error: root-and-package command with ID '$id' uses non-existent catalog '$local'\n");
}
- $ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . "\\n";
- $DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . "\\n";
- $ADD_ROOT .= "\t" . add_xmlcat_cmd($package, $type, $id) . "\\n";
- $DEL_ROOT .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . "\\n";
+ $ADD_PACKAGE .= "\t" . add_xmlcat_cmd($package, $type, $id, $local) . "\n";
+ $DEL_PACKAGE .= "\t" . del_xmlcat_cmd($package, $type, $id) . "\n";
+ $ADD_ROOT .= "\t" . add_xmlcat_cmd($package, $type, $id) . "\n";
+ $DEL_ROOT .= "\t" . del_xmlcat_cmd($package, $type, $id, 1) . "\n";
}
} else {
@@ -268,11 +274,11 @@
$DEL_PACKAGE or $DEL_PACKAGE = "\t:";
$DEL_ROOT or $DEL_ROOT = "\t:";
autoscript( $package, "postinst", "postinst-xmlcatalog",
- "s%#ADD_PACKAGE#%$ADD_PACKAGE%g; s%#ADD_ROOT#%$ADD_ROOT%g;" );
+ sub { s{#ADD_PACKAGE#}{$ADD_PACKAGE}g; s{#ADD_ROOT#}{$ADD_ROOT}g; } );
autoscript( $package, "prerm", "prerm-xmlcatalog",
- "s%#DEL_PACKAGE#%$DEL_PACKAGE%g; s%#DEL_ROOT#%$DEL_ROOT%g;" );
+ sub { s{#DEL_PACKAGE#}{$DEL_PACKAGE}g; s{#DEL_ROOT#}{$DEL_ROOT}g; } );
autoscript( $package, "postrm", "postrm-xmlcatalog",
- "s%#PACKAGECAT#%$packagecat%g;" );
+ sub { s{#PACKAGECAT#}{$packagecat}g; } );
addsubstvar( $package,
"misc:Depends", "xml-core", ">= $xmlcorever" );
diff -Nru xml-core-0.13+nmu1/debian/changelog xml-core-0.13+nmu2/debian/changelog
--- xml-core-0.13+nmu1/debian/changelog 2012-06-09 10:47:39.000000000 +0100
+++ xml-core-0.13+nmu2/debian/changelog 2012-09-15 14:53:40.000000000 +0100
@@ -1,3 +1,15 @@
+xml-core (0.13+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Use the "sub" fourth argument to autoscript that is more robust than the
+ sed snippet way (closes: #687109)
+ - I've verified that the control archive files of w3c-sgml-lib_1.2-3 are
+ byte-for-byte identical when built with 0.13+nmu1 and this version
+ - I've verified that w3c-sgml-lib_1.3-1 builds with this version, i.e. this
+ change unblocks Bug#665298
+
+ -- Marcin Owsiany <porridge@debian.org> Sat, 15 Sep 2012 14:50:27 +0100
+
xml-core (0.13+nmu1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru xml-core-0.13+nmu1/debian/control xml-core-0.13+nmu2/debian/control
--- xml-core-0.13+nmu1/debian/control 2009-10-25 22:49:07.000000000 +0000
+++ xml-core-0.13+nmu2/debian/control 2012-09-10 20:58:19.000000000 +0100
@@ -3,7 +3,7 @@
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 (>= 5)
+Build-Depends: debhelper (>= 9.20120909)
Build-Depends-Indep: perl
Standards-Version: 3.8.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/
@@ -13,7 +13,7 @@
Package: xml-core
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, sgml-base (>= 1.17), sed (>= 4.1.2-8)
-Suggests: debhelper (>= 4.1.75)
+Suggests: debhelper (>= 9.20120909)
Description: XML infrastructure and XML catalog file support
This package creates the XML infrastructure directories and provides
XML catalog file support in compliance with the current Debian XML
-- System Information:
Debian Release: squeeze/sid
APT prefers lucid-updates
APT policy: (600, 'lucid-updates'), (600, 'lucid-security'), (600, 'lucid'), (400, 'lucid-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-15-generic (SMP w/4 CPU cores)
Locale: LANG=pl_PL.utf8, LC_CTYPE=pl_PL.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Reply to: