r788: This commit was manufactured by cvs2svn to create tag

'debian_version_2_1_20'.

9 files changed, 25 insertions, 23 deletions

diff --git a/autoscripts/postinst-init b/autoscripts/postinst-init
deleted file mode 100644
index b5bd7a57..00000000
--- a/autoscripts/postinst-init
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ -x "/etc/init.d/#SCRIPT#" ]; then
-	update-rc.d #SCRIPT# #INITPARMS# >/dev/null
-	if [ -x /usr/sbin/invoke-rc.d ]; then
-		invoke-rc.d #SCRIPT# start
-	else
-		/etc/init.d/#SCRIPT# start
-	fi
-fi
diff --git a/autoscripts/postinst-init-norestart b/autoscripts/postinst-init-norestart
new file mode 100644
index 00000000..b33702c5
--- /dev/null
+++ b/autoscripts/postinst-init-norestart
@@ -0,0 +1,6 @@
+update-rc.d #SCRIPT# #INITPARMS# >/dev/null
+if [ "$1" = "configure" ]; then
+	if [ -z "$2" -o "$2" = "<unknown>" ]; then
+		/etc/init.d/#SCRIPT# start
+	fi
+fi
diff --git a/autoscripts/postinst-menu-method b/autoscripts/postinst-menu-method
index 01913d82..03acde7f 100644
--- a/autoscripts/postinst-menu-method
+++ b/autoscripts/postinst-menu-method
@@ -1,5 +1,5 @@
 inst=/etc/menu-methods/#PACKAGE#
-if [ -x /usr/bin/update-menus ] && [ -f $inst ] ; then
+if [ -x /usr/bin/update-menus -a -f $inst ] ; then
 	chmod a+x $inst
 	update-menus
 fi
diff --git a/autoscripts/postrm-init b/autoscripts/postrm-init
index 9596dd97..1c292982 100644
--- a/autoscripts/postrm-init
+++ b/autoscripts/postrm-init
@@ -1,3 +1,3 @@
 if [ "$1" = "purge" ] ; then
-	update-rc.d #SCRIPT# remove #INITPARMS# >/dev/null
+	update-rc.d #SCRIPT# remove >/dev/null
 fi
diff --git a/autoscripts/postrm-menu-method b/autoscripts/postrm-menu-method
index ffa1e486..3270b7c7 100644
--- a/autoscripts/postrm-menu-method
+++ b/autoscripts/postrm-menu-method
@@ -1,3 +1,3 @@
 inst=/etc/menu-methods/#PACKAGE#
-if [ "$1" = "remove" ] && [ -f "$inst" ]; then chmod a-x $inst ; fi
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
+if [ "$1" = "remove" -a -f "$inst" ]; then chmod a-x $inst ; fi
+if test -x /usr/bin/update-menus ; then update-menus; fi
diff --git a/autoscripts/postrm-xaw b/autoscripts/postrm-xaw
new file mode 100644
index 00000000..b8d718ea
--- /dev/null
+++ b/autoscripts/postrm-xaw
@@ -0,0 +1,3 @@
+if test -x /usr/sbin/update-xaw-wrappers; then
+	/usr/sbin/update-xaw-wrappers
+fi
diff --git a/autoscripts/prerm-init b/autoscripts/prerm-init
deleted file mode 100644
index eab98c72..00000000
--- a/autoscripts/prerm-init
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ -x "/etc/init.d/#SCRIPT#" ]; then
-	if [ -x /usr/sbin/invoke-rc.d ] ; then
-		invoke-rc.d #SCRIPT# stop
-	else
-		/etc/init.d/#SCRIPT# stop
-	fi
-fi
diff --git a/autoscripts/prerm-xaw b/autoscripts/prerm-xaw
new file mode 100644
index 00000000..2507a2f5
--- /dev/null
+++ b/autoscripts/prerm-xaw
@@ -0,0 +1,4 @@
+for opts in #OPTS#; do
+	update-alternatives --quiet --remove $opts
+done
+	
diff --git a/t/dh_link b/t/dh_link
index 9f644e78..1e210558 100644
--- a/t/dh_link
+++ b/t/dh_link
@@ -1,16 +1,20 @@
 #!/usr/bin/perl
 use Test;
-plan(tests => 3);
+plan(tests => 4);
 
 # It used to not make absolute links in this situation, and it should.
 # #37774
 system("./dh_link","etc/foo","usr/lib/bar");
-ok("/etc/foo",readlink("debian/tmp/usr/lib/bar"));
+ok("/etc/foo",readlink("debian/debhelper/usr/lib/bar"));
 
 # let's make sure it makes simple relative links ok.
 system("./dh_link","usr/bin/foo","usr/bin/bar");
-ok("foo",readlink("debian/tmp/usr/bin/bar"));
+ok("foo",readlink("debian/debhelper/usr/bin/bar"));
 
 # ok, more complex relative links.
 system("./dh_link","usr/lib/1","usr/bin/2");
-ok("../lib/1",readlink("debian/tmp/usr/bin/2"));
+ok("../lib/1",readlink("debian/debhelper/usr/bin/2"));
+
+# this was bug #40159. Absolute links passes to dh_link.
+system("./dh_link","/etc/X11/dfm/system.dfmext","usr/share/dfm/dfmext");
+ok("/etc/X11/dfm/system.dfmext",readlink("debian/debhelper/usr/share/dfm/dfmext"));