r1777: releasing version 4.9.5

diff --git a/debian/changelog b/debian/changelog
index f0ec9c361186c99bc7fe4cc081cc8db7ef661421..bb394f4c7ddcf29c891c68ae0ecbb1f4950788b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debhelper (4.9.5) UNRELEASED; urgency=low
+debhelper (4.9.5) unstable; urgency=low
 
   * dh_install: in v5 mode, error out if there are wildcards in the file
     list and the wildcards expand to nothing. Done only for v5 as this is a

diff --git a/dh_usrlocal b/dh_usrlocal
index edfc0aa1510fd10ef504ebf9283026dfcbd04f3c..f13c58faa57ceaf7e8edd120f6aff60c4c81f157 100755 (executable)
--- a/dh_usrlocal
+++ b/dh_usrlocal
@@ -99,13 +99,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # This constructs the body of a 'sed' c\ expression which
                # is parsed by the shell in double-quotes
                my $dirs = join("$ebs\n", @dirs);
-               pop @justdirs; # don't remove directories in /usr/local
+               pop @justdirs; # don't remove directories directly in /usr/local
                my $justdirs = join("$ebs\n", @justdirs);
                if (! $dh{NOSCRIPTS}) { 
                        autoscript($package,"postinst", "postinst-usrlocal",
                                   "/#DIRS#/ c${ebs}\n${dirs}");
                        autoscript($package,"prerm", "prerm-usrlocal",
-                                  "/#JUSTDIRS#/ c${ebs}\n${justdirs}");
+                                  "/#JUSTDIRS#/ c${ebs}\n${justdirs}") if length $justdirs;
                }
        }
 }