[debhelper-devel] [debhelper] 21/28: dh_builddeb: Let dpkg choose the filename of the ddeb

Niels Thykier nthykier at moszumanska.debian.org
Sun Jun 28 12:57: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 6bb9a3d64f5f9fbb0fbe5dcfc947baf407270ea5
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jun 14 09:18:44 2015 +0200

    dh_builddeb: Let dpkg choose the filename of the ddeb
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 9 +--------
 debian/changelog           | 2 ++
 dh_builddeb                | 3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 2c8442e..b064f47 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -21,7 +21,7 @@ use vars qw(@ISA @EXPORT %dh);
 	    &dpkg_architecture_value &sourcepackage &make_symlink
 	    &is_make_jobserver_unavailable &clean_jobserver_makeflags
 	    &cross_command &set_buildflags &get_buildoption
-	    &install_dh_config_file &ddeb_filename &package_multiarch
+	    &install_dh_config_file &package_multiarch
 	    &install_file &install_prog &install_lib &install_dir
 );
 
@@ -978,13 +978,6 @@ sub udeb_filename {
 	return _xdeb_filename($package, 'udeb');
 }
 
-# Generates the filename that is used for a ddeb package.
-sub ddeb_filename {
-	my ($package) = @_;
-
-	return _xdeb_filename($package, 'deb', "${package}-dbgsym");
-}
-
 # Handles #DEBHELPER# substitution in a script; also can generate a new
 # script from scratch if none exists but there is a .debhelper file for it.
 sub debhelper_script_subst {
diff --git a/debian/changelog b/debian/changelog
index 4672484..5e60f31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ debhelper (9.20150520+ddebs) UNRELEASED; urgency=medium
   * dh_strip: Support a new --[no-]ddebs option intended for
     packages to disable automatic ddebs.
   * dh_strip: Do not create ddebs for "-dbg" packages.
+  * dh_builddeb: Let dpkg figure out the name of the ddebs
+    itself now that ddebs uses a ".deb" extension.
 
  -- Niels Thykier <niels at thykier.net>  Mon, 25 May 2015 12:10:37 +0200
 
diff --git a/dh_builddeb b/dh_builddeb
index 3be83df..37aef96 100755
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -122,14 +122,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		# Only build the ddeb if it has a control file.  People might
 		# have skipped dh_gencontrol.
 		if ( -f $ddeb_control ) {
-			my $ddeb_filename = '/' . ddeb_filename($package);
 			# XXX: Should we blindly overrule the maintainer here?  It
 			# is not apparent that their explicit -z was intended for
 			# the ddeb.
 			my @args = default_compressor_args(["-z1", "-Zxz", "-Sextreme"],
 											   @{$dh{U_PARAMS}});
 			doit("dpkg-deb", @args,
-				 "--build", $ddeb_tmpdir, $dh{DESTDIR}.$ddeb_filename);
+				 "--build", $ddeb_tmpdir, $dh{DESTDIR});
 		} else {
 			warning("Not building ddeb for ${package} as it has no control file");
 			warning("Please use dh_gencontrol to avoid this issue");

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