summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autoscripts/postrm-sgmlcatalog2
-rw-r--r--autoscripts/prerm-sgmlcatalog2
-rw-r--r--debian/changelog7
-rwxr-xr-xexamples/rules.indep1
4 files changed, 9 insertions, 3 deletions
diff --git a/autoscripts/postrm-sgmlcatalog b/autoscripts/postrm-sgmlcatalog
index f95d85b..168a694 100644
--- 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 cdc96e0..cf1db21 100644
--- 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 defce87..4210254 100644
--- 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 c852425..3206f91 100755
--- 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