[xml/sgml-commit] r2216 - in /packages/xml-core/trunk: debhelper/dh_installxmlcatalogs debian/changelog debian/control
aerostitch-guest at users.alioth.debian.org
aerostitch-guest at users.alioth.debian.org
Fri Feb 28 06:24:02 UTC 2014
Author: aerostitch-guest
Date: Fri Feb 28 06:24:02 2014
New Revision: 2216
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2216
Log:
Integrating changes from nmu1 and nmu2
Modified:
packages/xml-core/trunk/debhelper/dh_installxmlcatalogs
packages/xml-core/trunk/debian/changelog
packages/xml-core/trunk/debian/control
Modified: packages/xml-core/trunk/debhelper/dh_installxmlcatalogs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debhelper/dh_installxmlcatalogs?rev=2216&op=diff
==============================================================================
--- packages/xml-core/trunk/debhelper/dh_installxmlcatalogs (original)
+++ packages/xml-core/trunk/debhelper/dh_installxmlcatalogs Fri Feb 28 06:24:02 2014
@@ -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" );
Modified: packages/xml-core/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debian/changelog?rev=2216&op=diff
==============================================================================
--- packages/xml-core/trunk/debian/changelog (original)
+++ packages/xml-core/trunk/debian/changelog Fri Feb 28 06:24:02 2014
@@ -1,8 +1,23 @@
-xml-core (0.14) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sun, 25 Oct 2009 23:59:27 +0100
+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 at debian.org> Sat, 15 Sep 2012 14:50:27 +0100
+
+xml-core (0.13+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Rebuild against debhelper (>= 9.20120528) to fix postinst that
+ unconditionally overwrites files in /etc (see: #477751, closes: #675483).
+ Thanks to Helmut Grohne for the bug report.
+
+ -- Jakub Wilk <jwilk at debian.org> Sat, 09 Jun 2012 11:47:37 +0200
xml-core (0.13) unstable; urgency=low
Modified: packages/xml-core/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-core/trunk/debian/control?rev=2216&op=diff
==============================================================================
--- packages/xml-core/trunk/debian/control (original)
+++ packages/xml-core/trunk/debian/control Fri Feb 28 06:24:02 2014
@@ -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>, Daniel Leidert (dale) <daniel.leidert at 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
More information about the debian-xml-sgml-commit
mailing list