r45639 - /packages/getdp/trunk/debian/rules

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Mar 11 13:32:41 2013
New Revision: 45639

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45639
Log:
up get-orig-source

Modified:
    packages/getdp/trunk/debian/rules

Modified: packages/getdp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/rules?rev=45639&op=diff
==============================================================================
--- packages/getdp/trunk/debian/rules (original)
+++ packages/getdp/trunk/debian/rules Mon Mar 11 13:32:41 2013
@@ -59,7 +59,7 @@
 
 # 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 @@
         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) ; \