r1609: * Only list dh_installman once in example rules.indep. Closes: #211567

   * Really fix the prerm-sgmlcatalog, not the postrm. Closes: #209131

diff --git a/autoscripts/postrm-sgmlcatalog b/autoscripts/postrm-sgmlcatalog
index f95d85ba52dd779810e5e8cae07c76c7b35e28e7..168a6949fba2e36dae816204bf1706438be43ea7 100644 (file)
--- a/autoscripts/postrm-sgmlcatalog
+++ b/autoscripts/postrm-sgmlcatalog
@@ -1,3 +1,3 @@
-if [ "$1" = "purge" ] || [ "$1" = "upgrade" ] ; then
+if [ "$1" = "purge" ]; then
        rm -f #CENTRALCAT# #CENTRALCAT#.old
 fi

diff --git a/autoscripts/prerm-sgmlcatalog b/autoscripts/prerm-sgmlcatalog
index cdc96e0230f09f847fe44ff02f2b81e67ba87e56..cf1db218d474e834b5e75287ba113c1323ccb962 100644 (file)
--- a/autoscripts/prerm-sgmlcatalog
+++ b/autoscripts/prerm-sgmlcatalog
@@ -1,3 +1,3 @@
-if [ "$1" = "remove" ]; then
+if [ "$1" = "remove" ] || [ "$1" = "uograde" ]; then
        update-catalog --quiet --remove --super #CENTRALCAT#
 fi

diff --git a/debian/changelog b/debian/changelog
index defce87c5dd437beca31e879f477cef49e94dc1a..4210254bcf10d7e763e5ad141272496f90cc41e4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (4.1.74) unstable; urgency=low
+
+  * Only list dh_installman once in example rules.indep. Closes: #211567
+  * Really fix the prerm-sgmlcatalog, not the postrm. Closes: #209131
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 21 Sep 2003 18:56:54 -0400
+
 debhelper (4.1.73) unstable; urgency=low
 
   * dh_installcatalogs: in prerm on upgrade, call update-catalog on the

diff --git a/examples/rules.indep b/examples/rules.indep
index c85242561ffeedc1f3961427d9b7be01070c5fd1..3206f91d5b091aaeda89bbe2b2b54feb5c64de56 100755 (executable)
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -52,7 +52,6 @@ binary-indep: build install
 #      dh_installmime
 #      dh_installinit
 #      dh_installcron
-#      dh_installman
 #      dh_installinfo
 #      dh_undocumented
        dh_installman