[Pkg-openldap-devel] [openldap] 276/281: Adjust get-orig-source to add +dfsg.

[Ryan Tandy]

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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit adfdcd02e2a3f44f5c13f33d5b80b7b3d2908165
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Wed Jul 8 00:52:57 2015 +0000

    Adjust get-orig-source to add +dfsg.
---
 debian/changelog |  6 ++++++
 debian/rules     | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30244ec..996b9c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openldap (2.4.40+dfsg-3) UNRELEASED; urgency=medium
+
+  * debian/rules: Adjust get-orig-source target to add +dfsg to version.
+
+ -- Ryan Tandy <ryan at nardis.ca>  Wed, 08 Jul 2015 00:52:20 +0000
+
 openldap (2.4.40+dfsg-2) unstable; urgency=medium
 
   * Actually install libldap-2.4-2.symbols.
diff --git a/debian/rules b/debian/rules
index 2cb01b0..af949a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ MAKEVARS	:= STRIP=
 
 # These variables are used only by get-orig-source, which will normally only
 # be run by maintainers.
-VERSION = $(shell dpkg-parsechangelog |grep Version| sed 's/.*: //;s/-.*//')
+VERSION = $(shell dpkg-parsechangelog |grep Version| sed 's/.*: //;s/\+dfsg//;s/-.*//')
 URL     = http://www.openldap.org/software/download/OpenLDAP/openldap-release/
 
 # Download the upstream source and make changes as required for DFSG reasons.
@@ -45,10 +45,10 @@ get-orig-source:
 	    file=`basename "$$schema"`; \
 	    rm openldap-$(VERSION)/servers/slapd/schema/$$file; \
 	done
-	mv openldap-$(VERSION) openldap_$(VERSION).orig
-	tar cf openldap_$(VERSION).orig.tar openldap_$(VERSION).orig
-	rm -r openldap_$(VERSION).orig
-	gzip -9 openldap_$(VERSION).orig.tar
+	mv openldap-$(VERSION) openldap-$(VERSION)+dfsg
+	tar cf openldap_$(VERSION)+dfsg.orig.tar openldap-$(VERSION)+dfsg
+	rm -r openldap-$(VERSION)+dfsg
+	gzip -9 openldap_$(VERSION)+dfsg.orig.tar
 
 %:
 	dh $@ --with quilt,autoreconf --builddirectory=$(builddir) --parallel

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