diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-06-28 16:17:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-06-28 16:17:20 -0400 |
| commit | af351ff3d870c0559afd79fad0341f6a558e3900 (patch) | |
| tree | c96668a367fe07fb922a9af994006a13de2d705c | |
| parent | 99ec4466b27fd46a6f5102872d52a9ad29202b37 (diff) | |
| parent | 0ebb1c696b8e5617a348976abcb3858e47e1df01 (diff) | |
| download | debhelper-af351ff3d870c0559afd79fad0341f6a558e3900.tar.gz | |
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | dh_shlibdeps | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b948ec42..bd72d497 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,13 @@ debhelper (7.3.0) UNRELEASED; urgency=low -- Joey Hess <joeyh@debian.org> Mon, 20 Apr 2009 16:26:08 -0400 +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 3ab89818..e5f73cba 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; |