r46806 - in /packages/ffcs/trunk/debian: control patches/examples++-load.patch patches/examples++-mpi.patch patches/ff-configure.patch patches/series

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Fri Jul 11 13:57:32 UTC 2014 

Author: trophime-guest
Date: Fri Jul 11 13:57:32 2014
New Revision: 46806

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46806
Log:
update patches for 14.5 and later

Added:
    packages/ffcs/trunk/debian/patches/examples++-load.patch
    packages/ffcs/trunk/debian/patches/examples++-mpi.patch
Modified:
    packages/ffcs/trunk/debian/control
    packages/ffcs/trunk/debian/patches/ff-configure.patch
    packages/ffcs/trunk/debian/patches/series

Modified: packages/ffcs/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/control?rev=46806&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/control	(original)
+++ packages/ffcs/trunk/debian/control	Fri Jul 11 13:57:32 2014
@@ -37,10 +37,11 @@
  libnlopt-dev, coinor-libipopt-dev,
  libtet1.5-dev,
  libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint,
- libparms2-dev, libhips-dev, libpastix-dev
+ libparms2-dev, libhips-dev, libpastix-dev,
+ libmetis-dev, libparmetis-dev
 # libmysqlclient-dev (>= 5.1.56),
 # hardening-includes,hardening-wrapper
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://www.ljll.math.upmc.fr/lehyaric/ffcs/index.htm
 #Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/ffcs
 #Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/ffcs

Added: packages/ffcs/trunk/debian/patches/examples++-load.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/examples%2B%2B-load.patch?rev=46806&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/examples++-load.patch	(added)
+++ packages/ffcs/trunk/debian/patches/examples++-load.patch	Fri Jul 11 13:57:32 2014
@@ -0,0 +1,52 @@
+Index: ffcs-14.5/ff/upstream/examples++-load/ilut.cpp
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/examples++-load/ilut.cpp
++++ ffcs-14.5/ff/upstream/examples++-load/ilut.cpp
+@@ -16,7 +16,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
+-//ff-c++-LIBRARY-dep:   gmm
++//ff-c++-LIBRARY-dep:
+ //ff-c++-cpp-dep: 
+ 
+ #include <cmath>
+Index: ffcs-14.5/ff/upstream/examples++-load/MUMPS_seq.cpp
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/examples++-load/MUMPS_seq.cpp
++++ ffcs-14.5/ff/upstream/examples++-load/MUMPS_seq.cpp
+@@ -25,7 +25,7 @@
+  */
+ 
+ //   for automatic  compilation with ff-c++
+-//ff-c++-LIBRARY-dep:  mumps-seq blas  libseq  fc  pthread
++//ff-c++-LIBRARY-dep:  mumps_seq blas  fc  pthread
+ //ff-c++-cpp-dep: 
+ //
+ // F. Hecht  december 2011
+Index: ffcs-14.5/ff/upstream/examples++-load/ff-Ipopt.cpp
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/examples++-load/ff-Ipopt.cpp
++++ ffcs-14.5/ff/upstream/examples++-load/ff-Ipopt.cpp
+@@ -23,7 +23,7 @@
+  along with Freefem++; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+-//ff-c++-LIBRARY-dep:  Ipopt mumps-seq blas  libseq  fc  
++//ff-c++-LIBRARY-dep:  Ipopt mumps_seq blas  fc  
+ 
+ //using namespace std;
+ #include "IpTNLP.hpp"
+Index: ffcs-14.5/ff/upstream/examples++-load/mmg3d-v4.0.cpp
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/examples++-load/mmg3d-v4.0.cpp
++++ ffcs-14.5/ff/upstream/examples++-load/mmg3d-v4.0.cpp
+@@ -10,7 +10,7 @@
+ 
+ //
+ //   for automatic  compilation with ff-c++
+-//ff-c++-LIBRARY-dep:   mmg3d-v4
++//ff-c++-LIBRARY-dep:   mmg3d_v4
+ //ff-c++-cpp-dep: 
+ //  
+ 

Added: packages/ffcs/trunk/debian/patches/examples++-mpi.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/examples%2B%2B-mpi.patch?rev=46806&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/examples++-mpi.patch	(added)
+++ packages/ffcs/trunk/debian/patches/examples++-mpi.patch	Fri Jul 11 13:57:32 2014
@@ -0,0 +1,13 @@
+Index: ffcs-14.5/ff/upstream/examples++-mpi/Makefile.am
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/examples++-mpi/Makefile.am
++++ ffcs-14.5/ff/upstream/examples++-mpi/Makefile.am
+@@ -39,8 +39,6 @@ AddLayer3d.idp		DDM-funcs-v2.idp	MPIplot
+ EXTRA_DIST=*.edp *.idp  regtests.sh  \
+ MPICG.cpp \
+ MUMPS_FreeFem.cpp \
+-complex_SuperLU_DIST_FreeFem.cpp \
+-complex_pastix_FreeFem.cpp \
+ dSuperLU_DIST.cpp \
+ ffsuperludistoption-1.hpp \
+ ffsuperludistoption.hpp \

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=46806&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-configure.patch	(original)
+++ packages/ffcs/trunk/debian/patches/ff-configure.patch	Fri Jul 11 13:57:32 2014
@@ -20,7 +20,7 @@
      then
  	ff_HOSTARCH_pastix=i686_pc_linux
      fi
-@@ -1653,28 +1653,37 @@ m4_define([TOOL_DISABLE],
+@@ -1653,28 +1653,38 @@ m4_define([TOOL_DISABLE],
  ])
  ##  try to see pakage is hon computer  if the FH ZZZZ 
  
@@ -30,36 +30,40 @@
 +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_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]],
 -	[[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],[]],
+-	[[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],[]],
++	[[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],[fftw3.h],[]],
++	[[superlu_dist],[-lsuperlu-dist],[superlu-dist/superlu_defs.h],[]],
++	[[superlu],[-lsuperlu],[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.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],[],[]],
+-	[[parmetis],[-lptscotch -lparmetis],[],[]],
++        [[scotch],[-lscotch -lscotcherr],[scotch/scotch.h]],
++        [[ptscotch],[-lptscotch -lptscotcherr],[scotch/ptscotch.h]],
++	[[metis],[-lmetis],[metis.h],[]],
++	[[parmetis],[-lptscotch -lparmetis],[parmetis.h],[]],
  	[[freeyams],[-lfreeyams],[freeyamslib.h],[]],
 -	[[mmg3d],[-lmmg3d],[libmmg3d.h],[]],
 +	[[mmg3d],[-lmmg3dlib4.0],[libmmg3d.h],[]],
-+	[[mmg3dv4],[-lmmg3dlib4.0],[libmmg3d.h],[]],
++	[[mmg3d_v4],[-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],[],[]],
++	[[parms],[-lmpif77 -lparms2 -litsol -llapack -lblas -lm],[],[]],
++	[[double_pastix],[-lpastix],[pastix/pastix.h],[]],
  	[[tetgen],[-ltet],[tetgen.h],[]],
 +	[[hips],[-lhips],[hips/hips.h],[]],
 +	[[nlopt],[-lnlopt],[nlopt.h],[]],
@@ -68,7 +72,7 @@
      ]
      )
  ## before try 
-@@ -1767,7 +1776,6 @@ ff_progs="FreeFem++-nw $ff_bamgprog  $ff
+@@ -1767,7 +1777,6 @@ ff_progs="FreeFem++-nw $ff_bamgprog  $ff
  AC_SUBST(TEST_FFPP,"../src/nw/FreeFem++")
  AC_SUBST(TEST_FFPPMPI,"../src/mpi/ff-mpirun")
  

Modified: packages/ffcs/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/series?rev=46806&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/series	(original)
+++ packages/ffcs/trunk/debian/patches/series	Fri Jul 11 13:57:32 2014
@@ -11,5 +11,5 @@
 ###ff-examples-load-WHERE-LIBRARY.patch
 #
 ffcs-dev.patch
-#ff-examples++-mpi.patch
 examples++-load.patch
+examples++-mpi.patch

More information about the debian-science-commits mailing list