From: joey <joey>
Date: Wed, 20 Jul 2005 14:45:35 +0000 (+0000)
Subject: r1777: releasing version 4.9.5
X-Git-Tag: 4.9.5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0a9673977c75ae4515e82822fcbf30833e4abc83;p=debhelper.git

r1777: releasing version 4.9.5
---

diff --git a/debian/changelog b/debian/changelog
index f0ec9c3..bb394f4 100644
--- 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 edfc0aa..f13c58f 100755
--- 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;
 		}
 	}
 }