[SCM] leiningen packaging branch, master, updated. c95a2fea6f80723520f7211c824065a84ac6ec3d

[Wolodja Wentland]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "leiningen packaging".

The branch, master has been updated
       via  c95a2fea6f80723520f7211c824065a84ac6ec3d (commit)
       via  290a6e439960f5b355f8a3c2113654e5084c50a5 (commit)
      from  fe09675231bf470d3680900da1c4653e93f9bc45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c95a2fea6f80723520f7211c824065a84ac6ec3d
Author: Wolodja Wentland <babilen at gmail.com>
Date:   Wed Jul 20 16:55:47 2011 +0100

    Repack in get-orig-source
    
    The previous method of importing a new upstream release relied on filtering
    with git-import-orig. Furthermore, the tarball retrieved with get-orig source
    differed from the one committed to the archive.

commit 290a6e439960f5b355f8a3c2113654e5084c50a5
Author: Wolodja Wentland <babilen at gmail.com>
Date:   Wed Jul 20 13:34:10 2011 +0100

    Change version suffix from +dfsg to +ds
    
    The licensing of resources/leiningen.png has been clarified [0], so that we
    can drop the +dfsg version suffix. As the upstream tarball has been repacked
    we now use +ds.
    
    [0] https://github.com/technomancy/leiningen/commit/6de97841b1fff77f8e99

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog        |    4 ++--
 debian/copyright        |    2 --
 debian/gbp.conf         |    7 -------
 debian/get-orig.exclude |    3 +++
 debian/rules            |   22 +++++++++++++++++-----
 debian/watch            |    2 +-
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a183106..7547f03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-leiningen (1.6.1+dfsg-1) unstable; urgency=low
+leiningen (1.6.1+ds-1) unstable; urgency=low
 
   * Initial release. (Closes: #566963)
 
- -- Wolodja Wentland <babilen at gmail.com>  Sun, 10 Jul 2011 21:59:08 +0000
+ -- Wolodja Wentland <babilen at gmail.com>  Wed, 20 Jul 2011 12:33:32 +0000
diff --git a/debian/copyright b/debian/copyright
index 7964acf..443773c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,6 @@ Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: leiningen
 Upstream-Contact: Phil Hagelberg
 Source: https://github.com/technomancy/leiningen
-Comment: DFSG: Removed resources/leiningen.png with unclear copyright (see
- gbp.conf)
 
 Files: *
 Copyright: 2009 - 2011 Phil Hagelberg
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 35feb5a..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,2 @@
 [DEFAULT]
 pristine-tar = True
-filter-pristine-tar = True
-filter = [
-  "*.bat",
-  "resources/leiningen.png",
-  "*.gitignore",
-  "*.gitattributes"
-  ]
diff --git a/debian/get-orig.exclude b/debian/get-orig.exclude
new file mode 100644
index 0000000..effa275
--- /dev/null
+++ b/debian/get-orig.exclude
@@ -0,0 +1,3 @@
+.gitattributes
+*.bat
+resources/leiningen.png
diff --git a/debian/rules b/debian/rules
index e29b89c..66af327 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,15 @@
 
 include /usr/share/javahelper/java-vars.mk
 
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NODFSG_VERSION := $(shell echo $(DEB_VERSION) | sed 's/+dfsg//')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_NODFSG_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_VERSION := $(shell dpkg-parsechangelog \
+	| grep -e '^Version:' \
+	| sed 's/^Version:[[:blank:]]*//')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) \
+	| sed 's/-[[:digit:]]*$$//')
+DEB_NODS_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) \
+	| sed 's/+ds//')
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NODS_VERSION) \
+	| sed 's/-[^-]*$$//')
 MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard doc/*.md))
 
 %:
@@ -26,7 +31,8 @@ override_jh_clean:
 
 override_jh_installlibs:
 	jh_installlibs -i --upstream-version=1.1.0 lancet.jar
-	jh_installlibs -i leiningen-$(DEB_UPSTREAM_VERSION).jar
+	jh_installlibs -i --version-strip=".ds[0-9]*$$" \
+		leiningen-$(DEB_UPSTREAM_VERSION).jar
 
 %.html:%.md
 	cat $(CURDIR)/debian/header.html > $@
@@ -36,3 +42,9 @@ override_jh_installlibs:
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	tar xzf ../leiningen_$(DEB_UPSTREAM_VERSION).orig.tar.gz -C ../
+	rm ../leiningen_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+	tar czf ../leiningen_$(DEB_NOEPOCH_VERSION).orig.tar.gz \
+		--exclude-vcs --exclude-from debian/get-orig.exclude \
+		 ../technomancy-leiningen-[a-z0-9]*/
+	rm -rf ../technomancy-leiningen-[a-z0-9]*/
diff --git a/debian/watch b/debian/watch
index 4074dff..1314eeb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="dversionmangle=s/\+dfsg//" \
+opts="dversionmangle=s/\+ds//" \
 http://githubredir.debian.net/github/technomancy/leiningen /([\d\.]+)\.tar\.gz


hooks/post-receive
-- 
leiningen packaging