[Reproducible-commits] [cdbs] 41/41: Make debhelper.mk run dh_strip_nondeterminism

[Mattia Rizzolo]

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

mattia pushed a commit to branch reproducible
in repository cdbs.

commit cb5341a19ba7c7ed4a8e35597c5335bda613c4f8
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 11 14:30:46 2014 +0200

    Make debhelper.mk run dh_strip_nondeterminism
    
    Add dh-strip-nondeterminism to build-depends, else cdbs doesn't use it for it's
    own build nor for building other packages.
    
    dh_strip_nondeterminism is a helper which will normalize files that captures
    aspect of the build environment (e.g. timestamps or file order) and make the
    build process non-deterministic.
    
    See https://wiki.debian.org/ReproducibleBuilds for more information
    on reproducible builds in Debian.
    
    Closes: #764478
---
 1/rules/debhelper.mk.in | 1 +
 debian/changelog        | 4 ++++
 debian/control          | 1 +
 doc/cdbs-doc.xml        | 1 +
 4 files changed, 7 insertions(+)

diff --git a/1/rules/debhelper.mk.in b/1/rules/debhelper.mk.in
index 169f7a1..21bc0ec 100644
--- a/1/rules/debhelper.mk.in
+++ b/1/rules/debhelper.mk.in
@@ -298,6 +298,7 @@ common-binary-fixup-indep:: $(patsubst %,binary-fixup/%,$(DEB_INDEP_PACKAGES))
 # This rule is called after stripping; it compresses, fixes permissions,
 # and sets up shared library information.
 $(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%
+	dh_strip_nondeterminism
 	dh_compress -p$(cdbs_curpkg) \
 		$(call cdbs_add_dashx,$(call cdbs_expand_curvar,DEB_COMPRESS_EXCLUDE)) \
 		$(call cdbs_expand_curvar,DEB_DH_COMPRESS_ARGS)
diff --git a/debian/changelog b/debian/changelog
index 5531bd9..dc1c10a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,10 @@ cdbs (0.5) UNRELEASED; urgency=medium
   * Export environment variable $SOURCE_DATE_EPOCH to produce reproducible
     output.  Closes: #794241
 
+  [ Holger Levsen ]
+  * Make debhelper.mk run dh_strip_nondeterminism.  Closes: #764478
+  * Add dh-strip-nonddeterminism to build-depends.
+
  -- Jonas Smedegaard <dr at jones.dk>  Thu, 02 Apr 2015 12:00:17 +0200
 
 cdbs (0.4.130) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 7e7d236..3184f02 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: CDBS Hackers <build-common-hackers at lists.alioth.debian.org>
 Build-Depends-Indep: devscripts,
  debhelper,
+ dh-strip-nondeterminism,
  dh-buildinfo,
  realpath,
  fakeroot,
diff --git a/doc/cdbs-doc.xml b/doc/cdbs-doc.xml
index f5f45cb..b9c1f79 100644
--- a/doc/cdbs-doc.xml
+++ b/doc/cdbs-doc.xml
@@ -703,6 +703,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
           <listitem><para>dh_prep</para></listitem>
           <listitem><para>dh_shlibdeps</para></listitem>
           <listitem><para>dh_strip</para></listitem>
+          <listitem><para>dh_strip_nondeterminism</para></listitem>
         </itemizedlist>
 
       Of course, these are called in the correct order, not in the one

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