[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.60.2-60-g39140b0

[Anton Gladky]

The following commit has been merged in the master branch:
commit c58a0fa6628d4860f886ebba9429ffe2543d54a1
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed May 11 19:25:53 2011 +0200

    Update debian/rules, dh7

diff --git a/debian/rules b/debian/rules
index 78a5a15..eb9a0d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,56 +1,48 @@
 #!/usr/bin/make -f
 
 tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
+tmpInstall = $(CURDIR)/debian/inst
+tmpInstallDbg = $(CURDIR)/debian/inst-dbg
 export VERSION=$(shell cat VERSION)
 export _VERSION=-${VERSION}
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-build: build-stamp
+%:
+	dh $@
 
-build-stamp: configure-stamp 
-	dh_testdir
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	## eudoxos: FIXME: scons skips config when cleaning and doesn't know where it built anything
-	## remove builddirs and installation directories
+override_dh_auto_clean:
 	rm -rf debian/build-* `find debian/ -name 'yade-*' -type d`
 	rm -rf doc/sphinx/_build
 	rm -rf tags
+	rm -f scons.profile-deb
+	rm -f *.1
 	rm -rf ${tmpDirMatplotLib}
-	dh clean 
+	rm -rf ${tmpInstall}
+	rm -rf ${tmpInstallDbg}
+	find . -name '*.pyc' -print0 | xargs -0 rm -f
+	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs
+override_dh_auto_configure:
 	mkdir -p ${tmpDirMatplotLib}
-	## files VERSION and _VERSION contain snapshot version without/with leading '-' respectively (like svn1113 and -svn1113)
-	#debug build
+	mkdir -p ${tmpInstall}
+	mkdir -p ${tmpInstallDbg}
+
+override_dh_auto_build:
 	# remove the profile, if existing, to have clean config
 	rm -f scons.profile-deb
 	# the last argument specified that we only want files in lib installed -- common files (the executable) are already in the optimized package
-	export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=3 jobs=1 features=vtk,gts,opengl,qt4,openmp PREFIX=debian/yade${_VERSION}-dbg/usr variant='' optimize=0 march= debug=1 debian/yade${_VERSION}-dbg/usr/lib
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=3 jobs=1 features=vtk,gts,opengl,qt4,openmp PREFIX=${tmpInstallDbg} variant='' optimize=0 march= debug=1 ${tmpInstallDbg}/lib
 	#optimized build
-	export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=debian/yade${_VERSION}/usr variant='' optimize=1 debug=0
-	export MPLCONFIGDIR=${tmpDirMatplotLib}; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=../../debian/yade${_VERSION}/usr/ ../../debian/yade${_VERSION}/usr/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=${tmpInstall} variant='' optimize=1 debug=0
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
 	# generate manpages
-	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --generate-manpage yade${_VERSION}.1
-	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION}-batch --generate-manpage yade${_VERSION}-batch.1
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --generate-manpage yade${_VERSION}.1
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION}-batch --generate-manpage yade${_VERSION}-batch.1
 
-check: install
-	dh_testdir
-	dh_testroot
-	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --test
-	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=debian/yade${_VERSION}-dbg/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --debug --test
+override_dh_auto_test:	
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --test
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstallDbg} ${tmpInstall}/bin/yade${_VERSION} --debug --test
 	#Delete all pyc files
-	find . -name '*.pyc' -print0 | xargs -0 rm
+	find . -name '*.pyc' -print0 | xargs -0 rm -f
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
@@ -64,11 +56,3 @@ override_dh_strip:
 override_dh_compress:
 	dh_compress --all -X.py -X.stl -X.gts -X.geo -X.mesh -X.msh -X.pdf -X.png -X.svg -X.txt -X.js -X.inv
 
-binary-indep: build install
-	dh binary-indep
-
-binary-arch: build install check
-	dh binary-arch
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/yade-0.60-dbg.install b/debian/yade-0.60-dbg.install
new file mode 100644
index 0000000..8391a0f
--- /dev/null
+++ b/debian/yade-0.60-dbg.install
@@ -0,0 +1 @@
+debian/inst-dbg/* usr
diff --git a/debian/yade-0.60.install b/debian/yade-0.60.install
index 7aeb8df..b5bb7dd 100644
--- a/debian/yade-0.60.install
+++ b/debian/yade-0.60.install
@@ -1,3 +1,4 @@
 debian/yade-0.60_16x16.xpm usr/share/pixmaps/
 debian/yade-0.60_32x32.xpm usr/share/pixmaps/
 debian/yade-0.60.desktop usr/share/applications/
+debian/inst/* usr

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.