[Pkg-fedora-ds-maintainers] 389-admin: Changes to 'master'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit b4a8ddf44f65463ca150d3ec6982b4900971811f
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu May 7 14:01:31 2015 +0300

    control: Bump policy to 3.9.6, no changes.

diff --git a/debian/changelog b/debian/changelog
index f159a86..e93cb26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 389-admin (1.1.35-5) UNRELEASED; urgency=medium
 
   * rules: Support reproducible builds, thanks Chris Lamb. (Closes: #776806)
+  * control: Bump policy to 3.9.6, no changes.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 07 May 2015 12:42:16 +0300
 
diff --git a/debian/control b/debian/control
index ae73716..1723cfd 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: quilt, debhelper (>= 9),
  libadminutil-dev,
  apache2-mpm-worker,
  libapache2-mod-nss,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://directory.fedoraproject.org
 Vcs-Git: git://anonscm.debian.org/pkg-fedora-ds/389-admin.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-fedora-ds/389-admin.git

commit 67c7f48be7ca0cb893b3622f733a93d8f6c7bdd5
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu May 7 12:42:22 2015 +0300

    rules: Support reproducible builds, thanks Chris Lamb. (Closes: #776806)

diff --git a/debian/changelog b/debian/changelog
index c200913..f159a86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+389-admin (1.1.35-5) UNRELEASED; urgency=medium
+
+  * rules: Support reproducible builds, thanks Chris Lamb. (Closes: #776806)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 07 May 2015 12:42:16 +0300
+
 389-admin (1.1.35-4) unstable; urgency=medium
 
   * add-softokn-ldlibpath.diff: The libpath needs to be fixed in AdminServer.pm
diff --git a/debian/rules b/debian/rules
index 59bf24b..273b989 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,10 @@ endif
 
 LDFLAGS += -L/usr/lib/$(DEB_HOST_MULTIARCH)/nss
 
+# Deterministic "build number". Format is defined in ./buildnum.pl
+BUILD_DATE := $(shell dpkg-parsechangelog --show-field Date)
+BUILDNUM := $(shell date --date="$(BUILD_DATE)" +%Y.%j.%H%M)
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--disable-rpath \
@@ -21,6 +25,9 @@ override_dh_auto_configure:
 		--with-initddir=/etc/init.d \
 		--with-apxs=/usr/bin/apxs2
 
+override_dh_auto_build:
+	dh_auto_build -- BUILDNUM=$(BUILDNUM)
+
 override_dh_auto_install:
 	dh_auto_install --destdir=$(CURDIR)/debian/tmp