[debhelper-devel] [debhelper] 01/01: dh_usrlocal: Remove usr/local dirs in reversed order
Niels Thykier
nthykier at moszumanska.debian.org
Wed Jun 10 15:44:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit 13c0674f6e7c5d8a79c42cc058ea1b79aac067eb
Author: Thibaut Paumard <thibaut at debian.org>
Date: Wed Jun 10 17:43:38 2015 +0200
dh_usrlocal: Remove usr/local dirs in reversed order
Signed-off-by: Niels Thykier <niels at thykier.net>
---
debian/changelog | 5 +++++
dh_usrlocal | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5113aac..9921bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
debhelper (9.20150508) UNRELEASED; urgency=medium
+ [ Niels Thykier ]
* Buildsystem.pm: Apply patch from Emmanuel Bourg to
provide doit_in_{build,source}dir_noerror methods.
(Closes: #785811)
@@ -9,6 +10,10 @@ debhelper (9.20150508) UNRELEASED; urgency=medium
".xhtml" files and to use a POSIX compliant find expression.
(Closes: #740405)
+ [ Thibaut Paumard ]
+ * Bug fix: "dh_usrlocal leaves directories behind", thanks to Andreas
+ Beckmann (Closes: #788098).
+
-- Niels Thykier <niels at thykier.net> Wed, 20 May 2015 21:53:08 +0200
debhelper (9.20150507) unstable; urgency=medium
diff --git a/dh_usrlocal b/dh_usrlocal
index 193d70d..b21d11f 100755
--- a/dh_usrlocal
+++ b/dh_usrlocal
@@ -103,7 +103,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
# is parsed by the shell in double-quotes
my $dirs = join("$ebs\n", sort @dirs);
pop @justdirs; # don't remove directories directly in /usr/local
- my $justdirs = join("$ebs\n", sort @justdirs);
+ my $justdirs = join("$ebs\n", reverse sort @justdirs);
if (! $dh{NOSCRIPTS}) {
autoscript($package,"postinst", "postinst-usrlocal",
"/#DIRS#/ c${ebs}\n${dirs}");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list