[SCM] Packaging for ESyS-Particle - Open Source software for particle-based numerical modelling branch, experimental, updated. upstream/2.2-47-gcd1a772

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit c02c2b41ee9d507a04442a7b7546bb134e482923
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Dec 30 23:20:41 2012 +0100

    Minor fix.

diff --git a/debian/esys-particle.1 b/debian/esysparticle.1
similarity index 95%
rename from debian/esys-particle.1
rename to debian/esysparticle.1
index ee2cb8b..f73a0de 100644
--- a/debian/esys-particle.1
+++ b/debian/esysparticle.1
@@ -1,10 +1,10 @@
-.TH ESyS-Particle "2011-11-22"
+.TH ESyS-Particle "2012-12-30"
 .SH NAME
 .B ESyS-Particle
 \- HPC Discrete Element Modelling Software.
 
 .SH SYNOPSIS
-.B mpirun -np 3 mpipython script.py
+.B mpirun -np 3 esysparticle script.py
 .br
 Parameter -np should correspond to the number of threads.
 
diff --git a/debian/rules b/debian/rules
index fb29f4c..99ee6ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-DESTDIR = $(CURDIR)/debian/tmp
 
 %:
 	dh $@ --parallel
@@ -18,20 +17,12 @@ extra_flags += CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)'
 
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -rf $(DESTDIR)
 	dh_clean
 
 override_dh_auto_configure:
-	mkdir -p $(DESTDIR)
 	./autogen.sh
 	dh_auto_configure -- CC=mpicc CXX=mpicxx --prefix=/usr --exec_prefix=/usr $(extra_flags) 
 
-override_dh_auto_install:
-	dh_auto_install -- DESTDIR=$(DESTDIR)
-	find . -name '*.pyc' -print0 | xargs -0 rm -f
-	find . -name '*.pyo' -print0 | xargs -0 rm -f
-	find . -name '*.la' -print0 | xargs -0 rm -f
-
 override_dh_auto_build:
 	dh_auto_build
 	doxygen
@@ -41,4 +32,7 @@ override_dh_pysupport:
 override_dh_auto_install:
 	dh_auto_install
 	cd $(CURDIR)/debian/test; python box.py 15.0
-	cd $(CURDIR)/debian/test; mpirun -np 3 $(CURDIR)/debian/esys-particle/usr/bin/esysparticle compression.py
+	cd $(CURDIR)/debian/test; mpirun -np 3 $(CURDIR)/debian/esys-particle/usr/bin/esysparticle compression.py; cat nbons.dat; cat ekin.dat; cat epot.dat
+	find . -name '*.pyc' -print0 | xargs -0 rm -f
+	find . -name '*.pyo' -print0 | xargs -0 rm -f
+	find . -name '*.la' -print0 | xargs -0 rm -f

-- 
Packaging for ESyS-Particle - Open Source software for particle-based numerical modelling