[getdp] 38/60: up get-orig-source

[Matteo F. Vescovi]

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

mfv pushed a commit to branch master
in repository getdp.

commit 60bdf98846bac4cdf4d65f125f6873fa15f82642
Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
Date:   Mon Mar 11 13:32:41 2013 +0000

    up get-orig-source
---
 debian/rules | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index c66c1e4..c4799ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,7 @@ override_dh_auto_clean:
 
 # Grab the version before +dfsg
 DEB_SOURCE_PACKAGE = $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
-DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
+DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p' | cut -f 1 -d '-')
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
 
 get-orig-source:
@@ -67,7 +67,8 @@ get-orig-source:
         mkdir -p tmp ; \
         uscan --force-download --symlink --check-dirname-level 0 --destdir tmp ; \
         tar -C tmp -xzf tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-source.tgz ; \
-        rm -rf tmp/getdp-$(DEB_UPSTREAM_VERSION)/contrib/Arpack ; \
+	mv tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-source tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION); \
+        rm -rf tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/contrib/Arpack ; \
         GZIP=-9 tar -C tmp -czf \
             $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
             $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) ; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getdp.git