diff options
| -rw-r--r-- | autoscripts/preinst-sgmlcatalog | 8 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | dh_installcatalogs | 15 |
3 files changed, 15 insertions, 15 deletions
diff --git a/autoscripts/preinst-sgmlcatalog b/autoscripts/preinst-sgmlcatalog deleted file mode 100644 index 96f06738..00000000 --- a/autoscripts/preinst-sgmlcatalog +++ /dev/null @@ -1,8 +0,0 @@ -if test -f #CENTRALCAT# -a "(" "$1" = "upgrade" -o "$1" = "install" -a -n "$2" ")" && - ! dpkg-query -S #CENTRALCAT# >/dev/null 2>&1; then - # If the dpkg-query command returns non-zero, the central catalog is - # not owned by any package. This is due to an old behaviour of - # debhelper. Now that file becomes a conffile. In order to avoid a - # question during installation, we remove the old non-conffile. - mv #CENTRALCAT# #CENTRALCAT#.old -fi diff --git a/debian/changelog b/debian/changelog index d245459a..fea6c6aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,13 @@ debhelper (9.20160403+unreleased) UNRELEASED; urgency=medium DEB_BUILD_OPTIONS=noautodbgsym to make the regular deb bit-for-bit reproducible with vs. without this flag. Thanks to Helmut Grohne for the report. + * dh_installcatalogs: Apply patch from Helmut Grohne to + explicitly trigger a new update-sgmlcatalog trigger, + since dpkg does not triger conffiles on package removal. + (Closes: #825005) + * dh_installcatalos: Apply patch from Helmut Grohne to + remove autoscript for a transition that completed in + Wheezy. -- Niels Thykier <niels@thykier.net> Sat, 09 Apr 2016 09:20:32 +0000 diff --git a/dh_installcatalogs b/dh_installcatalogs index d33ad9e0..bb45db99 100755 --- a/dh_installcatalogs +++ b/dh_installcatalogs @@ -10,7 +10,7 @@ use strict; use warnings; use Debian::Debhelper::Dh_Lib; -my $sgmlbasever = "1.26+nmu2"; +my $sgmlbasever = "1.28"; =head1 SYNOPSIS @@ -26,9 +26,10 @@ F</etc/sgml/I<package>.cat>. This command automatically adds maintainer script snippets for registering and unregistering the catalogs and supercatalogs (unless -B<-n> is used). These snippets are inserted into the maintainer scripts -by B<dh_installdeb>; see L<dh_installdeb(1)> for an explanation of -Debhelper maintainer script snippets. +B<-n> is used). These snippets are inserted into the maintainer +scripts and the B<triggers> file by B<dh_installdeb>; see +L<dh_installdeb(1)> for an explanation of Debhelper maintainer script +snippets. A dependency on B<sgml-base> will be added to B<${misc:Depends}>, so be sure your package uses that variable in F<debian/control>. @@ -53,7 +54,8 @@ start with F</usr/share/sgml/>. =item B<-n>, B<--noscripts> -Do not modify F<postinst>/F<postrm>/F<prerm> scripts. +Do not modify F<postinst>/F<postrm>/F<prerm> scripts nor add an +activation trigger. =back @@ -108,8 +110,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { close CENTRALCAT; if (! $dh{NOSCRIPTS}) { - autoscript($package, "preinst", "preinst-sgmlcatalog", - "s%#CENTRALCAT#%$centralcat%g;"); + autotrigger($package, "activate", "update-sgmlcatalog"); autoscript($package, "postrm", "postrm-sgmlcatalog", "s%#CENTRALCAT#%$centralcat%g;"); } |