r971: This commit was manufactured by cvs2svn to create tagversion_4.0.6

'debian_version_4_0_6'.

26 files changed, 8 insertions, 94 deletions

diff --git a/autoscripts/postinst-doc-base b/autoscripts/postinst-doc-base
deleted file mode 100644
index 39265721..00000000
--- a/autoscripts/postinst-doc-base
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = configure ] && which install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/#DOC-ID#
-fi
diff --git a/autoscripts/postinst-emacsen b/autoscripts/postinst-emacsen
deleted file mode 100644
index f80e1dbd..00000000
--- a/autoscripts/postinst-emacsen
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ "$1" = "configure" ] && [ -x /usr/lib/emacsen-common/emacs-package-install ]
-then
-	/usr/lib/emacsen-common/emacs-package-install #PACKAGE#
-fi
diff --git a/autoscripts/postinst-info b/autoscripts/postinst-info
deleted file mode 100644
index 71ffa19b..00000000
--- a/autoscripts/postinst-info
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "configure" ]; then
-	install-info --quiet --section "#SECTION#" "#SECTION#" #FILE#
-fi
diff --git a/autoscripts/postinst-info-nosection b/autoscripts/postinst-info-nosection
deleted file mode 100644
index ffef8636..00000000
--- a/autoscripts/postinst-info-nosection
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "configure" ]; then
-	install-info --quiet #FILE#
-fi
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-makeshlibs b/autoscripts/postinst-makeshlibs
deleted file mode 100644
index 8a25b9e9..00000000
--- a/autoscripts/postinst-makeshlibs
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
diff --git a/autoscripts/postinst-menu b/autoscripts/postinst-menu
deleted file mode 100644
index 276a3c0a..00000000
--- a/autoscripts/postinst-menu
+++ /dev/null
@@ -1 +0,0 @@
-if [ "$1" = "configure" ] && [ -x /usr/bin/update-menus ]; then update-menus ; fi
diff --git a/autoscripts/postinst-mime b/autoscripts/postinst-mime
deleted file mode 100644
index bef63cc9..00000000
--- a/autoscripts/postinst-mime
+++ /dev/null
@@ -1 +0,0 @@
-if [ "$1" = "configure" ] && [ -x /usr/sbin/update-mime ]; then update-mime; fi
diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules
deleted file mode 100644
index babf39bd..00000000
--- a/autoscripts/postinst-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "configure" ] && [ -x /sbin/update-modules ]; then
-	update-modules >/dev/null
-fi
diff --git a/autoscripts/postinst-suid b/autoscripts/postinst-suid
deleted file mode 100644
index d0d16c06..00000000
--- a/autoscripts/postinst-suid
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ "$1" = "configure" ]; then
-	if which suidregister >/dev/null 2>&1 && [ -e /etc/suid.conf ]; then
-	        suidregister -s #PACKAGE# /#FILE# #OWNER# #GROUP# #PERMS#
-	elif [ -e /#FILE# ]; then
-	        chown #OWNER#.#GROUP# /#FILE#
-	        chmod #PERMS# /#FILE#
-	fi
-fi
diff --git a/autoscripts/postinst-wm b/autoscripts/postinst-wm
deleted file mode 100644
index aef412a3..00000000
--- a/autoscripts/postinst-wm
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ "$1" = "configure" ]; then
-	update-alternatives --install /usr/bin/x-window-manager \
-		x-window-manager #WM# #PRIORITY#
-fi
diff --git a/autoscripts/postinst-xfonts b/autoscripts/postinst-xfonts
deleted file mode 100644
index 96390e4e..00000000
--- a/autoscripts/postinst-xfonts
+++ /dev/null
@@ -1,3 +0,0 @@
-if which update-fonts-dir >/dev/null 2>&1; then
-	#CMDS#
-fi
diff --git a/autoscripts/postrm-debconf b/autoscripts/postrm-debconf
deleted file mode 100644
index 5a61724d..00000000
--- a/autoscripts/postrm-debconf
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule
-	db_purge
-fi
diff --git a/autoscripts/postrm-makeshlibs b/autoscripts/postrm-makeshlibs
deleted file mode 100644
index 96bf24ed..00000000
--- a/autoscripts/postrm-makeshlibs
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
diff --git a/autoscripts/postrm-menu b/autoscripts/postrm-menu
deleted file mode 100644
index a180558d..00000000
--- a/autoscripts/postrm-menu
+++ /dev/null
@@ -1 +0,0 @@
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
diff --git a/autoscripts/postrm-menu-method b/autoscripts/postrm-menu-method
deleted file mode 100644
index ffa1e486..00000000
--- a/autoscripts/postrm-menu-method
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/autoscripts/postrm-mime b/autoscripts/postrm-mime
deleted file mode 100644
index a9404112..00000000
--- a/autoscripts/postrm-mime
+++ /dev/null
@@ -1 +0,0 @@
-if which update-mime >/dev/null 2>&1; then update-mime; fi
diff --git a/autoscripts/postrm-modules b/autoscripts/postrm-modules
deleted file mode 100644
index f2d4cb7a..00000000
--- a/autoscripts/postrm-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /sbin/update-modules ]; then
-	update-modules >/dev/null
-fi
diff --git a/autoscripts/postrm-suid b/autoscripts/postrm-suid
deleted file mode 100644
index a4cfecf9..00000000
--- a/autoscripts/postrm-suid
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ "$1" = remove ] && [ -e /etc/suid.conf ] && \
-   which suidunregister >/dev/null 2>&1; then
-        suidunregister -s #PACKAGE# /#FILE#
-fi
diff --git a/autoscripts/postrm-xfonts b/autoscripts/postrm-xfonts
deleted file mode 100644
index a4d0a082..00000000
--- a/autoscripts/postrm-xfonts
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" != "upgrade" ] && [ -x /usr/sbin/update-fonts-dir ]; then
-#CMDS#
-fi
diff --git a/autoscripts/prerm-doc-base b/autoscripts/prerm-doc-base
deleted file mode 100644
index c57d999a..00000000
--- a/autoscripts/prerm-doc-base
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ "$1" = remove ] || [ "$1" = upgrade ] && \
-   which install-docs >/dev/null 2>&1; then
-	install-docs -r #DOC-ID#
-fi
diff --git a/autoscripts/prerm-emacsen b/autoscripts/prerm-emacsen
deleted file mode 100644
index 8c3ca64c..00000000
--- a/autoscripts/prerm-emacsen
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/lib/emacsen-common/emacs-package-remove ] ; then
-	/usr/lib/emacsen-common/emacs-package-remove #PACKAGE#
-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-init-norestart b/autoscripts/prerm-init-norestart
deleted file mode 100644
index fb991524..00000000
--- a/autoscripts/prerm-init-norestart
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ -x "/etc/init.d/#SCRIPT#" ] && [ "$1" = remove ]; 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-wm b/autoscripts/prerm-wm
deleted file mode 100644
index b97d627f..00000000
--- a/autoscripts/prerm-wm
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "remove" ]; then
-	update-alternatives --remove x-window-manager #WM#
-fi
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"));