[SCM] FreeFem++ packaging branch, master, updated. debian/3.19.1-1-2-gec035bf
Christophe Trophime
christrophime at googlemail.com
Wed Feb 6 09:49:48 UTC 2013
The following commit has been merged in the master branch:
commit ec035bf7c2d1d07f7a63553e664a59bb3278eccc
Author: Christophe Trophime <christrophime at googlemail.com>
Date: Wed Feb 6 10:49:35 2013 +0100
add support for nlopt, ipopt - simplify debian/rules
diff --git a/debian/control b/debian/control
index 60dc274..fc79b50 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,9 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
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,
@@ -13,7 +15,11 @@ Build-Depends: debhelper (>= 9~), autotools-dev, gawk, gfortran,
texlive-latex-extra, texlive-font-utils, libmumps-ptscotch-dev,
libmumps-dev, libblacs-mpi-dev, libscalapack-mpi-dev, libgmm++-dev,
libscotch-dev, ghostscript, libptscotch-dev, libmumps-scotch-dev,
- libmumps-seq-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
+# autoconf, aclocal, libtool,
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/configure.patch b/debian/patches/configure.patch
new file mode 100644
index 0000000..96fb832
--- /dev/null
+++ b/debian/patches/configure.patch
@@ -0,0 +1,72 @@
+Index: freefem++-3.20/configure.ac
+===================================================================
+--- freefem++-3.20.orig/configure.ac 2012-10-18 13:07:39.000000000 +0200
++++ freefem++-3.20/configure.ac 2013-01-20 19:06:33.072259323 +0100
+@@ -41,6 +41,7 @@
+ ]) dnl
+ m4_define([AC_FF_WHERELIB],
+ [ if test -z "$ff_where_lib_conf_$1" ; then
++ dnl AC_MSG_NOTICE([AC_FF_WHERELIB check $1 $2 $3 $4])
+ AC_MSG_CHECKING(check $1)
+ ff_save_libs=$LIBS
+ LIBS="$LIBS $2 $4"
+@@ -49,6 +50,7 @@
+ echo "$1 LD $2" >>$ff_where_lib_conf
+ ff_WHERE_INC=`AS_DIRNAME(["$3"])`
+ if test -n "$ff_WHERE_INC" -a "$ff_WHERE_INC" != '.' ; then
++ dnl AC_MSG_NOTICE([AC_FF_WHERELIB $1 INCLUDE -I$ff_WHERE_INC])
+ echo "$1 INCLUDE -I$ff_WHERE_INC" >>$ff_where_lib_conf
+ fi
+ fi
+@@ -56,6 +58,8 @@
+
+ ff_where_lib_conf_$1=1
+ LIBS=$ff_save_libs
++ dnl else
++ dnl AC_MSG_NOTICE([AC_FF_WHERELIB nocheck $1 $2 $3 $4])
+ fi
+ ])dnl end m4_define AC_FF_WHERELIB
+
+@@ -2076,8 +2080,16 @@
+ test -n "$ff_mkl_scalapack" && ff_scalapack="$ff_mkl_scalapack"
+ test -n "$ff_mkl_root" && ff_winc="$ff_mkl_root/include/mkl_blas.h"
+
+-
++# For ipot
++AC_CHECK_HEADERS(cstddef,
++ [AC_DEFINE(HAVE_CSTDDEF, 1, cstddef exists)],
++ [])
++AC_CHECK_HEADERS(stddef.h,
++ [AC_DEFINE(HAVE_STDDEF_H, 1, stddef.h exists)],
++ [])
++
+ m4_map([AC_FF_WHERELIB],[
++ [[mumps-seq],[-ldmumps_seq -lzmumps_seq -lmumps_common_seq -lpord_seq],[dmumps_c.h],[]],
+ [[mumps],[-ldmumps -lzmumps -lmumps_common -lpord],[dmumps_c.h],[]],
+ [[mumps_ptscotch],[-lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch],[dmumps_c.h]],
+ [[mumps_scotch],[-lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch],[dmumps_c.h]],
+@@ -2088,17 +2100,21 @@
+ [[Superlu4],[-lsuperlu4],[superlu4/slu_ddefs.h],[]],
+ [[blacs],[ -lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi],[]],
+ [[scalapack],[-lscalapack$ff_with_mpi],[]],
+- [[scotch],[-lscotch -lscotcherr],[]],
++ [[scotch],[-lscotch -lscotcherr],[scotch/scotch.h],[]],
+ [[ptscotch],[-lptscotch -lptscotcherr],[]],
+ [[metis],[-lscotch -lmetis],[metis/metis.h],[]],
+ [[metis],[-lscotch -lmetis],[metis.h],[]],
+ [[parmetis],[-lptscotch -lparmetis],[],[]],
+ [[freeyams],[-lfreeyams],[freeyamslib.h],[]],
+- [[mmg3d],[-lmmg3d],[libmmg3d.h],[]],
++ [[mmg3d],[-lmmg3dlib4.0],[libmmg3d.h],[]],
+ [[mshmet],[-lmshmet],[],[]],
+ [[gsl],[-lgsl -lgslcblas -lm],[gsl/gsl_sf.h],[]],
+- [[parms],[-lparms -litsol -llapack -lblas -lm],[],[]],
++ [[parms],[-lparms2 -litsol -llapack -lblas -lm],[],[]],
+ [[tetgen],[-ltet],[tetgen.h],[]],
++ [[hips],[-lhips],[hips/hips.h],[]],
++ [[nlopt],[-lnlopt],[nlopt.h],[]],
++ [[Ipopt],[-lipopt -ldmumps -lblas -lm -ldl],[coin/IpIpoptApplication.hpp],[]],
++ [[gmm],[],[gmm/gmm.h],[]],
+ ]
+ )
+
diff --git a/debian/patches/series b/debian/patches/series
index 93aace4..ec97aa2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+configure.patch
src-Graphics-sansgraph-cpp.patch
src-Graphics-xglrgraf-cpp.patch
examples++-load-Makefile.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
More information about the debian-science-commits
mailing list