[Pkg-sssd-devel] sssd: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/changelog |    7 +++++++
 debian/rules     |    6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 7a8dad93baf1fb41e89a6138662ffe31db1d1f0f
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Jun 5 11:40:55 2012 +0300

    rules: Fix the current date format, and move the date mangling to happen before dh_install is run. (Closes: #670019)

diff --git a/debian/changelog b/debian/changelog
index 3183a80..52a59ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sssd (1.8.4-2) UNRELEASED; urgency=low
+
+  * rules: Fix the current date format, and move the date mangling to
+    happen before dh_install is run. (Closes: #670019)
+
+ -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 05 Jun 2012 11:39:33 +0300
+
 sssd (1.8.4-1) unstable; urgency=low
 
   * New upstream bugfix release 1.8.2.
diff --git a/debian/rules b/debian/rules
index 6753c85..f888610 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ INIT = init
 PKGDATE = $(shell dpkg-parsechangelog | \
 	awk -F" " '/^Date/ { print $$4 "/" $$3 "/" $$5 }' | \
 	sed 's/Jan/01/;s/Feb/02/;s/Mar/03/;s/Apr/04/;s/May/05/;s/Jun/06/;s/Jul/07/;s/Aug/08/;s/Sep/09/;s/Oct/10/;s/Nov/11/;s/Dec/12/;s/\//\\\//g')
-CURDATE = $(shell date +%m/%e/%Y | sed 's/\//\\\//g')
+CURDATE = $(shell date +%m/%d/%Y | sed 's/\//\\\//g')
 
 ifeq ($(DISTRIBUTION), Ubuntu)
 	INIT = upstart
@@ -45,10 +45,10 @@ override_dh_install:
 	find $(CURDIR)/debian/tmp/ -name '*.egg-info' -exec rm '{}' ';'
 	rm -f $(CURDIR)/debian/tmp/etc/rc.d/init.d/sssd
 
-	dh_install --fail-missing
-
 	sed -i 's/${CURDATE}/${PKGDATE}/g' $(CURDIR)/debian/tmp/usr/share/man/man8/pam_sss.8
 
+	dh_install --fail-missing
+
 override_dh_python2:
 	dh_python2 --no-guessing-versions