[SCM] FreeFem++ packaging branch, experimental, updated. debian/3.20-1-13-gbd0dac0

[Christophe Trophime]

The following commit has been merged in the experimental branch:
commit 96d2a89376c991942cace5852367d69aedb63136
Author: Christophe Trophime <christrophime at googlemail.com>
Date:   Thu Feb 7 10:49:47 2013 +0100

    upload CT changes to 3.20

diff --git a/debian/control b/debian/control
index 62be998..e4b2a76 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,12 @@ Source: freefem++
 Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>, 
+Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>, 
  Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 9~), autotools-dev, gawk, gfortran, 
+Build-Depends: debhelper (>= 9~), 
+ dh-autoreconf,
+ quilt, gawk, gfortran, 
  flex, bison, libxt-dev, libxext-dev, libxxf86vm-dev, libhypre-dev, 
  libxpm-dev, mpi-default-dev, libfftw3-dev, libblas-dev, libgsl0-dev,
  libarpack2-dev, libsuitesparse-dev, libsuperlu3-dev, imagemagick, 
@@ -14,6 +16,9 @@ Build-Depends: debhelper (>= 9~), autotools-dev, gawk, gfortran,
  libmumps-dev, libblacs-mpi-dev, libscalapack-mpi-dev, libgmm++-dev, 
  libscotch-dev, ghostscript, libptscotch-dev, libmumps-scotch-dev,
  libmumps-seq-dev, libnlopt-dev, coinor-libipopt-dev
+# libtet1.4-dev,
+# libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint,
+# libparms2-dev, libhips-dev, libitsol-dev
 Standards-Version: 3.9.3
 Homepage: http://www.freefem.org/ff++/
 Vcs-Git: git://git.debian.org/debian-science/packages/freefempp.git
diff --git a/debian/patches/series b/debian/patches/series
index 4995009..c3e670a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,7 @@
+configure.patch
 src-Graphics-sansgraph-cpp.patch
 src-Graphics-xglrgraf-cpp.patch
 examples++-load-Makefile.patch
 examples++-load-load-link-in.patch
 examples-bamg-test-dotest-pl.patch
+examples++-mpi.patch
diff --git a/debian/rules b/debian/rules
index a38c8a0..220e86f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,15 @@
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
 
-clean:
-	dh_testdir
+
+
+%:
+	dh $@ --with autoreconf
+
+export OMPI_MCA_plm_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot
+	
+override_dh_auto_clean:	
 	dh_auto_clean
-	dh_clean
 	rm -f download/parms/config.log download/hypre/config.log 
 	rm -f download/pastix/config.log download/parmetis/config.log
 	rm -f download/scotch/config.log download/superludist/config.log
@@ -39,104 +44,23 @@ clean:
 	rm -f examples++-mpi/MPICG.o examples++-mpi/MPICG.so
 	rm -f src/mpi/config.log src/mpi/ff-mpirun src/medit/compil.date
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
+override_dh_autoreconf_clean:
+	dh_autoreconf_clean
+	dh_quilt_unpatch
+
+override_dh_autoreconf:
+	dh_quilt_patch
+	dh_autoreconf --as-needed
+
+override_dh_auto_configure:
 	dh_auto_configure -- CFLAGS=-lm
+	cp -f examples++-load/WHERE_LIBRARY-config debian
 	dh_auto_build
-#	dh_auto_test
-
-binary-indep:
-	dh_testroot -i
-	dh_prep -i
-	dh_installdirs -i
-	dh_auto_install -i
-	dh_install -i
-	dh_installdocs -i
-	dh_installchangelogs -i
-	dh_installexamples -i
-	dh_installman -i
-	dh_installcatalogs -i
-	dh_installcron -i
-	dh_installdebconf -i
-	dh_installemacsen -i
-	dh_installifupdown -i
-	dh_installinfo -i
-#	dh_pysupport -i
-	dh_installinit -i
-	dh_installmenu -i
-	dh_installmime -i
-	dh_installmodules -i
-	dh_installlogcheck -i
-	dh_installlogrotate -i
-	dh_installpam -i
-	dh_installppp -i
-	dh_installudev -i
-	dh_installwm -i
-	dh_installxfonts -i
-	dh_bugfiles -i
-	dh_lintian -i
-	dh_gconf -i
-	dh_icons -i
-	dh_perl -i
-	dh_usrlocal -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-# 	dh_strip -i
-# 	dh_makeshlibs -i
-# 	dh_shlibdeps -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
 
-binary-arch: 
-	dh_testroot -a
-	dh_prep -a
-	dh_installdirs -a
-	dh_auto_install -a
-	dh_install -a
+override_dh_auto_install:
 	mv debian/freefem++/usr/bin/bamg debian/freefem++/usr/bin/ffbamg
-	dh_installdocs -a
-	dh_installchangelogs -a
-	dh_installexamples -a
-	dh_installman -a
-	dh_installcatalogs -a
-	dh_installcron -a
-	dh_installdebconf -a
-	dh_installemacsen -a
-	dh_installifupdown -a
-	dh_installinfo -a
-#	dh_pysupport -a
-	dh_installinit -a
-	dh_installmenu -a
-	dh_installmime -a
-	dh_installmodules -a
-	dh_installlogcheck -a
-	dh_installlogrotate -a
-	dh_installpam -a
-	dh_installppp -a
-	dh_installudev -a
-	dh_installwm -a
-	dh_installxfonts -a
-	dh_bugfiles -a
-	dh_lintian -a
-	dh_gconf -a
-	dh_icons -a
-	dh_perl -a
-	dh_usrlocal -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_strip -a
-	dh_makeshlibs -a
-	dh_shlibdeps -a
-	dh_installdeb -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_auto_install
 
-binary: binary-arch binary-indep
+override_dh_auto_test:
+	echo "do not run tests"
+	#dh_auto_test

-- 
FreeFem++ packaging