tag 687109 + patch thanks Attached, please review. If noone speaks up I'll NMU this or next week.
-- Marcin Owsiany <porri...@debian.org> http://marcin.owsiany.pl/ GnuPG: 2048R/02F946FC 35E9 1344 9F77 5F43 13DD 6423 DBF4 80C6 02F9 46FC
Index: debian/control =================================================================== --- debian/control (wersja 2038) +++ debian/control (kopia robocza) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian XML/SGML Group <debian-xml-sgml-p...@lists.alioth.debian.org> Uploaders: Ardo van Rangelrooij <a...@debian.org>, Daniel Leidert (dale) <daniel.leid...@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 Index: debian/changelog =================================================================== --- debian/changelog (wersja 2038) +++ debian/changelog (kopia robocza) @@ -1,8 +1,10 @@ -xml-core (0.14) UNRELEASED; urgency=low +xml-core (0.13+nmu1) unstable; urgency=low - * NOT RELEASED YET + * Non-maintainer upload. + * Use the "sub" fourth argument to autoscript that is more robust than the + sed snippet way (closes: #687109) - -- Daniel Leidert (dale) <daniel.leid...@wgdd.de> Sun, 25 Oct 2009 23:59:27 +0100 + -- Marcin Owsiany <porri...@debian.org> Mon, 10 Sep 2012 21:56:15 +0100 xml-core (0.13) unstable; urgency=low Index: debhelper/dh_installxmlcatalogs =================================================================== --- debhelper/dh_installxmlcatalogs (wersja 2038) +++ debhelper/dh_installxmlcatalogs (kopia robocza) @@ -108,7 +108,13 @@ ## ---------------------------------------------------------------------- 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" );
