[debhelper-devel] [debhelper] 01/01: Let dpkg-gencontrol figure out the value for the source field

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit bbcb938ad38dd1bb69d6fcdb698d1e827d935795
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Aug 10 10:49:25 2015 +0200

    Let dpkg-gencontrol figure out the value for the source field
    
    Since dpkg-dev 1.18.2~, dpkg-gencontrol figures out the desired value
    for the "Source" field for ddebs (and does so better than debhelper
    did).
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 dh_gencontrol    | 4 ----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b9eae3..44103df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,13 @@ debhelper (9.20150629) UNRELEASED; urgency=medium
   * dh_strip: Strip ".comment" and ".note" sections from static
     libraries.  Thanks to Helmut Grohne for the suggestion.
     (Closes: #789351)
+  * dh_gencontrol: Stop explicitly passing -DSource to
+    dpkg-gencontrol when building ddebs.  The passed value was
+    wrong sometimes (e.g. with binNMUs) and dpkg-gencontrol
+    since 1.18.2~ computes the value correctly.
+  * d/control: Bump dependency on dpkg-dev to 1.18.2~ for
+    ddebs.  Build-depends not bumped since debhelper itself
+    does not produce any ddebs.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 28 Jun 2015 15:08:19 +0200
 
diff --git a/debian/control b/debian/control
index 8fa120e..49b1cfe 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Homepage: http://joeyh.name/code/debhelper/
 
 Package: debhelper
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14)
+Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.18.2~), binutils, po-debconf, man-db (>= 2.5.1-1), libdpkg-perl (>= 1.17.14)
 Suggests: dh-make
 Multi-Arch: foreign
 Description: helper programs for debian/rules
diff --git a/dh_gencontrol b/dh_gencontrol
index f594480..d05cd6d 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -53,8 +53,6 @@ init(options => {
 });
 
 
-my $src_pkg;
-
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
 	my $ext=pkgext($package);
@@ -85,7 +83,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if ( -d $ddeb_tmp) {
 		my $multiarch = package_multiarch($package);
 		my $replaces = read_ddeb_migration($ddeb_info_dir);
-		$src_pkg = sourcepackage() if not defined($src_pkg);
 
 		# Remove and override more or less every standard field.
 		my @ddeb_options = (qw(
@@ -95,7 +92,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			 "-DPackage=${package}-dbgsym",
 			 "-DDepends=${package} (= \${binary:Version})",
 			 "-DDescription=Debug symbols for ${package}",
-			 "-DSource=${src_pkg}",
 		);
 		# Disable multi-arch unless the original package is an
 		# multi-arch: same package.  In all other cases, we do not

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git