[debhelper-devel] [debhelper] 02/05: Make sure all files are installed into the debhelper binary package

[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 213d231d51cd5d5b2e1505753a551370b0adc2cf
Author: Michael Biebl <biebl at debian.org>
Date:   Sun Oct 2 01:41:34 2016 +0200

    Make sure all files are installed into the debhelper binary package
    
    Now that we are building more then one binary package, dh_auto_install
    no longer uses debian/debhelper by default. Since the transitional
    dh-systemd package is supposed to be empty, override dh_auto_install and
    set --destdir=debian/debhelper to make sure all files end up in the
    debhelper binary package.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 debian/rules     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d061d02..8a1b490 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 debhelper (10.2) UNRELEASED; urgency=medium
 
   * Apply patch from Peter Pentchev to fix some typos.
+  * Apply patch from Michael Biebl to undo a major
+    regression where all of debhelpers functionality was
+    missing (introduced in 10.1).  (Closes: #839557)
 
  -- Niels Thykier <niels at thykier.net>  Sun, 02 Oct 2016 05:50:21 +0000
 
diff --git a/debian/rules b/debian/rules
index addfbff..b507359 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,3 +16,6 @@
 # Disable as they are unneeded (and we can then be sure debhelper
 # builds without needing autotools-dev, dh-strip-nondetermism etc.)
 override_dh_update_autotools_config override_dh_strip_nondeterminism:
+
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/debhelper

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