[Pkg-scicomp-commits] dolfin/trunk/debian

[Johannes Ring]

SVN commit 3934 by johannr-guest:

* Removed parallel jobs flag (-j3) when running scons.
* Minor fixes in clean target.
* Removed old creation of symbolic links for shared libraries.
* Updated get-orig-source target.
* Other minor fixes.


 M  +23 -30    dolfin/trunk/debian/rules  


--- dolfin/trunk/debian/rules #3933:3934
@@ -5,16 +5,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-version=0.8.0
-major=0
+VERSION=0.8.1
+MAJOR=0
 
-SCONS=`which scons` -j3
+SCONS=`which scons`
 
+CXXFLAGS=-Wall -pipe -ansi
+
 # Python-versions on the build system, we also force 2.5 just to be sure.
 PYVERS=$(sort $(shell pyversions -vr) 2.5)
 
 build: build-stamp
-build-stamp: patch $(PYVERS:%=build-python-%)
+build-stamp: $(PYVERS:%=build-python-%)
 	touch $@
 build-python-%: 
 	dh_testdir
@@ -38,33 +40,24 @@
 
 	touch $@
 
-clean: $(PYVERS:%=clean-patched-python-%) unpatch
+clean: $(PYVERS:%=clean-python-%)
 
-clean-patched-python-%:
+clean-python-%:
 	dh_testdir
 	dh_testroot
 
 	# Add here commands to clean up after the build process.
 #	-PYTHON=python$* $(SCONS) -c
-	-find dolfin -name "*.os" | xargs rm
-	-find dolfin -name "*.so" | xargs rm
-	-find scons -name "*.pyc" | xargs rm
-	-rm scons/options.cache
-	-rm scons/.sconsign.dblite
-	-rm scons/pkgconfig/*.pc
-	-rm build-stamp build-python-2.5
+	-find dolfin -name "*.os" | xargs rm -f
+	-find dolfin -name "*.so*" | xargs rm -f
+	-find scons -name "*.pyc" | xargs rm -f
+	-rm -f scons/options.cache
+	-rm -f scons/.sconsign.dblite
+	-rm -f scons/pkgconfig/*.pc
+	-rm -f build-stamp build-python-*
 
 	dh_clean 
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	dpatch cat-all > patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 install:
 	dh_testdir
 	dh_testroot
@@ -79,11 +72,6 @@
 	# in scons/pkgconfig:
 	python$* debian/gen_pkgconf.py debian/tmp/dolfin.pc
 
-	# Create versioned shared libraries with symbolic links:
-	cd $(CURDIR)/debian/tmp/lib && mv libdolfin.so libdolfin.so.$(version)\
-	 && ln -s libdolfin.so.$(version) libdolfin.so.$(major) \
-	 && ln -s libdolfin.so.$(version) libdolfin.so
-
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
@@ -100,7 +88,7 @@
 	# Python file is treated specially
 	mkdir -p debian/python-pydolfin0/usr/lib/python$*/site-packages/
 	cp -r debian/tmp/lib/python$*/site-packages/dolfin \
-	  debian/python-pydolfin0/usr/lib/python$*/site-packages/
+	  debian/python-pydolfin$(MAJOR)/usr/lib/python$*/site-packages/
 
 	dh_install -s
 
@@ -122,7 +110,7 @@
 #	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip --dbg-package=libdolfin$(major)-dbg
+	dh_strip --dbg-package=libdolfin$(MAJOR)-dbg
 	dh_compress -X.py -X.cpp -X.h -X.pdf
 	dh_fixperms
 #	dh_perl
@@ -137,5 +125,10 @@
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure get-orig-source
 
+USCAN_DESTDIR := $(CURDIR)
+SRC_VERSION := $(shell dpkg-parsechangelog | \
+		sed -ne 's/^Version: \(.*\)-.*/\1/p')
+
 get-orig-source:
-	uscan --force-download --verbose
+	uscan --force-download --verbose --destdir $(USCAN_DESTDIR) \
+	 --download-version $(SRC_VERSION) --upstream-version $(SRC_VERSION)