[Pkg-scicomp-commits] ferari/trunk/debian fiat/trunk/debian

[Johannes Ring]

SVN commit 3946 by johannr-guest:

Minor fixes.

 M  +3 -0      ferari/trunk/debian/control  
 M  +9 -6      ferari/trunk/debian/rules  
 M  +9 -6      fiat/trunk/debian/rules  


--- ferari/trunk/debian/control #3945:3946
@@ -13,6 +13,9 @@
 Package: python-ferari
 Architecture: all
 XB-Python-Version: ${python:Versions}
+Conflicts: ferari
+Replaces: ferari
+Provides: ferari
 Depends: python-numeric-ext, ${python:Depends}, ${misc:Depends}
 Description: optimizations for evaluation of variational forms
  FErari (Finite Element rearrangement to automatically reduce instructions)
--- ferari/trunk/debian/rules #3945:3946
@@ -7,10 +7,13 @@
 
 DEB_COMPRESS_EXCLUDE := .py .pdf
 
-USCAN_DESTDIR := $(CURDIR)
-SRC_VERSION := $(shell dpkg-parsechangelog | \
-		sed -ne 's/^Version: \(.*\)-.*/\1/p')
-
 get-orig-source:
-	uscan --force-download --verbose --destdir $(USCAN_DESTDIR) \
-	 --download-version $(SRC_VERSION) --upstream-version $(SRC_VERSION)
+	set -ex ; \
+	TMPDIR=`mktemp -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig` ; \
+	uscan --force-download --check-dirname-level 0 --destdir "$$TMPDIR" --download-version $(DEB_UPSTREAM_VERSION) --upstream-version $(DEB_UPSTREAM_VERSION); \
+	tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz ; \
+	rm -f "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)*.tar.gz ; \
+	GZIP=-9 tar -czf \
+	 $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+	 $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
+	rm -rf "$$TMPDIR"
--- fiat/trunk/debian/rules #3945:3946
@@ -7,10 +7,13 @@
 
 DEB_COMPRESS_EXCLUDE := .py
 
-USCAN_DESTDIR := $(CURDIR)
-SRC_VERSION := $(shell dpkg-parsechangelog | \
-		sed -ne 's/^Version: \(.*\)-.*/\1/p')
-
 get-orig-source:
-	uscan --force-download --verbose --destdir $(USCAN_DESTDIR) \
-	 --download-version $(SRC_VERSION) --upstream-version $(SRC_VERSION)
+	set -ex ; \
+	TMPDIR=`mktemp -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig` ; \
+	uscan --force-download --check-dirname-level 0 --destdir "$$TMPDIR" --download-version $(DEB_UPSTREAM_VERSION) --upstream-version $(DEB_UPSTREAM_VERSION); \
+	tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz ; \
+	rm -f "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)*.tar.gz ; \
+	GZIP=-9 tar -czf \
+	 $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+	 $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
+	rm -rf "$$TMPDIR"