diff options
| -rw-r--r-- | autoscripts/postinst-menu-method | 2 | ||||
| -rw-r--r-- | autoscripts/postrm-init | 3 | ||||
| -rw-r--r-- | t/dh_link | 12 |
3 files changed, 9 insertions, 8 deletions
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 deleted file mode 100644 index 9596dd97..00000000 --- a/autoscripts/postrm-init +++ /dev/null @@ -1,3 +0,0 @@ -if [ "$1" = "purge" ] ; then - update-rc.d #SCRIPT# remove #INITPARMS# >/dev/null -fi @@ -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")); |