[debhelper-devel] [debhelper] 03/03: dh_shlipdeps: Avoid creating d/pkg/DEBIAN if not needed

Niels Thykier nthykier at moszumanska.debian.org
Sun Jun 4 14:13:33 UTC 2017


This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit a0638cb8fe10e1f42b3446d1cf8bb9dd60fb00c6
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jun 4 13:53:44 2017 +0000

    dh_shlipdeps: Avoid creating d/pkg/DEBIAN if not needed
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_shlibdeps     | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9e329b..a2639f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ debhelper (10.5) UNRELEASED; urgency=medium
   * dh_clean, dh_prep: Bulk delete most files and directories, which
     gives a noticable speed up for source packages building many
     binary packages.
+  * dh_shlibdeps: Avoid creating debian/<pkg>/DEBIAN directory if it
+    is not needed.
 
   [ Iain Lane ]
   * Dh_Lib: Re-add warning + exit 0 for the -i/-a shortcut that was
diff --git a/dh_shlibdeps b/dh_shlibdeps
index eefcc43..d5dd50e 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -109,9 +109,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $ext=pkgext($package);
 	my (@filelist, $ff);
 
-	# dpkg-shlibdeps expects this directory to exist
-	install_dir("$tmp/DEBIAN");
-
 	# Generate a list of ELF binaries in the package, ignoring any
 	# we were told to exclude.
 	my $find_options='';
@@ -131,6 +128,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	if (@filelist) {
 		my @opts;
+
+		# dpkg-shlibdeps expects this directory to exist
+		install_dir("$tmp/DEBIAN");
+
 		if (defined($dh{LIBPACKAGE})) {
 			@opts = map { '-S' . tmpdir($_) } @{$dh{LIBPACKAGE}};
 		}

-- 
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