r46805 - in /packages/ffcs/trunk/debian: ./ patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Jul 11 13:16:03 UTC 2014
Author: trophime-guest
Date: Fri Jul 11 13:16:03 2014
New Revision: 46805
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46805
Log:
update patches
Modified:
packages/ffcs/trunk/debian/compat
packages/ffcs/trunk/debian/control
packages/ffcs/trunk/debian/patches/configure.patch
packages/ffcs/trunk/debian/patches/ff-configure.patch
packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch
packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch
packages/ffcs/trunk/debian/patches/ffcs-dev.patch
packages/ffcs/trunk/debian/patches/install.patch
packages/ffcs/trunk/debian/patches/series
packages/ffcs/trunk/debian/rules
Modified: packages/ffcs/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/compat?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/compat (original)
+++ packages/ffcs/trunk/debian/compat Fri Jul 11 13:16:03 2014
@@ -1 +1 @@
-7
+9
Modified: packages/ffcs/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/control?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/control (original)
+++ packages/ffcs/trunk/debian/control Fri Jul 11 13:16:03 2014
@@ -3,21 +3,39 @@
Priority: extra
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Build-Depends: debhelper (>= 7.2.3~), autotools-dev, gawk, gfortran,
- quilt, cdbs, autoconf, automake,
- 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-dev, libmumps-ptscotch-dev, libgmm++-dev,
- libmumps-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
- libscotch-dev, ghostscript, libptscotch-dev, libmumps-scotch-dev,
- libxext-dev, libxpm-dev, libxt-dev, libvtk5-dev (>= 5.6),
+Build-Depends:
+ debhelper (>= 9),
+ autotools-dev,
+ autoconf,
+ automake,
+ gawk,
+ gfortran,
+ mpi-default-dev,
+ cdbs,
+ flex,
+ bison,
+ libhypre-dev,
+ libfftw3-mpi-dev,
+ libblas-dev,
+ libgsl0-dev,
+ libarpack2-dev,
+ libsuitesparse-dev,
+ libsuperlu-dev,
+ imagemagick,
+ libfltk1.3-dev | libfltk-dev,
+ freeglut3-dev,
+ texlive, texlive-extra-utils, texlive-latex-extra, texlive-font-utils, ghostscript,
+ libmumps-dev, libmumps-scotch-dev, libmumps-ptscotch-dev,
+ libgmm++-dev,
+ libblacs-mpi-dev, libscalapack-mpi-dev,
+ libscotch-dev, libptscotch-dev,
+ libxext-dev, libxpm-dev, libxt-dev, libxxf86vm-dev,
+ libvtk5-dev (>= 5.6),
libtiff4-dev, libjpeg-dev, zlib1g-dev, libpng12-dev,
fluid, libfltk1.3-dev,
rsync,
libnlopt-dev, coinor-libipopt-dev,
- libtet1.4-dev,
+ libtet1.5-dev,
libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint,
libparms2-dev, libhips-dev, libpastix-dev
# libmysqlclient-dev (>= 5.1.56),
Modified: packages/ffcs/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/configure.patch?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/configure.patch (original)
+++ packages/ffcs/trunk/debian/patches/configure.patch Fri Jul 11 13:16:03 2014
@@ -1,8 +1,8 @@
-Index: ffcs-12.17/ff/Makefile.am
+Index: ffcs-14.5/ff/Makefile.am
===================================================================
---- ffcs-12.17.orig/ff/Makefile.am 2012-12-14 10:55:02.000000000 +0100
-+++ ffcs-12.17/ff/Makefile.am 2012-12-14 10:55:12.000000000 +0100
-@@ -100,7 +100,7 @@
+--- ffcs-14.5.orig/ff/Makefile.am
++++ ffcs-14.5/ff/Makefile.am
+@@ -98,7 +98,7 @@ compile:upstream/config.status
tags:TAGS
TAGS:upstream/config.status
etags --etags-include=upstream/TAGS *.?pp || etags -i upstream/TAGS *.?pp
@@ -11,3 +11,4 @@
clean-local::
-rm TAGS
+
Modified: packages/ffcs/trunk/debian/patches/ff-configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-configure.patch?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-configure.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-configure.patch Fri Jul 11 13:16:03 2014
@@ -1,31 +1,65 @@
-Index: ffcs-12.17/ff/upstream/configure.ac
+Index: ffcs-14.5/ff/upstream/configure.ac
===================================================================
---- ffcs-12.17.orig/ff/upstream/configure.ac 2012-12-14 15:02:32.000000000 +0100
-+++ ffcs-12.17/ff/upstream/configure.ac 2012-12-14 15:59:14.000000000 +0100
-@@ -1901,6 +1901,7 @@
+--- ffcs-14.5.orig/ff/upstream/configure.ac
++++ ffcs-14.5/ff/upstream/configure.ac
+@@ -65,7 +65,7 @@ m4_define([AC_FF_WHERELIB],
+ echo "$1 LD $2" >>$ff_where_lib_conf
+ ff_WHERE_INC=`AS_DIRNAME(["$3"])`
+ case "$ff_WHERE_INC" in
+- /*)e cho "$1 INCLUDE -I$ff_WHERE_INC" >>$ff_where_lib_conf ;;
++ /*)echo "$1 INCLUDE -I$ff_WHERE_INC" >>$ff_where_lib_conf ;;
+ esac
+ fi
+ AC_MSG_RESULT($ff_WHERE)
+@@ -703,7 +703,7 @@ else
+ # noticed that if PASTIX_HOSTARCH stays blank, pastix compilation breaks. At least i686_pc_linux and i686_mac are
+ # required by pastix on the corresponding platforms.
+- if test"$ff_HOSTARCH_pastix" = ""
++ if test "$ff_HOSTARCH_pastix" = ""
+ then
+ ff_HOSTARCH_pastix=i686_pc_linux
+ fi
+@@ -1653,28 +1653,37 @@ m4_define([TOOL_DISABLE],
+ ])
+ ## try to see pakage is hon computer if the FH ZZZZ
- m4_map([AC_FF_WHERELIB],[
++ff_with_mpi=-openmpi
++
++# To get Ipopt compiled properly
++AC_SUBST(CXXFLAGS, "$CXXFLAGS -DHAVE_CSTDDEF")
++
+ 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]],
-@@ -1911,17 +1912,21 @@
- [[Superlu4],[-lsuperlu4],[superlu4/slu_ddefs.h],[]],
- [[blacs],[ -lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi],[]],
+- [[hypre],[-lHYPRE]],
++ [[hypre],[-lHYPRE_utilities -lHYPRE_multivector -lHYPRE_krylov -lHYPRE_struct_mv -lHYPRE_struct_ls -lHYPRE_sstruct_mv -lHYPRE_sstruct_ls -lHYPRE_seq_mv -lHYPRE_parcsr_mv -lHYPRE_parcsr_ls -lHYPRE_parcsr_block_mv -lHYPRE_DistributedMatrix -lHYPRE_MatrixMatrix -lHYPRE_IJ_mv -lHYPRE_Euclid -lHYPRE_ParaSails -lHYPRE_DistributedMatrixPilutSolver -lHYPRE]],
+ [[fftw3],[-lfftw3],[/usr/include/fftw3.h],[]],
+ [[superlu_dist],[-lsuperlu-dist],[/usr/include/superlu-dist/superlu_defs.h],[]],
+- [[superlu],[-lsuperlu],[/usr/include/superlu/superlu_enum_consts.h],[]],
+- [[Superlu4],[-lsuperlu4],[/usr/include/superlu4/superlu_enum_consts.h],[]],
+- [[blacs],[ -lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi],[]],
++ [[superlu],[-lsuperlu],[/usr/include/superlu/superlu_enum_consts.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],[]],
+- [[scotch],[-lscotch -lscotcherr],[scotch.h]],
+- [[ptscotch],[-lptscotch -lptscotcherr],[ptscotch.h]],
+- [[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
+- [[metis],[-lscotch -lmetis],[metis.h],[]],
++ [[scotch],[-lscotch -lscotcherr],[/usr/include/scotch/scotch.h]],
++ [[ptscotch],[-lptscotch -lptscotcherr],[/usr/include/scotch/ptscotch.h]],
++ [[metis],[-lmetis],[/usr/include/metis.h],[]],
[[parmetis],[-lptscotch -lparmetis],[],[]],
[[freeyams],[-lfreeyams],[freeyamslib.h],[]],
- [[mmg3d],[-lmmg3d],[libmmg3d.h],[]],
-+ [[mmg3d-v4],[-lmmg3dlib4.0],[libmmg3d.h],[]],
++ [[mmg3d],[-lmmg3dlib4.0],[libmmg3d.h],[]],
++ [[mmg3dv4],[-lmmg3dlib4.0],[libmmg3d.h],[]],
[[mshmet],[-lmshmet],[],[]],
[[gsl],[-lgsl -lgslcblas -lm],[gsl/gsl_sf.h],[]],
- [[parms],[-lparms -litsol -llapack -lblas -lm],[],[]],
+- [[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],[]],
@@ -33,12 +67,20 @@
+ [[gmm],[],[gmm/gmm.h],[]],
]
)
+ ## before try
+@@ -1767,7 +1776,6 @@ ff_progs="FreeFem++-nw $ff_bamgprog $ff
+ AC_SUBST(TEST_FFPP,"../src/nw/FreeFem++")
+ AC_SUBST(TEST_FFPPMPI,"../src/mpi/ff-mpirun")
-Index: ffcs-12.17/ff/upstream/examples++-mpi/hips_FreeFem.cpp
+-ff_with_mpi=-openmpi;
+
+ ff_blacs="-lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi"
+ ff_scalapack=-lscalapack
+Index: ffcs-14.5/ff/upstream/examples++-mpi/hips_FreeFem.cpp
===================================================================
---- ffcs-12.17.orig/ff/upstream/examples++-mpi/hips_FreeFem.cpp 2012-12-14 15:02:32.000000000 +0100
-+++ ffcs-12.17/ff/upstream/examples++-mpi/hips_FreeFem.cpp 2012-12-14 15:02:37.000000000 +0100
-@@ -45,8 +45,8 @@
+--- ffcs-14.5.orig/ff/upstream/examples++-mpi/hips_FreeFem.cpp
++++ ffcs-14.5/ff/upstream/examples++-mpi/hips_FreeFem.cpp
+@@ -45,8 +45,8 @@ using namespace std;
#endif
extern "C" {
Modified: packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-examples%2B%2B-load-Makefile.patch?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch Fri Jul 11 13:16:03 2014
@@ -3,12 +3,12 @@
===================================================================
--- ffcs-12.17.orig/ff/upstream/examples++-load/Makefile.am 2012-12-14 15:02:32.000000000 +0100
+++ ffcs-12.17/ff/upstream/examples++-load/Makefile.am 2012-12-14 16:03:26.000000000 +0100
-@@ -94,7 +94,7 @@
- load_compile:
- $(MAKE) $(AM_MAKEFLAGS) ff-c++
- $(MAKE) $(AM_MAKEFLAGS) WHERE_LIBRARY-download include.done
-- $(MAKE) $(AM_MAKEFLAGS) $(LIST_COMPILE) $(LIST_COMPILE_PKG)
-+ $(MAKE) -i $(AM_MAKEFLAGS) $(LIST_COMPILE) $(LIST_COMPILE_PKG)
+@@ -85,7 +85,7 @@
+ #
+ # max_load
+ -rm "Missing-plugins-$(DYLIB_SUFFIX).log" 2>/dev/null
+- $(MAKE) $(AM_MAKEFLAGS) $(LIST_COMPILE) $(LIST_COMPILE_PKG)
++ $(MAKE) -i $(AM_MAKEFLAGS) $(LIST_COMPILE) $(LIST_COMPILE_PKG)
+ @if test -f Missing-plugins-$(DYLIB_SUFFIX).log ; then cat Missing-plugins-$(DYLIB_SUFFIX).log; fi; exit 0
+ @echo Warning missing plugin: `for i in $(LIST_COMPILE) $(LIST_COMPILE_PKG); do if test ! -s $i ; then j=1; echo "$i," ;fi; done`
echo " finish build list $(DYLIB_SUFFIX)"
-
-
Modified: packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-examples%2B%2B-load-load-link-in.patch?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch Fri Jul 11 13:16:03 2014
@@ -3,10 +3,10 @@
===================================================================
--- ffcs-12.17.orig/ff/upstream/examples++-load/load.link.in 2012-12-14 10:55:02.000000000 +0100
+++ ffcs-12.17/ff/upstream/examples++-load/load.link.in 2012-12-14 10:55:23.000000000 +0100
-@@ -206,7 +206,7 @@
- FLAGS=' '
+@@ -216,7 +216,7 @@
LIBS="'$b/libff.dll' $LIBS $DLL"
- SUF=dll;;
+ # SUF=dll
+ ;;
- FreeBSD|NetBSD)
+ FreeBSD|NetBSD|GNU/kFreeBSD)
SHARED="-shared"
Modified: packages/ffcs/trunk/debian/patches/ffcs-dev.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ffcs-dev.patch?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ffcs-dev.patch (original)
+++ packages/ffcs/trunk/debian/patches/ffcs-dev.patch Fri Jul 11 13:16:03 2014
@@ -1,51 +1,46 @@
-Index: ffcs-12.17/ff/upstream/examples++-load/Makefile.am
+Index: ffcs-14.5/ff/upstream/examples++-load/Makefile.am
===================================================================
---- ffcs-12.17.orig/ff/upstream/examples++-load/Makefile.am 2012-12-14 16:06:05.000000000 +0100
-+++ ffcs-12.17/ff/upstream/examples++-load/Makefile.am 2012-12-14 16:15:25.000000000 +0100
-@@ -6,7 +6,7 @@
- EXEEXT=$(EXEEXT) X11PROG=$(X11PROG) GLXPROG=$(GLXPROG) \
- AGLPROG=$(AGLPROG) MPIPROG=$(MPIPROG) IDEPROG="$(IDEPROG)" \
- VISUALCHECK=$(VISUALCHECK)
--EXTRA_DIST=ff-get-dep.in ff-pkg-download.in load.link.in include.tar.gz \
-+EXTRA_DIST=ffcs-get-dep.in ff-get-dep.in ff-pkg-download.in load.link.in include.tar.gz \
+--- ffcs-14.5.orig/ff/upstream/examples++-load/Makefile.am
++++ ffcs-14.5/ff/upstream/examples++-load/Makefile.am
+@@ -7,7 +7,7 @@ LOG_DRIVER=$(SHELL) $(top_srcdir)/test-d
+ TESTS_ENVIRONMENT=TEST_FFPP=$(TEST_FFPP) FLAGS_FFPP=-nw
+
+ EXTRA_DIST= $(TESTS) all.edp makeref.edp regtests.edp \
+-ff-get-dep.in ff-pkg-download.in load.link.in include.tar.gz \
++ffcs-get-dep.in ff-get-dep.in ff-pkg-download.in load.link.in include.tar.gz \
BernadiRaugel.cpp Morley.cpp dfft.cpp \
funcTemplate.cpp mat_dervieux.cpp mat_psi.cpp myfunction.cpp \
- mat_dervieux.cpp convect_dervieux.edp funcTemplate.cpp \
-@@ -158,12 +158,15 @@
- $(LIST_COMPILE):ff-c++ include.done Makefile
-
- clean-local:
-- -rm *.o load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
-+ -rm *.o load.link WHERE_LIBRARY-download ffcs-get-dep ff-get-dep ff-c++ ff-pkg-download \
- $(LIST_COMPILE) $(LIST_COMPILE_PKG) regtests.edp makeref.edp
- -rm -rf include include.done
- ff-c++:load.link.in Makefile load.link WHERE_LIBRARY-download ff-get-dep
+ mat_dervieux.cpp funcTemplate.cpp \
+@@ -175,6 +175,9 @@ clean-local::
+ ff-c++:load.link.in load.link WHERE_LIBRARY-download ff-get-dep ../config.status
../config.status --file=ff-c++:load.link.in
chmod a+x ff-c++
-+ffcs-c++:load.link.in Makefile load.link WHERE_LIBRARY-download ffcs-get-dep
++ffcs-c++:load.link.in load.link WHERE_LIBRARY-download ffcs-get-dep ../config.status
+ ../config.status --file=ffcs-c++:load.link.in
-+ chmod a+x ffcs-c++
- load.link:load.link.in Makefile
++ chmod a+x ff-c++
+ load.link:load.link.in ../config.status
../config.status --file=load.link:load.link.in
chmod a+x load.link
-@@ -175,9 +178,12 @@
- ../config.status --file=$@:$@.in
- chmod a+x $@
- -if [ -d ../download/bin ] ;then cp $@ ../download/bin; fi
-+ffcs-get-dep:ffcs-get-dep.in Makefile
+@@ -191,6 +194,15 @@ WHERE_LIBRARY-download:ff-pkg-download F
+ @diff $@-new $@ || (cp $@-new $@ ;touch WHERE_LIBRARY)
+ WHERE_LIBRARY:
+ touch $@
++ffcs-get-dep:ffcs-get-dep.in ../config.status
+ ../config.status --file=$@:$@.in
+ chmod a+x $@
- WHERE_LIBRARY-download:ff-pkg-download FORCE WHERE_LIBRARY-config WHERE_LIBRARY
- @./ff-pkg-download >$@-new
-- @diff $@-new $@ || (cp $@-new $@ ;touch WHERE_LIBRARY)
++ -if [ -d ../download/bin ] ;then cp $@ ../download/bin; fi
++WHERE_LIBRARY-download:ff-pkg-download FORCE WHERE_LIBRARY-config WHERE_LIBRARY
++ @./ff-pkg-download >$@-new
+ @diff $@-new $@ || (cp $@-new $@ ;cat WHERE_LIBRARY-config >> $@; cp $@ WHERE_LIBRARY)
- WHERE_LIBRARY:
- touch $@
++WHERE_LIBRARY:
++ touch $@
FORCE: ;
-Index: ffcs-12.17/ff/upstream/examples++-load/ffcs-get-dep.in
+ freefem++.pref:
+ echo loadpath = \"./\" >freefem++.pref
+Index: ffcs-14.5/ff/upstream/examples++-load/ffcs-get-dep.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffcs-12.17/ff/upstream/examples++-load/ffcs-get-dep.in 2012-12-14 16:06:05.000000000 +0100
+--- /dev/null
++++ ffcs-14.5/ff/upstream/examples++-load/ffcs-get-dep.in
@@ -0,0 +1,61 @@
+#!/bin/sh
+# ffcs-c++ `./ffcs-get-dep -ff metis.cpp`
Modified: packages/ffcs/trunk/debian/patches/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/install.patch?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/install.patch (original)
+++ packages/ffcs/trunk/debian/patches/install.patch Fri Jul 11 13:16:03 2014
@@ -1,8 +1,8 @@
-Index: ffcs-12.17/pack/install.m4
+Index: ffcs-14.5/pack/install.m4
===================================================================
---- ffcs-12.17.orig/pack/install.m4 2012-12-14 10:55:02.000000000 +0100
-+++ ffcs-12.17/pack/install.m4 2012-12-14 10:55:06.000000000 +0100
-@@ -105,30 +105,30 @@
+--- ffcs-14.5.orig/pack/install.m4
++++ ffcs-14.5/pack/install.m4
+@@ -118,30 +118,30 @@ function writedesktopfile () {
# find script (which may be at a different location and with a different name in Linux and Mac setups)
ffcliscript="$prefix/FINALDIR"/FreeFem++-cli
@@ -45,7 +45,7 @@
# this will default to use system menus when user is root, and user menus when user is not root
if test -x /usr/bin/xdg-desktop-menu
-@@ -144,7 +144,7 @@
+@@ -157,7 +157,7 @@ echo rm -rf "'$prefix/FINALDIR'" >> "$un
echo echo Uninstall OK >> "$uninstall"
chmod a+x "$uninstall"
@@ -54,34 +54,36 @@
# Local Variables:
# mode:shell-script
-Index: ffcs-12.17/pack/Makefile.am
+Index: ffcs-14.5/pack/Makefile.am
===================================================================
---- ffcs-12.17.orig/pack/Makefile.am 2012-12-14 10:55:02.000000000 +0100
-+++ ffcs-12.17/pack/Makefile.am 2012-12-14 10:55:06.000000000 +0100
-@@ -437,7 +437,7 @@
+--- ffcs-14.5.orig/pack/Makefile.am
++++ ffcs-14.5/pack/Makefile.am
+@@ -419,7 +419,7 @@ work/Contents/Resources/cs-logo-128-4.pn
endif
examples:examples-main examples-tutorial examples-3d examples-eigen examples-mpi examples-chapt3 examples-other \
-- examples-load examples-ffcs
-+ examples-load examples-bamg examples-ffcs
+- examples-load examples-ffcs examples-contrib
++ examples-load examples-ffcs examples-contrib examples-bamg
# separate goal for examples-dir to avoid parallel processes that put the cart before the horses
- work_Contents_Resources_examples.done:work_Contents_Resources.done
-@@ -457,6 +457,8 @@
- rsync ${rsyncparm} ../ff/upstream/examples++-3d/ work/Contents/Resources/examples/3d
- examples-eigen:work_Contents_Resources_examples.done
- rsync ${rsyncparm} ../ff/upstream/examples++-eigen/ work/Contents/Resources/examples/eigen
-+examples-bamg:work_Contents_Resources_examples.done
-+ rsync ${rsyncparm} ../ff/upstream/examples++-bamg/ work/Contents/Resources/examples/bamg
+ work/Contents/Resources/examples/.dirok:work/Contents/Resources/.dirok
+@@ -466,6 +466,10 @@ examples-contrib:work/Contents/Resources
+ rsync ${rsyncparm} ../contrib/*.edp --exclude ../contrib/*-ffcsref.edp \
+ work/Contents/Resources/examples/contrib
- # we remove all dlls from examples++-mpi (they are already in lib/).
- examples-mpi:work_Contents_Resources_examples.done
-@@ -605,7 +607,7 @@
++examples-bamg:work/Contents/Resources/examples/.dirok
++ rsync ${rsyncparm} ../ff/upstream/examples++-bamg/ \
++ work/Contents/Resources/examples/bamg
++
+ ref:work/Contents/Resources/.dirok
+ rsync ${rsyncparm} ../ff/ref/ work/Contents/Resources/ref
+
+@@ -582,7 +586,7 @@ ffcs-src.tgz:
# credentials, and we want to run tests unattended.
install-exec-local:filetree
- cd work && ./install_as_root ${prefix} ${bindir}
+ cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
- # Source package check
- # --------------------
+ clean-local::
+ -rm *.done
Modified: packages/ffcs/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/series?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/series (original)
+++ packages/ffcs/trunk/debian/patches/series Fri Jul 11 13:16:03 2014
@@ -11,5 +11,5 @@
###ff-examples-load-WHERE-LIBRARY.patch
#
ffcs-dev.patch
-ff-gcc4.6.patch
#ff-examples++-mpi.patch
+examples++-load.patch
Modified: packages/ffcs/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/rules?rev=46805&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/rules (original)
+++ packages/ffcs/trunk/debian/rules Fri Jul 11 13:16:03 2014
@@ -14,27 +14,33 @@
# Add here any variable or target overrides you need.
DEB_CONFIGURE_EXTRA_FLAGS := \
- --enable-debian \
- --with-parallel-build=$(NUMJOBS) \
- --with-freefem-options="--enable-optim --enable-generic --disable-pdf --disable-download --with-mpi=yes --program-transform-name=\"s/^FreeFem++/freefem++/\" "
-
+ --enable-reuse="yes" \
+ --with-vtk-major="5.8" \
+ --with-vtk-includedir="/usr/include/vtk-5.8" \
+ --with-vtk-libdir="/usr/lib" \
+ --with-freefem-options="--enable-optim --enable-generic --disable-pdf --disable-download --with-mpi=yes --program-transform-name=\"s/^FreeFem++/freefem++/\" " \
+ CXX=mpic++
#include /usr/share/hardening-includes/hardening.make
-#CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-#CXFLAGS=$(shell dpkg-buildflags --get CXFLAGS)
-#LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-#CFLAGS+=$(HARDENING_CFLAGS)
-#CXXFLAGS+=$(HARDENING_CFLAGS)
-#LDFLAGS+=$(HARDENING_LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+CXFLAGS=$(shell dpkg-buildflags --get CXFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+CXXFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS)
+
+CXXFLAGS+=-DHAVE_CSTDDEF
update-config::
rm -f configure
aclocal --force
autoconf --force
+ autoheader
automake --add-missing --gnu --force
cd ff/upstream && aclocal --force
cd ff/upstream && autoconf --force
+ cd ff/upstream && autoheader
cd ff/upstream && automake --add-missing --gnu --force
install/ffcs-dev::
@@ -98,7 +104,10 @@
clean::
-rm -rf autom4te.cache INSTALL missing install-sh compile depcomp
-rm -rf aclocal.m4 configure
-
+ -rm -rf config.h.in
+ -rm -rf config.guess test-driver config.sub
+ -rm -rf Makefile
+
-rm -rf fltk/upstream/config.h
-rm -rf fltk/upstream/fltk-config
-rm -rf fltk/upstream/makeinclude
@@ -106,17 +115,24 @@
-rm -rf fltk/upstream/fltk.list
-rm -rf fltk/upstream/FL/Makefile
+ -rm -rf ff/upstream/mkinstalldirs
+ -rm -rf ff/upstream/compile
+ -rm -rf ff/upstream/missing
+ -rm -rf ff/upstream/INSTALL
+ -rm -rf ff/upstream/install-sh
+ -rm -rf ff/upstream/test-driver
+ -rm -rf ff/upstream/depcomp
+ -rm -rf ff/upstream/config.h.in
+ -rm -rf ff/upstream/aclocal.m4
+ -rm -rf ff/upstream/configure
+ -rm -rf ff/autoreconf.done
+
+ -rm -rf vtk/libs.mak
+
-find . -name config.log | xargs -r rm
-find . -name config.status | xargs -r rm
-
- -rm ff/upstream/Makefile ff/upstream/Makefile.in
- -rm ff/upstream/DOC/Makefile ff/upstream/DOC/Makefile.in
- -rm ff/upstream/examples++-*/Makefile ff/upstream/examples++-*/Makefile.in
- -rm ff/upstream/src/Makefile ff/upstream/src/Makefile.in
- -rm ff/upstream/download/Makefile ff/upstream/download/Makefile.in
- -rm ff/upstream/download/arpack/Makefile ff/upstream/download/arpack/Makefile.in
- -rm ff/upstream/download/blas/Makefile ff/upstream/download/blas/Makefile.in
- -rm ff/upstream/download/metis/Makefile.in
- -rm ff/upstream/download/umfpack/Makefile ff/upstream/download/umpfpack/Makefile.in
+ -find . -name Makefile.in | xargs -r rm
+ -find . -name \*.tar.gz | xargs -r rm
+ -find . -name .dirstamp | xargs -r rm
More information about the debian-science-commits
mailing list