[SCM] FreeFem++ packaging branch, master, updated. debian/3.20-1-25-g48775df
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Fri Jun 21 12:24:52 UTC 2013
The following commit has been merged in the master branch:
commit b2353c17b0a9c7e6478d102a47c55f2920ab3f08
Merge: ec035bf7c2d1d07f7a63553e664a59bb3278eccc bd0dac0376a41fa8316caee6529ab7a3c094c8d4
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Thu Jun 20 20:02:04 2013 +0300
Merge branch 'experimental'
Conflicts:
debian/control
debian/patches/configure.patch
debian/rules
diff --combined debian/control.orig
index fc79b50,005b087..c5641cb
--- a/debian/control.orig
+++ b/debian/control.orig
@@@ -7,19 -7,25 +7,41 @@@ Uploaders: Christophe Trophime <christo
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 9~),
dh-autoreconf,
++<<<<<<< HEAD
+ 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,
+ libfltk1.3-dev | libfltk-dev, freeglut3-dev, texlive, texlive-extra-utils,
+ 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, 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,
++=======
+ quilt, gawk, gfortran, mpi-default-dev,
+ flex, bison, libxt-dev, libxext-dev, libxxf86vm-dev,
+ libxpm-dev,
+ libfltk1.3-dev | libfltk-dev, freeglut3-dev, ghostscript, imagemagick,
+ texlive, texlive-extra-utils, texlive-latex-extra, texlive-font-utils,
+ libfftw3-dev, libblas-dev, libgsl0-dev,
+ libhypre-dev,
+ libarpack2-dev, libsuitesparse-dev,
+ libmumps-ptscotch-dev, libmumps-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
+ libscotch-dev, libptscotch-dev, libmumps-scotch-dev,
+ libscotchmetis-dev, libscotchparmetis-dev,
+ libmumps-seq-dev, libnlopt-dev, coinor-libipopt-dev,
+ libgmm++-dev
+ # libtet1.4-dev,
+ # libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint,
+ # libparms2-dev, libitsol-dev,
+ # libhips-dev, libpastix-dev,
+ # libsuperlu-dist-dev
+ ## libsuperlu4-dev
++>>>>>>> experimental
Standards-Version: 3.9.3
Homepage: http://www.freefem.org/ff++/
Vcs-Git: git://git.debian.org/debian-science/packages/freefempp.git
diff --combined debian/patches/configure.patch.orig
index 0000000,8e60b71..a43e0d7
mode 000000,100644..100644
--- a/debian/patches/configure.patch.orig
+++ b/debian/patches/configure.patch.orig
@@@ -1,0 -1,95 +1,141 @@@
+ Index: freefem++-3.20/configure.ac
+ ===================================================================
+ --- freefem++-3.20.orig/configure.ac 2012-10-18 13:07:39.000000000 +0200
++<<<<<<< HEAD
+++++ freefem++-3.20/configure.ac 2013-01-20 19:06:33.072259323 +0100
++=======
+ +++ freefem++-3.20/configure.ac 2013-02-08 10:47:34.000000000 +0100
++>>>>>>> experimental
+ @@ -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
+
++<<<<<<< HEAD
++@@ -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"
++
++-
++=======
+ @@ -2076,29 +2080,42 @@
+ test -n "$ff_mkl_scalapack" && ff_scalapack="$ff_mkl_scalapack"
+ test -n "$ff_mkl_root" && ff_winc="$ff_mkl_root/include/mkl_blas.h"
+
++>>>>>>> experimental
+ +# 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)],
+ + [])
++<<<<<<< HEAD
+++
++ 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],[]],
++ ]
++ )
++
++=======
+
+ m4_map([AC_FF_WHERELIB],[
+ - [[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]],
+ + [[mumps_seq],[-ldmumps_seq -lzmumps_seq -lmumps_common_seq -lpord_seq],[/usr/include/dmumps_c.h],[]],
+ + [[mumps],[-ldmumps -lzmumps -lmumps_common -lpord],[/usr/include/dmumps_c.h],[]],
+ + [[mumps_ptscotch],[-lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch],[/usr/include/dmumps_c.h]],
+ + [[mumps_scotch],[-lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch],[/usr/include/dmumps_c.h]],
+ [[hypre],[-lHYPRE]],
+ [[fftw3],[-lfftw3],[/usr/include/fftw3.h],[]],
+ - [[superlu_dist],[-lsuperlu-dist],[superlu-dist/superlu_defs.h],[]],
+ - [[superlu],[-lsuperlu],[superlu/slu_ddefs.h],[]],
+ - [[Superlu4],[-lsuperlu4],[superlu4/slu_ddefs.h],[]],
+ + [[superlu_dist],[-lsuperlu-dist],[/usr/include/superlu-dist/superlu_defs.h],[]],
+ + [[superlu],[-lsuperlu],[/usr/include/superlu/slu_ddefs.h],[]],
+ + [[Superlu4],[-lsuperlu4],[/usr/include/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],[/usr/include/scotch/scotch.h],[]],
+ [[ptscotch],[-lptscotch -lptscotcherr],[]],
+ - [[metis],[-lscotch -lmetis],[metis/metis.h],[]],
+ - [[metis],[-lscotch -lmetis],[metis.h],[]],
+ + [[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
+ [[parmetis],[-lptscotch -lparmetis],[],[]],
+ - [[freeyams],[-lfreeyams],[freeyamslib.h],[]],
+ - [[mmg3d],[-lmmg3d],[libmmg3d.h],[]],
+ + [[freeyams],[-lfreeyams],[/usr/include/freeyamslib.h],[]],
+ + [[mmg3d_v4],[-lmmg3dlib4.0],[/usr/include/libmmg3d.h],[]],
+ [[mshmet],[-lmshmet],[],[]],
+ - [[gsl],[-lgsl -lgslcblas -lm],[gsl/gsl_sf.h],[]],
+ - [[parms],[-lparms -litsol -llapack -lblas -lm],[],[]],
+ - [[tetgen],[-ltet],[tetgen.h],[]],
+ + [[gsl],[-lgsl -lgslcblas -lm],[/usr/include/gsl/gsl_sf.h],[]],
+ + [[parms],[-lparms2 -litsol -llapack -lblas -lm -lmpi_f77],[/usr/include/libparms2/psparslib.h],[]],
+ + [[double_pastix],[-lpastix -lgfortran -lm -lrt -L/usr/lib -lscotch -lscotcherrexit -lpthread],[],[]],
+ + [[complex_pastix],[-lpastix -lgfortran -lm -lrt -L/usr/lib -lscotch -lscotcherrexit -lpthread],[],[]],
+ + [[tetgen],[-ltet],[/usr/include/tetgen.h],[]],
+ + [[hips],[-lhips],[/usr/include/hips/hips.h],[]],
+ + [[nlopt],[-lnlopt],[/usr/include/nlopt.h],[]],
+ + [[Ipopt],[-lipopt -ldmumps -lblas -lm -ldl],[/usr/include/coin/IpIpoptApplication.hpp],[]],
+ + [[gmm],[-lm],[/usr/include/gmm/gmm.h],[]],
+ ]
+ )
+
+ @@ -2197,3 +2214,8 @@
+ AC_MSG_NOTICE([ *********************************************** ])
+ fi
+
+ +AC_MSG_NOTICE([Compilation options: ])
+ +AC_MSG_NOTICE([CPPFLAGS=$CPPFLAGS])
+ +AC_MSG_NOTICE([CFLAGS=$CFLAGS])
+ +AC_MSG_NOTICE([CXXFLAGS=$CXXFLAGS])
+ +AC_MSG_NOTICE([LDFLAGS=$LDFLAGS])
++>>>>>>> experimental
diff --combined debian/rules.orig
index 220e86f,c23e987..59d932e
--- a/debian/rules.orig
+++ b/debian/rules.orig
@@@ -10,12 -10,20 +10,26 @@@
export DH_VERBOSE=1
export DH_OPTIONS=-v
++<<<<<<< HEAD
++=======
+ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
++>>>>>>> experimental
%:
dh $@ --with autoreconf
export OMPI_MCA_plm_rsh_agent=/bin/false #workaround to start MPI-applications in chroot
++<<<<<<< HEAD
++=======
+
+ # to avoid lintian warnings
+ CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+ CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+ CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
++>>>>>>> experimental
override_dh_auto_clean:
dh_auto_clean
@@@ -43,6 -51,11 +57,11 @@@
rm -f examples++-load/freefem++.pref examples++-mpi/freefem++.pref
rm -f examples++-mpi/MPICG.o examples++-mpi/MPICG.so
rm -f src/mpi/config.log src/mpi/ff-mpirun src/medit/compil.date
+ #
+ # To rebuild
+ find . -name \*.o | xargs --no-run-if-empty rm
+ find . -name \*.so | xargs --no-run-if-empty rm
+
override_dh_autoreconf_clean:
dh_autoreconf_clean
@@@ -52,14 -65,28 +71,47 @@@ override_dh_autoreconf
dh_quilt_patch
dh_autoreconf --as-needed
++<<<<<<< HEAD
++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
+
+override_dh_auto_install:
+ mv debian/freefem++/usr/bin/bamg debian/freefem++/usr/bin/ffbamg
+ dh_auto_install
++=======
+ override_dh_auto_configure:
+ dh_auto_configure -- \
+ CPPFLAGS=$(CPPFLAGS) \
+ CFLAGS="$(CFLAGS) -lm" \
+ CXXFLAGS="$(CXXFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" \
+ CXX=mpic++
+ cp -f examples++-load/WHERE_LIBRARY-config debian
+ dh_auto_build
+
+ override_dh_auto_install:
+ dh_auto_install
+ mv debian/tmp/usr/bin/bamg debian/tmp/usr/bin/ffbamg
+ #
+ # Install modified script to create plugins
+ cp examples++-load/WHERE_LIBRARY-config examples++-load/WHERE_LIBRARY
+ cp -f debian/ff-c++ debian/tmp/usr/bin
+ cp -f debian/ff-get-dep debian/tmp/usr/bin
+ #
+ # Fix lintian warnings
+ chmod ugo-x debian/tmp/usr/lib/ff++/3.*/idp/*.idp
+
++>>>>>>> experimental
override_dh_auto_test:
echo "do not run tests"
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list