[xml/sgml-commit] [xml-core] 07/07: Import Debian version 0.13+nmu2
Mattia Rizzolo
mattia at debian.org
Fri Sep 30 16:12:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository xml-core.
commit 168baebaa440de0f0d8b069c3ea20977bddfaca7
Author: Marcin Owsiany <porridge at debian.org>
Date: Sat Sep 15 14:50:27 2012 +0100
Import Debian version 0.13+nmu2
---
debhelper/dh_installxmlcatalogs | 32 +++++++++++++++++++-------------
debian/changelog | 12 ++++++++++++
debian/control | 4 ++--
3 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/debhelper/dh_installxmlcatalogs b/debhelper/dh_installxmlcatalogs
index 9d16502..b5b8463 100755
--- a/debhelper/dh_installxmlcatalogs
+++ b/debhelper/dh_installxmlcatalogs
@@ -108,6 +108,12 @@ use strict;
## ----------------------------------------------------------------------
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 @@ sub add_xmlcat_cmd ($$$;$) {
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 @@ sub del_xmlcat_cmd ($$$;$) {
my $cmd = 'update-xmlcatalog';
$cmd .= ' --del';
$cmd .= " --type $type";
- $cmd .= " --id \\\"$id\\\"";
+ $cmd .= " --id \"$id\"";
if ( $root ) {
$cmd .= " --root";
} else {
@@ -216,8 +222,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
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 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
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 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
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 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
$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 --git a/debian/changelog b/debian/changelog
index 3b88a2b..57dc1fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at debian.org> Sat, 15 Sep 2012 14:50:27 +0100
+
xml-core (0.13+nmu1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index af2e925..750383f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: text
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 @@ DM-Upload-Allowed: yes
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/xml-core.git
More information about the debian-xml-sgml-commit
mailing list