From: Joey Hess <joey@kitenet.net>
Date: Sun, 28 Jun 2009 20:22:17 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
X-Git-Tag: 7.4.4~81
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=08108374130b3cec28fbd4021245e89e3bc97d7b;hp=f1596ea4b2caa47f0d28bcc42216cf44432eaf4a;p=debhelper.git

Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
---

diff --git a/debian/changelog b/debian/changelog
index 0e3b942..a82d4c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.2.18) UNRELEASED; urgency=low
+
+  * dh_shlibdeps: Ensure DEBIAN directory exists, as dpkg-shlibdeps
+    prints a confusing warning if it does not. Closes: #534226
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 28 Jun 2009 15:59:11 -0400
+
 debhelper (7.2.17) unstable; urgency=low
 
   * Allow command-specific options to be passed to commands
diff --git a/dh_shlibdeps b/dh_shlibdeps
index 3ab8981..e5f73cb 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -112,6 +112,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	my $ext=pkgext($package);
 
+	# dpkg-shlibdeps expects this directory to exist
+	if (! -d "$tmp/DEBIAN") {
+		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
+	}
+
 	my @filelist;
 	my $ff;