[debhelper-devel] Bug#825005: Bug#825002: sgml-base: broken super catalog after removing docutils-common

[Helmut Grohne]

Control: tags -1 + patch

On Sun, May 22, 2016 at 12:50:58PM +0200, Helmut Grohne wrote:
> You can find the implementation for debhelper attached. It basically
> consists of adding an autotrigger invocation and bumps the sgml-base
> version.
> 
> In addition I am removing the transition script as it is now part of
> both wheezy and jessie. Did we ever support skipping two releases?
> 
> This is a request for review and should not be included in debhelper
> before the relevant sgml-base changes have been uploaded.

Guillem Jover remarked that the trigger should be called
update-sgmlcatalog even though it does not match the binary. There was
an attempt at renaming the binary to that name and the name is less
generic.

So I updated the patch changing the trigger name and filling in the bug
number. It is ready for inclusion in debhelper now given that sgml-base
1.28 is uploaded.

Helmut
-------------- next part --------------
diff --minimal -Nru debhelper-9.20160403/autoscripts/preinst-sgmlcatalog debhelper-9.20160403+nmu1/autoscripts/preinst-sgmlcatalog
--- debhelper-9.20160403/autoscripts/preinst-sgmlcatalog
+++ debhelper-9.20160403+nmu1/autoscripts/preinst-sgmlcatalog
@@ -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 --minimal -Nru debhelper-9.20160403/debian/changelog debhelper-9.20160403+nmu1/debian/changelog
--- debhelper-9.20160403/debian/changelog
+++ debhelper-9.20160403+nmu1/debian/changelog
@@ -1,3 +1,13 @@
+debhelper (9.20160403+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * dh_installcatalogs: Explicitly trigger update-sgmlcatalog since
+    dpkg does not trigger conffiles on package removal. (Closes: #825005)
+  * dh_installcatalogs: Drop autoscript for transition that completed in
+    wheezy.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 14 Jun 2016 22:26:21 +0200
+
 debhelper (9.20160403) unstable; urgency=medium
 
   * d/control: Requre dh-autoreconf (>= 12) to ensure
diff --minimal -Nru debhelper-9.20160403/dh_installcatalogs debhelper-9.20160403+nmu1/dh_installcatalogs
--- debhelper-9.20160403/dh_installcatalogs
+++ debhelper-9.20160403+nmu1/dh_installcatalogs
@@ -10,7 +10,7 @@
 use warnings;
 use Debian::Debhelper::Dh_Lib;
 
-my $sgmlbasever = "1.26+nmu2";
+my $sgmlbasever = "1.28";
 
 =head1 SYNOPSIS
 
@@ -108,8 +108,7 @@
 		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;");
 		}