r44028 - in /packages/ffcs/trunk/debian: ./ patches/ patches/old/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Mon Nov 14 09:50:22 UTC 2011
Author: trophime-guest
Date: Mon Nov 14 09:50:22 2011
New Revision: 44028
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44028
Log:
update to 11.11 (based on ff 3.14)
Added:
packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch
packages/ffcs/trunk/debian/patches/ff-examples-bamg-test-dotest-pl.patch
packages/ffcs/trunk/debian/patches/ff-examples-load-WHERE-LIBRARY.patch
packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch
packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch
packages/ffcs/trunk/debian/patches/fltk.patch
packages/ffcs/trunk/debian/patches/old/
packages/ffcs/trunk/debian/patches/old/configure.patch
packages/ffcs/trunk/debian/patches/old/ff-c++.patch
packages/ffcs/trunk/debian/patches/old/ff-configure.patch
packages/ffcs/trunk/debian/patches/old/ff-examples++-load.patch
packages/ffcs/trunk/debian/patches/old/ff-examples++-mpi.patch
packages/ffcs/trunk/debian/patches/old/ff-examples-bamg.patch
packages/ffcs/trunk/debian/patches/old/ff-pkg-download.patch
packages/ffcs/trunk/debian/patches/old/ff-superlu.patch
packages/ffcs/trunk/debian/patches/old/ffcs-dev.patch
packages/ffcs/trunk/debian/patches/old/gcc45.patch
packages/ffcs/trunk/debian/patches/old/gcc46.patch
packages/ffcs/trunk/debian/patches/old/install.patch
packages/ffcs/trunk/debian/patches/old/pref.patch
packages/ffcs/trunk/debian/patches/old/series
Removed:
packages/ffcs/trunk/debian/patches/ff-c++.patch
packages/ffcs/trunk/debian/patches/ff-configure.patch
packages/ffcs/trunk/debian/patches/ff-examples++-load.patch
packages/ffcs/trunk/debian/patches/ff-examples++-mpi.patch
packages/ffcs/trunk/debian/patches/ff-examples-bamg.patch
packages/ffcs/trunk/debian/patches/ff-pkg-download.patch
packages/ffcs/trunk/debian/patches/ff-superlu.patch
packages/ffcs/trunk/debian/patches/gcc45.patch
packages/ffcs/trunk/debian/patches/gcc46.patch
packages/ffcs/trunk/debian/patches/pref.patch
Modified:
packages/ffcs/trunk/debian/changelog
packages/ffcs/trunk/debian/control
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/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/changelog?rev=44028&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/changelog (original)
+++ packages/ffcs/trunk/debian/changelog Mon Nov 14 09:50:22 2011
@@ -1,4 +1,4 @@
-ffcs (11.10-1) unstable; urgency=low
+ffcs (11.11-1) unstable; urgency=low
* Initial release (Closes: #643865)
Modified: packages/ffcs/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/control?rev=44028&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/control (original)
+++ packages/ffcs/trunk/debian/control Mon Nov 14 09:50:22 2011
@@ -13,7 +13,7 @@
libscotch-dev, ghostscript, libptscotch-dev, libmumps-scotch-dev,
libxext-dev, libxpm-dev, libxt-dev,libvtk5-dev (>= 5.6),
libtiff4-dev, libjpeg-dev, zlib1g-dev, libpng12-dev,
- libmysqlclient-dev (>= 5.1.56),
+ fluid, libfltk1.3-dev, libmysqlclient-dev (>= 5.1.56),
rsync
#
# quilt, cdbs, debhelper (>= 7.0.50~), autotools-dev,
Added: 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=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch (added)
+++ packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,35 @@
+Fix finding of file freefem++.pref
+Index: ffcs-11.11/ff/upstream/examples++-load/Makefile.am
+===================================================================
+--- ffcs-11.11.orig/ff/upstream/examples++-load/Makefile.am 2011-11-14 08:20:21.496635137 +0100
++++ ffcs-11.11/ff/upstream/examples++-load/Makefile.am 2011-11-14 08:20:41.412634299 +0100
+@@ -129,6 +129,9 @@
+ ff-c++:load.link.in Makefile load.link WHERE_LIBRARY-download ff-get-dep
+ ../config.status --file=ff-c++:load.link.in
+ chmod a+x ff-c++
++ffcs-c++:load.link.in Makefile load.link WHERE_LIBRARY-download ff-get-dep
++ ../config.status --file=ffcs-c++:load.link.in
++ chmod a+x ffcs-c++
+ load.link:load.link.in Makefile
+ ../config.status --file=load.link:load.link.in
+ chmod a+x load.link
+@@ -136,6 +139,9 @@
+ ../config.status --file=$@:$@.in
+ chmod a+x $@
+ cp $@ ../download/bin
++ffcs-get-dep:ffcs-get-dep.in Makefile
++ ../config.status --file=$@:$@.in
++ chmod a+x $@
+ ff-get-dep:ff-get-dep.in Makefile
+ ../config.status --file=$@:$@.in
+ chmod a+x $@
+@@ -153,8 +159,7 @@
+ $(INSTALL_DATA) clapack.h ppmimg.h bmo.hpp msh3.hpp pcm.hpp include/* $(DESTDIR)$(ff_prefix_dir)/include
+ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
+ echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
++ echo loadpath += \"$(libdir)/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
+ $(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
+ $(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
Added: packages/ffcs/trunk/debian/patches/ff-examples-bamg-test-dotest-pl.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-examples-bamg-test-dotest-pl.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples-bamg-test-dotest-pl.patch (added)
+++ packages/ffcs/trunk/debian/patches/ff-examples-bamg-test-dotest-pl.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,11 @@
+Fix location of perl executable
+Index: ffcs-11.7/ff/upstream/examples-bamg/test/dotest.pl
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples-bamg/test/dotest.pl 2011-06-13 16:40:47.000000000 +0300
++++ ffcs-11.7/ff/upstream/examples-bamg/test/dotest.pl 2011-06-13 16:41:17.000000000 +0300
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ # ----- clean ---
+ unlink <*.mesh>;
+ unlink <*.am_fmt>;
Added: packages/ffcs/trunk/debian/patches/ff-examples-load-WHERE-LIBRARY.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-examples-load-WHERE-LIBRARY.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples-load-WHERE-LIBRARY.patch (added)
+++ packages/ffcs/trunk/debian/patches/ff-examples-load-WHERE-LIBRARY.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,7 @@
+Create empty file examples++-load/WHERE_LIBRARY
+Index: ffcs-11.7/ff/upstream/examples++-load/WHERE_LIBRARY
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ffcs-11.7/ff/upstream/examples++-load/WHERE_LIBRARY 2011-06-13 17:53:05.000000000 +0300
+@@ -0,0 +1 @@
++# Empty file to be used during build time
Added: packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch (added)
+++ packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,13 @@
+Index: ffcs-11.11/ff/upstream/src/fflib/problem.cpp
+===================================================================
+--- ffcs-11.11.orig/ff/upstream/src/fflib/problem.cpp 2011-11-09 14:43:07.051010244 +0100
++++ ffcs-11.11/ff/upstream/src/fflib/problem.cpp 2011-11-09 14:53:08.654984944 +0100
+@@ -2203,7 +2203,7 @@
+ pair<int,int> ii(ll.first);
+ double w_i = wi(ii.first,ii.second);
+ R c =copt ? *(copt[il]) : GetAny<R>(ll.second.eval(stack));
+- if ( copt && Kv.number<1 <1)
++ if ( copt && Kv.number<1 <1)
+ {
+ R cc = GetAny<R>(ll.second.eval(stack));
+ if ( c != cc) {
Added: packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch (added)
+++ packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,12 @@
+Recognition of GNU/kFreeBSD architecture
+--- ffcs-11.7.orig/ff/upstream/examples++-load/load.link.in
++++ ffcs-11.7/ff/upstream/examples++-load/load.link.in
+@@ -196,7 +196,7 @@
+ FLAGS=' '
+ LIBS="'$b/libff.dll' $LIBS $DLL"
+ SUF=dll;;
+- FreeBSD|NetBSD)
++ FreeBSD|NetBSD|GNU/kFreeBSD)
+ SHARED="-shared"
+ FLAGS='-fPIC';;
+ # 64 bit Linux needs -fPIC (ALH)
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=44028&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ffcs-dev.patch (original)
+++ packages/ffcs/trunk/debian/patches/ffcs-dev.patch Mon Nov 14 09:50:22 2011
@@ -1,32 +1,49 @@
-Index: ffcs-11.9/ff/upstream/examples++-load/Makefile.am
+Index: ffcs-11.11/ff/upstream/examples++-load/Makefile.am
===================================================================
---- ffcs-11.9.orig/ff/upstream/examples++-load/Makefile.am 2011-04-07 16:06:46.000000000 +0200
-+++ ffcs-11.9/ff/upstream/examples++-load/Makefile.am 2011-04-07 16:06:46.000000000 +0200
-@@ -135,6 +135,12 @@
- ../config.status --file=$@:$@.in
- chmod a+x $@
- -if [ -d ../download/bin ] ;then cp $@ ../download/bin; fi
-+ffcs-get-dep:ffcs-get-dep.in
-+ ../config.status --file=$@:$@.in
-+ chmod a+x $@
-+ffcs-c++:ffcs-c++.in
-+ ../config.status --file=$@:$@.in
-+ chmod a+x $@
- WHERE_LIBRARY-download:ff-pkg-download FORCE WHERE_LIBRARY-config
- ./ff-pkg-download >$@-new
- if [ -f $@ ] ; then { diff $@-new $@ || cp $@-new $@ ; }; fi;
-Index: ffcs-11.9/ff/upstream/examples++-load/ffcs-get-dep.in
+--- ffcs-11.11.orig/ff/upstream/examples++-load/Makefile.am 2011-11-14 08:23:23.000000000 +0100
++++ ffcs-11.11/ff/upstream/examples++-load/Makefile.am 2011-11-14 08:23:23.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 \
+ BernadiRaugel.cpp Morley.cpp dfft.cpp \
+ funcTemplate.cpp mat_dervieux.cpp mat_psi.cpp myfunction.cpp \
+ mat_dervieux.cpp convect_dervieux.edp funcTemplate.cpp \
+@@ -123,7 +123,7 @@
+ $(LIST_COMPILE):ff-c++ include 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 ffcs-c++ ff-get-dep ff-c++ ff-pkg-download \
+ $(LIST_COMPILE) $(LIST_COMPILE_PKG) regtests.edp makeref.edp
+ -rm -rf include
+ ff-c++:load.link.in Makefile load.link WHERE_LIBRARY-download ff-get-dep
+@@ -163,6 +163,8 @@
+ $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
+ $(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
+ $(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
++ $(INSTALL_SCRIPT) ffcs-c++ $(DESTDIR)${bindir}
++ $(INSTALL_SCRIPT) ffcs-get-dep $(DESTDIR)${bindir}
+ -for i in $(LIST_COMPILE_PKG); do \
+ if [ -f $$i ] ; then $(INSTALL) -m 555 $$i $(DESTDIR)$(ff_prefix_dir)/lib; fi; done
+
+Index: ffcs-11.11/ff/upstream/examples++-load/ffcs-get-dep.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffcs-11.9/ff/upstream/examples++-load/ffcs-get-dep.in 2011-04-07 16:06:46.000000000 +0200
-@@ -0,0 +1,59 @@
++++ ffcs-11.11/ff/upstream/examples++-load/ffcs-get-dep.in 2011-11-14 08:55:21.944546804 +0100
+@@ -0,0 +1,61 @@
+#!/bin/sh
-+# ff-c++ `./ff-get-dep -ff metis.cpp`
++# ffcs-c++ `./ffcs-get-dep -ff metis.cpp`
+wherelib=WHERE_LIBRARY
++dircommand=`dirname $0`
+if [ -f "$wherelib-download" ] ; then
+ wherelib=WHERE_LIBRARY
-+elif [ -f '@libdir@/freefem++-cs/Contents/Linux/WHERE_LIBRARY-download' ] ; then
-+ wherelib='@libdir@/freefem++-cs/Contents/Linux/WHERE_LIBRARY'
++elif [ -f "$dircommand/$wherelib-download" ] ; then
++ wherelib=$dircommand/WHERE_LIBRARY
++elif [ -f '@ff_prefix_dir@/WHERE_LIBRARY-download' ] ; then
++ wherelib='@ff_prefix_dir@/WHERE_LIBRARY'
+else
+ echo " error no WHERE_LIBRARY file "
+ exit 1;
@@ -37,17 +54,16 @@
+ -i*)
+ shift;
+ for i in $@ ; do
-+ # echo "$1"
++ # echo "$1"
+ # echo awk -v p="$1" -v m=INCLUDE ' ($1 == p) && ($2 == m) { for (i=3;i<=NF;++i) {print $i," ";}}' $wherelib $wherelib-download
+ awk -v p="$i" -v m=INCLUDE ' ($1 == p) && ($2 == m) && (!first){ first=1;for (i=3;i<=NF;++i) {print $i," ";}}' "$wherelib" "$wherelib"-config "$wherelib"-download
+ done
-+
++
+ ;;
+ -l*)
+ shift;
-+ for i in $@ ; do
-+ awk -v p="$i" -v m=LD ' ($1 == p) && ($2 == m) && (!first) {first=1; for (i=3;i<=NF;++i) {print $i," "};}
-+ END { if(!first) print "ERROR-missing-lib:" p;} ' "$wherelib" "$wherelib"-config "$wherelib"-download
++ for i in $@ ; do
++ awk -v p="$i" -v m=LD ' ($1 == p) && ($2 == m) && (!first) {first=1; for (i=3;i<=NF;++i) {print $i," "};} END { if(!first) print "ERROR-missing-lib:" p;} ' "$wherelib" "$wherelib"-config "$wherelib"-download
+ done
+ ;;
+ -dlib)
@@ -63,7 +79,7 @@
+ shift;
+ libs=`$0 -dlib $@`
+ cpp=`$0 -dcpp $@`
-+ inclins=`$0 -i $libs`
++ inclins=`$0 -i $libs`
+ ldlibs=`$0 -l $libs`
+ if [ -n "$ldlibs" -o -z "$libs" ]; then
+ echo "$cpp" "$inclins" "$ldlibs"
@@ -71,212 +87,11 @@
+ echo " erreur find libs of $0 : $libs " 1>&2
+ fi
+ ;;
-+ *)
-+ for i in $@ ; do
-+ awk -v p="$i" ' ($1 == p) { k=0; for (i=3;i<=NF;++i) {k=1;} print k}' "$wherelib" "$wherelib"-config "$wherelib"-download
++ *)
++ for i in $@ ; do
++ awk -v p="$i" ' ($1 == p) { k=0; for (i=3;i<=NF;++i) {k=1;} print k}' "$wherelib" "$wherelib"-config "$wherelib"-download
+ done
-+
++
+shift;;
+esac
+
-Index: ffcs-11.9/ff/upstream/examples++-load/ffcs-c++.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffcs-11.9/ff/upstream/examples++-load/ffcs-c++.in 2011-04-07 16:28:09.000000000 +0200
-@@ -0,0 +1,196 @@
-+#!/bin/sh
-+# Create a loadable object from a C++ function defined in a .cpp file
-+# $Id$
-+thecommand="$0"
-+#dircommand=`dirname "$0"`
-+
-+FFVERSION='@VERSION@'
-+FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@'
-+FFFFLAGS='@FFLAGS@'
-+FFFLIBS='@FLIBS@'
-+INCFF='-I at includedir@/freefem++-cs'
-+
-+do="yes"
-+DEBUG=""
-+CONLY="false"
-+uu=`uname -s`
-+INC=""
-+LIBS=""
-+DLL=""
-+bin="."
-+out=""
-+files=""
-+fileso=""
-+OTHER="";
-+WIN32="";
-+
-+autodep=""
-+withmpi=""
-+args=""
-+
-+while [ $# -ne 0 ] ; do
-+ argsp=$args
-+ args="$args '$1'"
-+ case "$1" in
-+ -[h?]*) echo usage $0 "[-n] [-g] [-win32] [-l libfile] [-I includedir] files"
-+ echo " -auto : build automaticaly the dependance (in test FH) "
-+ echo " -n : do nothing just print"
-+ echo " -g : compile with -g option"
-+ echo " -c : compile only"
-+ echo " -mpi: with mpi"
-+ echo " -O* : compile with -O* option"
-+ echo " -cygwin: compile for cygwin/win32 OS (Window XP, ...)"
-+ echo " -win32: compile for win32 OS (Window XP, ...) default under cygwin"
-+ echo " -l files add files to the ld process (link)"
-+ echo " -I dir add dir in include seach dir for compilation"
-+ echo " -b dir to change the default install dir "
-+ echo " -dll file add dll and this file copie in the install dir"
-+ echo " -o outputfile without suffix"
-+ echo " file.{cpp,cp,cxx,c,f,F}"
-+ exit 0;
-+ ;;
-+ F77=*) F77=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
-+ CXX=*) CXX=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
-+ MPICXX=*) MPICXX=`echo $1|sed 's/[A-Z0-9]*=//'`;withmpi=yes ;;
-+ F77=*) F77=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
-+ CXXFLAGS=*) CXXFLAGS=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
-+ FFLAGS=*) FFFFLAGS=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
-+ -auto) autodep=yes;args=$argsp;;
-+ -mpi) withmpi=yes;;
-+ -n) do="no";;
-+ -g) DEBUG="$DEBUG $1";;
-+ -c) CONLY=yes;;
-+ -O*) DEBUG="$DEBUG $1";;
-+ -cygwin) onwin32=1; uu="cygwin-version";;
-+ -win32) onwin32=1; uu="win32";;
-+ -b) bin=$2 ; shift;;
-+ -I*) INC="$INC '$1'";;
-+ -D*) INC="$INC '$1'";;
-+ -dll) DLL="$DLL '$2'";shift;;
-+ -[Ll]*) LIBS="$LIBS $1" ;;
-+ *.a) LIBS="$LIBS $1" ;;
-+ *.so) LIBS="$LIBS $1" ;;
-+ *.dll) if [ -f "$1" ] ; then LIBS="$LIBS '$1'"
-+ elif [ -f "$bin/$1" ] ; then LIBS="$LIBS '$bin/$1'"
-+ else
-+ echo " erreur file not found $1" ;
-+ exit 1;
-+ fi;;
-+ -Wl*) LIBS="$LIBS $1" ;;
-+ *.cpp) files="$files '$1'"; o=`basename "$1" .cpp` ; fileso="$fileso '$o.o'"; args=$argsp;;
-+ *.cp) files="$files '$1'"; o=`basename "$1" .cp` ; fileso="$fileso '$o.o'"; args=$argsp;;
-+ *.cxx) files="$files '$1'"; o=`basename "$1" .cxx` ; fileso="$fileso '$o.o'"; args=$argsp;;
-+ *.c) files="$files '$1'"; o=`basename "$1" .c` ; fileso="$fileso '$o.o'"; args=$argsp;;
-+ *.f) ffiles="$ffiles '$1'"; o=`basename "$1" .f` ; fileso="$fileso '$o.o'";;
-+ *.F) ffiles="$ffiles '$1'"; o=`basename "$1" .F` ; fileso="$fileso '$o.o'";;
-+ *.o) fileso="$fileso '$1'"; o=`basename "$1" .o` ;;
-+ -o) out="$2"; shift;;
-+ *) OTHER="$OTHER $1";;
-+ esac
-+ shift
-+done
-+if [ -n "$autodep" ] ; then
-+# echo "$thecommand" $args `eval "'$dircommand/ff-get-dep'" -ff $files`
-+ argsdep=`eval "'ffcs-get-dep'" -ff $files`
-+
-+ error=`echo "$argsdep"| grep ERROR`
-+ if [ -n "$error" ] ; then
-+ echo " ERROR in auto dependance seach. sorry : $error "
-+ exit 0;
-+ fi
-+ echo eval "$thecommand" $args $argsdep
-+ eval "$thecommand" $args $argsdep
-+
-+ # FFCS needs an error exit code to make sure that all libraries
-+ # are correctly compiled
-+ ###exit 0;
-+ exit $?;
-+fi
-+
-+if [ -n "$onwin32" -a ! -f "$bin/libff.dll" ] ; then
-+ echo " Error the file libff.dll must be exist in '$bin' the install directory,"
-+ echo " to link on windows OS "
-+ echo " Use the parameter -b to set the correct install directory "
-+ exit 1;
-+fi
-+
-+if [ -z "$out" ] ; then out=$o ; fi;
-+# Default compiler
-+if [ -z "$CXX" ];then CXX=g++ ; fi
-+if [ -n "$withmpi" ]; then CXX=$MPICXX;fi
-+
-+INC="$INCFF $INC"
-+SUF=so
-+SHARED="-shared"
-+case "$WIN32$uu" in
-+ Darwin*)
-+# echo "export MACOSX_DEPLOYMENT_TARGET=10.3"
-+ export MACOSX_DEPLOYMENT_TARGET=10.4
-+ SUF=dylib
-+ SHARED="-bundle -undefined dynamic_lookup" ;;
-+ win32-CYGWIN*|win32-win32)
-+ echo " Window without cygwin "
-+ b="$bin"
-+ LIBS=" '$b/libff.dll' $LIBS $DLL"
-+ SHARED="-shared --unresolved-symbols=ignore-all -Wl,--enable-auto-import"
-+ FLAGS=' -mno-cygwin '
-+ SUF=dll;;
-+ win32-cygwin-version)
-+ echo " cygwin-version "
-+ b=$bin
-+ FLAGS=' '
-+ LIBS="'$b/libff.dll' $LIBS $DLL"
-+ SUF=dll;;
-+ FreeBSD|NetBSD)
-+ SHARED="-shared"
-+ FLAGS='-fPIC';;
-+ # 64 bit Linux needs -fPIC (ALH)
-+ SunOS)
-+ SHARED="-shared"
-+ FLAGS='-fPIC';;
-+ # 64 bit Linux needs -fPIC (ALH)
-+ Linux)
-+ FLAGS='-fPIC'
-+ SHARED="-shared " ;;
-+ *)
-+ echo "sorry unknown achitecture "`uname`
-+ exit 1;;
-+esac
-+FLAGS="$FLAGS $DEBUG $FFCXXFLAGS"
-+if [ -n "$ffiles$files$fileso" ] ; then
-+ if [ -n "$WIN32" -a ! -f "$bin/libff.dll" ]; then
-+ echo " Sorry, no freefem .dll file (libff.dll) in $bin dir "
-+ echo " try with -b dir-path where the file libff.dll exist"
-+ exit 1;
-+ fi
-+ if [ "$files" ] ;then
-+ echo $CXX -c $FLAGS $CXXFLAGS $INC $PIC $files
-+ if [ $do = yes ] ; then
-+ eval $CXX -c $INC $FLAGS $CXXFLAGS $PIC $files
-+ ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
-+ fi
-+ fi
-+ if [ "$ffiles" ] ;then
-+ echo $F77 -c $FLAGS $FFFFLAGS $INC $PIC $ffiles
-+ LIBS="$FFFLIBS $LIBS"
-+ if [ $do = yes ] ; then
-+ eval $F77 -c $INC $FLAGS $FFFFLAGS $PIC $ffiles
-+ ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
-+ fi
-+ fi
-+ if [ "$CONLY" != yes ]; then
-+ echo $CXX $SHARED $FLAGS $CXXFLAGS $fileso -o $out.$SUF $LIBS $DLL $OTHER $MPI_LIB
-+ if [ $do = yes ] ; then
-+ eval $CXX $SHARED $FLAGS $CXXFLAGS $fileso -o $out.$SUF $LIBS $DLL $OTHER $MPI_LIB
-+ ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
-+ fi
-+ if [ "$bin" != "." ]; then
-+ echo cp $out.$SUF $bin
-+ test $do = yes && cp $out.$SUF "$bin"
-+ fi
-+ if [ -n "$DLL" ] ; then
-+ echo cp $DLL $bin
-+ test $do = yes && cp $DLL "$bin"
-+ fi
-+ fi
-+fi
Added: packages/ffcs/trunk/debian/patches/fltk.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/fltk.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/fltk.patch (added)
+++ packages/ffcs/trunk/debian/patches/fltk.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,82 @@
+Index: ffcs-11.11/fltk/Makefile.am
+===================================================================
+--- ffcs-11.11.orig/fltk/Makefile.am 2011-11-09 15:56:28.450825146 +0100
++++ ffcs-11.11/fltk/Makefile.am 2011-11-09 15:56:29.000000000 +0100
+@@ -35,9 +35,15 @@
+ cd upstream && ./configure @FLTKOPTS@
+
+ if ENABLE_CLIENT
+-all:upstream/config.status all_fltk include.mak
++ all_client: upstream/config.status all_fltk include.mak
+ else
+-all:
++ all_client:
++endif
++
++if DEBIAN
++ all: include.mak
++else
++ all: all_client
+ endif
+
+ # add the MinGW dir to the path otherwise FLTK will not find
+@@ -69,7 +75,11 @@
+ #create an include file containing the result of fltk-config for
+ #several flag combinations because Automake does not like to see these
+ #flags in its AM variables (like xx_CXXFLAGS and xx_LDFLAGS).
++if DEBIAN
++FLTKCONF=/usr/bin/fltk-config
++else
+ FLTKCONF=$(top_srcdir)/fltk/upstream/fltk-config
++endif
+
+ # This dependency is required for parallel make to understand that it
+ # has to wait for FLTK to be built before using FLTKCONF
+Index: ffcs-11.11/src/Makefile.am
+===================================================================
+--- ffcs-11.11.orig/src/Makefile.am 2011-11-09 15:56:28.506825143 +0100
++++ ffcs-11.11/src/Makefile.am 2011-11-09 16:09:05.806793291 +0100
+@@ -116,7 +116,7 @@
+ buffer.hpp buffer.cpp regression.hpp regression.cpp windres.h env.hpp env.cpp
+ FreeFem___client_CXXFLAGS=-I.. ${FLTK_CXXFLAGS} -DCLIENT -DFFC -DFLTK \
+ -DFF_VERSION=$(FF_VERSION) $(DEBUGOPTS) @VTK_CXXFLAGS@ \
+- -I../vtkFlRWI/upstream -I../fltk/upstream
++ -I../vtkFlRWI/upstream
+ FreeFem___client_CFLAGS=@REGEXINCLUDE@
+ FreeFem___client_LDFLAGS=@GUI_LDFLAGS@ @DEBUG_LDFLAGS@
+
+@@ -260,7 +260,7 @@
+ # ---------------------------
+
+ dashboardui.hpp dashboardui.cpp:dashboardui.fl
+- @MINGWEXEC@ ../fltk/upstream/fluid/fluid -c $<
++ @MINGWEXEC@ /usr/bin/fluid -c $<
+
+ FreeFem___vtk_SOURCES=../vtkFlRWI/upstream/vtkFlRenderWindowInteractor.h \
+ ../vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx ffg.cpp menu.hpp menu.cpp visucontrol.hpp visucontrol.cpp \
+Index: ffcs-11.11/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx
+===================================================================
+--- ffcs-11.11.orig/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx 2011-11-09 15:56:28.482825145 +0100
++++ ffcs-11.11/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx 2011-11-09 15:56:29.000000000 +0100
+@@ -33,7 +33,7 @@
+ // FLTK
+ //ALH-seems not to be included by default, and __APPLE_COCOA__ is not seen
+ //by FL/x.H
+-#include "../../fltk/upstream/config.h"
++//#include "../../fltk/upstream/config.h"
+ #include <FL/x.H>
+ // vtk
+ #include <vtkRenderWindow.h>
+Index: ffcs-11.11/src/editor.cpp
+===================================================================
+--- ffcs-11.11.orig/src/editor.cpp 2011-11-09 15:56:28.538825142 +0100
++++ ffcs-11.11/src/editor.cpp 2011-11-09 15:56:29.000000000 +0100
+@@ -520,7 +520,7 @@
+ // replace them with one regular LF.
+ int i=0;
+ while(i<editorbuffer->length()){
+- if(editorbuffer->character(i)=='\r') editorbuffer->remove(i,i+1);
++ if(editorbuffer->char_at(i)=='\r') editorbuffer->remove(i,i+1);
+ else i++;
+ }
+ #endif
Modified: packages/ffcs/trunk/debian/patches/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/install.patch?rev=44028&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/install.patch (original)
+++ packages/ffcs/trunk/debian/patches/install.patch Mon Nov 14 09:50:22 2011
@@ -1,43 +1,3 @@
-Index: ffcs-11.8/pack/Makefile.am
-===================================================================
---- ffcs-11.8.orig/pack/Makefile.am 2011-04-05 10:36:27.000000000 +0200
-+++ ffcs-11.8/pack/Makefile.am 2011-04-05 11:12:36.000000000 +0200
-@@ -316,7 +316,7 @@
-
- examples:examples-dir examples-main examples-tutorial examples-3d \
- examples-eigen examples-mpi examples-chapt3 examples-other \
-- examples-load examples-ffcs
-+ examples-load examples-ffcs examples-bamg
- examples-dir:${resdir}/examples
- ${resdir}/examples:
- mkdir -p $@
-@@ -328,6 +328,8 @@
- rsync -avq --delete ../ff/upstream/examples++-3d/ ${resdir}/examples/3d
- examples-eigen:
- rsync -avq --delete ../ff/upstream/examples++-eigen/ ${resdir}/examples/eigen
-+examples-bamg:
-+ rsync -avq --delete ../ff/upstream/examples-bamg/ ${resdir}/examples/bamg
-
- # we remove all dlls from examples++-mpi (they are already in lib/).
- examples-mpi:
-@@ -487,7 +489,7 @@
-
- if LINUX
- install:filetree
-- cd work && ./install_as_root ${prefix} ${bindir}
-+ cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
- endif
- if MACOS
- install:finaldir
-@@ -499,7 +501,7 @@
- # because the actual install would need administrator credentials, and
- # we want to run tests unattended.
- install:filetree
-- cd work && ./install_as_root ${prefix} ${bindir}
-+ cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
- endif
-
- # Source package check
Index: ffcs-11.8/pack/install.m4
===================================================================
--- ffcs-11.8.orig/pack/install.m4 2011-04-05 10:36:27.000000000 +0200
@@ -109,3 +69,43 @@
# Local Variables:
# mode:shell-script
+Index: ffcs-11.11/pack/install.m4
+===================================================================
+--- ffcs-11.11.orig/pack/Makefile.am 2011-11-08 18:40:58.530074437 +0100
++++ ffcs-11.11/pack/Makefile.am 2011-11-08 18:46:26.202088022 +0100
+@@ -293,7 +293,7 @@
+ endif
+
+ examples:examples-dir examples-main examples-tutorial examples-3d examples-eigen examples-mpi examples-chapt3 \
+- examples-other examples-load examples-ffcs
++ examples-other examples-load examples-ffcs examples-bamg
+ examples-dir:${resdir}/examples
+ ${resdir}/examples:
+ mkdir -p $@
+@@ -305,6 +305,8 @@
+ rsync -avq --delete ../ff/upstream/examples++-3d/ ${resdir}/examples/3d
+ examples-eigen:
+ rsync -avq --delete ../ff/upstream/examples++-eigen/ ${resdir}/examples/eigen
++examples-bamg:
++ rsync -avq --delete ../ff/upstream/examples-bamg/ ${resdir}/examples/bamg
+
+ # we remove all dlls from examples++-mpi (they are already in lib/).
+ examples-mpi:
+@@ -448,7 +450,7 @@
+
+ if LINUX
+ install:filetree
+- cd work && ./install_as_root ${prefix} ${bindir}
++ cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
+ endif
+ if MACOS
+ install:finaldir
+@@ -459,7 +461,7 @@
+ # Unix-style install is necessary for regression tests on Windows because the actual install would need administrator
+ # credentials, and we want to run tests unattended.
+ install:filetree
+- cd work && ./install_as_root ${prefix} ${bindir}
++ cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
+ endif
+
+ # Source package check
Added: packages/ffcs/trunk/debian/patches/old/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/configure.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/configure.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/configure.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,35 @@
+Index: ffcs-11.8/configure.ac
+===================================================================
+--- ffcs-11.8.orig/configure.ac 2011-04-04 12:54:53.000000000 +0200
++++ ffcs-11.8/configure.ac 2011-04-04 12:54:53.000000000 +0200
+@@ -837,7 +837,7 @@
+ # version of Lapack. But Cygwin then requires cygblas.dll and
+ # cyglapack.dll to be present, and they call cygwin1.dll.
+
+- ffcs_ff_conf_opts="$ffcs_ff_conf_opts --enable-generic_blas"
++ ffcs_ff_conf_opts="$ffcs_ff_conf_opts"
+
+ # reuse the same compilers for FF configuration in case a specific
+ # one was specified here (eg for MingW64)
+Index: ffcs-11.8/ff/Makefile.am
+===================================================================
+--- ffcs-11.8.orig/ff/Makefile.am 2011-04-04 12:54:53.000000000 +0200
++++ ffcs-11.8/ff/Makefile.am 2011-04-04 12:54:53.000000000 +0200
+@@ -73,7 +73,7 @@
+ # and avoid creating symlinks.
+
+ compile:upstream/config.status
+- cd upstream && @MINGWEXEC@ $(MAKE) $(AM_MAKEFLAGS) all
++ cd upstream && @MINGWEXEC@ $(MAKE) -i $(AM_MAKEFLAGS) all
+
+ # the load/include directory is populated with real files, _not_ links
+ # (because of the MinGW compilers), so it will keep old versions of
+@@ -97,7 +97,7 @@
+ TAGS:upstream/config.status
+ etags --etags-include=upstream/TAGS *.?pp \
+ || etags -i upstream/TAGS *.?pp
+- cd upstream && $(MAKE) $(AM_MAKEFLAGS) tags
++ cd upstream && $(MAKE) -i $(AM_MAKEFLAGS) tags
+ clean-local::
+ -rm TAGS
+
Added: packages/ffcs/trunk/debian/patches/old/ff-c++.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/ff-c%2B%2B.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/ff-c++.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/ff-c++.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,116 @@
+Index: ffcs-11.9/ff/upstream/examples++-load/ff-c++
+===================================================================
+--- ffcs-11.9.orig/ff/upstream/examples++-load/ff-c++ 2011-04-07 10:47:30.000000000 +0200
++++ ffcs-11.9/ff/upstream/examples++-load/ff-c++ 2011-04-07 11:26:29.000000000 +0200
+@@ -1,6 +1,10 @@
+ #!/bin/sh
+ # Create a loadable object from a C++ function defined in a .cpp file
+ # $Id$
++
++# Activate debug
++set -x
++
+ thecommand="$0"
+ dircommand=`dirname "$0"`
+
+@@ -29,8 +33,8 @@
+ INCFF="-Iinclude"
+ elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then
+ INCFF="-IFFAPPLI_INC"
+- elif [ -f '/alh/nowhere/lib/ff++/3.12/include/ff++.hpp' ] ; then
+- INCFF='-I/alh/nowhere/lib/ff++/3.12/include'
++ elif [ -f '/usr/include/frefem++/ff++.hpp' ] ; then
++ INCFF='-I/usr/include/freefem++'
+ else
+ ff=`which freefem++.exe`;
+ ffinc=`dirname "$ff"`/examples++-load/include
+@@ -58,24 +62,25 @@
+
+ case "$uu" in
+ CYGWIN*|MINGW*)
+- if [ -z "" ] ; then
+- onwin32=1; uu="cygwin-version";
+- else
+- onwin32=1; uu="win32"; # pure windows
+- fi
+- WIN32="win32-"
+- wff=`which FreeFem++.exe`
+- dff=`dirname "$wff"`
+- if [ "$bin" = "." -a -f ../src/bin-win32/libff.dll ]; then
+- bin=../src/bin-win32
+- elif [ -f "$dff/libff.dll" ]; then
+-# modif for install on cygwin
+- bin="$dff"
+- elif [ "$bin" = "." -a -f ../libff.dll ]; then
+- bin=..
+- elif [ "$bin" = "." -a -f ../../libff.dll ]; then
+- bin=../..
+- fi;;
++ if [ -z "" ] ; then
++ onwin32=1; uu="cygwin-version";
++ else
++ onwin32=1; uu="win32"; # pure windows
++ fi
++ WIN32="win32-"
++ wff=`which FreeFem++.exe`
++ dff=`dirname "$wff"`
++ if [ "$bin" = "." -a -f ../src/bin-win32/libff.dll ]; then
++ bin=../src/bin-win32
++ elif [ -f "$dff/libff.dll" ]; then
++ # modif for install on cygwin
++ bin="$dff"
++ elif [ "$bin" = "." -a -f ../libff.dll ]; then
++ bin=..
++ elif [ "$bin" = "." -a -f ../../libff.dll ]; then
++ bin=../..
++ fi
++ ;;
+ esac
+ autodep=""
+ withmpi=""
+Index: ffcs-11.9/ff/upstream/examples++-load/ff-get-dep
+===================================================================
+--- ffcs-11.9.orig/ff/upstream/examples++-load/ff-get-dep 2011-04-07 11:38:15.000000000 +0200
++++ ffcs-11.9/ff/upstream/examples++-load/ff-get-dep 2011-04-07 11:40:16.000000000 +0200
+@@ -1,13 +1,17 @@
+ #!/bin/sh
+ # ff-c++ `./ff-get-dep -ff metis.cpp`
++
++#Activate debug
++set -x
++
+ wherelib=WHERE_LIBRARY
+ dircommand=`dirname $0`
+ if [ -f "$wherelib-download" ] ; then
+ wherelib=WHERE_LIBRARY
+ elif [ -f "$dircommand/$wherelib-download" ] ; then
+ wherelib=$dircommand/WHERE_LIBRARY
+-elif [ -f '/alh/nowhere/lib/ff++/3.12/WHERE_LIBRARY-download' ] ; then
+- wherelib='/alh/nowhere/lib/ff++/3.12/WHERE_LIBRARY'
++elif [ -f '/usr/lib/freefem++/WHERE_LIBRARY-download' ] ; then
++ wherelib='/usr/lib/freefem++/WHERE_LIBRARY'
+ else
+ echo " error no WHERE_LIBRARY file "
+ exit 1;
+Index: ffcs-11.9/ff/upstream/examples++-load/ff-pkg-download
+===================================================================
+--- ffcs-11.9.orig/ff/upstream/examples++-load/ff-pkg-download 2011-04-07 11:40:26.000000000 +0200
++++ ffcs-11.9/ff/upstream/examples++-load/ff-pkg-download 2011-04-07 11:42:10.000000000 +0200
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+
++#Activate debug
++set -x
++
+ ff=$0;
+ bb=`basename $0`
+ DIR=`dirname $ff`
+@@ -23,7 +26,7 @@
+ elif [ -d "$DIRP/lib" -a -d "$DIRP/include" ] ; then
+ DIR="$DIRP"
+ else
+- DIR=/alh/nowhere/lib/ff++/3.12
++ DIR=/usr/lib/freefem++
+ fi
+
+ if [ -d $DIR/lib -a -d $DIR/include ] ; then
Added: packages/ffcs/trunk/debian/patches/old/ff-configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/ff-configure.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/ff-configure.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/ff-configure.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,392 @@
+Index: ffcs-11.7/ff/upstream/acoptim.m4
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/acoptim.m4 2011-03-18 11:52:35.000000000 +0100
++++ ffcs-11.7/ff/upstream/acoptim.m4 2011-03-18 11:52:36.000000000 +0100
+@@ -49,14 +49,6 @@
+ AC_ARG_ENABLE(debug,[ --enable-debug Turn on debug versions of FreeFem++])
+ AC_ARG_ENABLE(optim,[ --enable-optim Turn on compiler optimization])
+
+-# Autoconf always chooses -O2. -O2 in gcc makes some functions
+-# disappear. This is not ideal for debugging. And when we optimize, we
+-# do not use -O2 anyway.
+-
+-CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`"
+-FFLAGS="`echo $FFLAGS | sed 's/-O2//g'`"
+-CXXFLAGS="`echo $CXXFLAGS | sed 's/-O2//g'`"
+-
+ if test "$enable_debug" = yes;
+ then
+ AC_MSG_RESULT(yes)
+@@ -65,9 +57,9 @@
+
+ # No debugging information in optimized code
+
+- CFLAGS="`echo $CFLAGS | sed 's/-g//g'` -DNDEBUG"
+- FFLAGS="`echo $FFLAGS | sed 's/-g//g'` -DNDEBUG"
+- CXXFLAGS="`echo $CXXFLAGS | sed 's/-g//g'` -DNDEBUG"
++ CFLAGS="$CFLAGS -DNDEBUG"
++ FFLAGS="$FFLAGS -DNDEBUG"
++ CXXFLAGS="$CXXFLAGS -DNDEBUG"
+ fi
+
+ # Hardware-independant optimization
+@@ -104,6 +96,14 @@
+ -a "$enable_generic" != yes
+ then
+
++# Autoconf always chooses -O2. -O2 in gcc makes some functions
++# disappear. This is not ideal for debugging. And when we optimize, we
++# do not use -O2 anyway.
++
++CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`"
++FFLAGS="`echo $FFLAGS | sed 's/-O2//g'`"
++CXXFLAGS="`echo $CXXFLAGS | sed 's/-O2//g'`"
++
+ # MacOS X Darwin
+ if test -x /usr/bin/hostinfo
+ then
+Index: ffcs-11.7/ff/upstream/examples++-load/Makefile.am
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-load/Makefile.am 2011-03-18 11:52:35.000000000 +0100
++++ ffcs-11.7/ff/upstream/examples++-load/Makefile.am 2011-03-18 11:52:36.000000000 +0100
+@@ -118,7 +118,7 @@
+ $(LIST_COMPILE):ff-c++ include 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 WHERE_LIBRARY-config WHERE_LIBRARY ff-get-dep ff-c++ ff-pkg-download \
+ $(LIST_COMPILE) $(LIST_COMPILE_PKG) regtests.edp makeref.edp
+ -rm -rf include
+ ff-c++:load.link.in Makefile load.link WHERE_LIBRARY-download ff-get-dep
+@@ -135,26 +135,29 @@
+ ../config.status --file=$@:$@.in
+ chmod a+x $@
+ -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 $@ ;touch WHERE_LIBRARY)
++WHERE_LIBRARY-download:ff-pkg-download FORCE WHERE_LIBRARY-config
++ ./ff-pkg-download >$@-new
++ if [ -f $@ ] ; then { diff $@-new $@ || cp $@-new $@ ; }; fi;
++ if [ ! -f $@ ] ; then mv $@-new $@ ; fi;
++ touch WHERE_LIBRARY
++
+ FORCE: ;
+ freefem++.pref:
+ echo loadpath = \"./\" >freefem++.pref
+ install-exec-local:: load_compile
+- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/lib
+- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/include
+- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/etc
+- $(INSTALL_DATA) clapack.h ppmimg.h include/* $(DESTDIR)$(ff_prefix_dir)/include
+- $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
+- echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
++ $(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++
++ $(mkinstalldirs) -m 755 $(DESTDIR)/usr/include/freefem++/include
++ $(mkinstalldirs) -m 755 $(DESTDIR)/etc
++ $(INSTALL_DATA) clapack.h ppmimg.h include/* $(DESTDIR)/usr/include/freefem++/include
++ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
++ echo loadpath += \"./\" >$(DESTDIR)/etc/freefem++.pref
++ echo loadpath += \"$(libdir)/freefem++\" >>$(DESTDIR)/etc/freefem++.pref
++ echo includepath += \"$(libdir)/freefem++/idp\" >>$(DESTDIR)/etc/freefem++.pref
+ $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
+ $(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
+ $(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
+ -for i in $(LIST_COMPILE_PKG); do \
+- if [ -f $$i ] ; then $(INSTALL) -m 555 $$i $(DESTDIR)$(ff_prefix_dir)/lib; fi; done
++ if [ -f $$i ] ; then $(INSTALL) -m 555 $$i $(DESTDIR)$(libdir)/freefem++; fi; done
+
+
+
+Index: ffcs-11.7/ff/upstream/examples++-3d/Makefile.am
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-3d/Makefile.am 2011-03-18 11:52:35.000000000 +0100
++++ ffcs-11.7/ff/upstream/examples++-3d/Makefile.am 2011-03-18 11:52:36.000000000 +0100
+@@ -33,8 +33,8 @@
+ echo loadpath += \"./\" >>freefem++.pref
+
+ install-exec-local::
+- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/idp
+- $(INSTALL) -m 555 $(LIST_IDP) $(DESTDIR)$(ff_prefix_dir)/idp
++ $(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++/idp
++ $(INSTALL) -m 555 $(LIST_IDP) $(DESTDIR)$(libdir)/freefem++/idp
+
+
+
+Index: ffcs-11.7/ff/upstream/examples++-tutorial/Makefile.am
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-tutorial/Makefile.am 2011-03-18 11:52:35.000000000 +0100
++++ ffcs-11.7/ff/upstream/examples++-tutorial/Makefile.am 2011-03-18 11:52:36.000000000 +0100
+@@ -22,8 +22,8 @@
+ Ref: makeref.edp
+ ../src/nw/FreeFem++-nw makeref.edp
+ install-exec-local::
+- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/idp
+- $(INSTALL) -m 555 $(LIST_IDP) $(DESTDIR)$(ff_prefix_dir)/idp
++ $(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++/idp
++ $(INSTALL) -m 555 $(LIST_IDP) $(DESTDIR)$(libdir)/freefem++/idp
+
+
+ makeref.edp: regtests.m4 ../regtests.m4
+@@ -32,4 +32,4 @@
+ # To check the scripts against their reference values
+ regtests.edp: regtests.m4 ../regtests.m4
+ m4 -DASSERT regtests.m4 > regtests.edp
+-FORCE:
+\ No newline at end of file
++FORCE:
+Index: ffcs-11.7/ff/upstream/examples++-mpi/Makefile.am
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-mpi/Makefile.am 2011-03-18 11:52:35.000000000 +0100
++++ ffcs-11.7/ff/upstream/examples++-mpi/Makefile.am 2011-03-18 11:52:36.000000000 +0100
+@@ -38,14 +38,19 @@
+ @###- ../examples++-load/ff-c++ -auto $<
+ ../examples++-load/ff-c++ -auto $<
+ install-exec-local::
+- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/lib
+- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/include
+- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/etc
++ $(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++
++ $(mkinstalldirs) -m 755 $(DESTDIR)/usr/include/freefem++/include
++ $(mkinstalldirs) -m 755 $(DESTDIR)/etc
++ $(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++/idp
+ -for i in $(LIST_COMPILE); do \
+- if [ -f $$i ] ; then $(INSTALL) -m 555 $$i $(DESTDIR)$(ff_prefix_dir)/lib; fi; done
+- $(INSTALL) -m 555 $(LIST_IDP) $(DESTDIR)$(ff_prefix_dir)/idp
++ if [ -f $$i ] ; then $(INSTALL) -m 555 $$i $(DESTDIR)$(libdir)/freefem++; fi; done
++ $(INSTALL) -m 555 $(LIST_IDP) $(DESTDIR)$(libdir)/freefem++/idp
+
+
+ freefem++.pref:
+ echo loadpath = \"../examples++-load/\" >freefem++.pref
+ echo loadpath += \"./\" >>freefem++.pref
++
++clean-local:
++ -rm *.o $(LIST_COMPILE) $(LIST_COMPILE_PKG)
++ -rm -rf include
+Index: ffcs-11.7/ff/upstream/configure.ac
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/configure.ac 2011-03-18 11:52:35.000000000 +0100
++++ ffcs-11.7/ff/upstream/configure.ac 2011-03-18 13:15:20.000000000 +0100
+@@ -968,11 +968,13 @@
+ dnl ---------------------------
+ dnl Looking for the tetgen
+ dnl --------------------------
+-AC_CHECK_LIB(tet,fftw_execute,ff_fftet_ok=yes)
+-AC_CHECK_HEADERS(tetgen.h,ff_tet_h=yes, ff_tet_h=no)
+-if test "$ff_tet_ok" = yes -a "$ff_tet_h" = yes
++ff_tetgen_ok=no
++AC_CHECK_LIB(tet,ssdissolve,ff_tetgen_ok=yes)
++AC_CHECK_HEADERS(tetgen.h,ff_tet_h=yes, ff_tetgen_h=no)
++if test "$ff_tetgen_ok" = yes -a "$ff_tetgen_h" = yes
+ then
+ [echo tetgen LD -ltet >>$ff_where_lib_conf]
++ AC_DEFINE(HAVE_TETGEN,1, tetgen is compute tetrahedralize volume of an enclosed surface)
+ fi
+ dnl ---------------------------
+
+@@ -980,7 +982,6 @@
+ # Modif: morice 2008
+ # Looking for the tetgen
+ # --------------------
+-ff_tetgen_ok=no
+ ff_tetgen_dir="${curdir}/download"
+ ff_libs_old="$LIBS"
+ ff_ldflags_old="$LDFLAGS"
+@@ -988,22 +989,22 @@
+ #for ff_tetgendir in "" "${curdir}/download";
+ #do
+ if test "$ff_tetgen_ok" = no
+- then
+- if test -n "$ff_tetgen_dir"
+- then
+- LDFLAGS="$LDFLAGS -L${ff_tetgen_dir}/lib"
+- CPPFLAGS="$CPPFLAGS -I${ff_tetgen_dir}/include"
+- fi
++then
++ if test -n "$ff_tetgen_dir"
++ then
++ LDFLAGS="$LDFLAGS -L${ff_tetgen_dir}/lib"
++ CPPFLAGS="$CPPFLAGS -I${ff_tetgen_dir}/include"
++ fi
+
+ AC_CHECK_LIB(tet,tetrahedralize,
+ ff_tetgen_ok=yes)
+ AC_CHECK_HEADERS(tetgen.h,
+ ff_tetgen_h=yes, ff_tetgen_h=no)
+
+- if test "$ff_tetgen_ok" = yes -a "$ff_tetgen_h" = yes
+- then
++ if test "$ff_tetgen_ok" = yes -a "$ff_tetgen_h" = yes
++ then
+ AC_DEFINE(HAVE_TETGEN,1, tetgen is compute tetrahedralize volume of an enclosed surface)
+- else
++ else
+ LIBS="$ff_libs_old"
+ LDFLAGS="$ff_ldflags_old"
+ CPPFLAGS="$ff_cppflags_old"
+@@ -1946,13 +1947,27 @@
+
+ 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],[/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]],
++ [[pastix],[-lpastix],[/usr/include/pastix/pastix.h],[]],
++ [[hips],[-lhips],[/usr/include/hips/hips.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],[]],
+ [[fftw3],[-lfftw3],[fftw3.h],[]],
+- [[superlu],[-lsuperlu],[superlu_defs.h],[]],
+- [[blacs],[$ff_blacs],$ff_winc,[]],
+- [[scalapack],[$ff_scalapack],$ff_winc,[$ff_blacs $ff_blas_libs $ff_MPI_LIB]],
++ [[blacs],[ -lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi],[]],
++ [[scalapack],[-lscalapack$ff_with_mpi],[]],
+ [[scotch],[-lscotch -lscotcherr],[],[]],
+- [[metis],[-lmetis],[metis/metis.h],[]],
+- [[parmetis],[-lparmetis],[parmetis/parmetis.h],[]]
++ [[ptscotch],[-lptscotch -lptscotcherr],[]],
++ [[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
++ [[parmetis],[-lptscotch -lparmetis],[],[]],
++ [[freeyams],[-lfreeyams],[/usr/include/freeyamslib.h],[]],
++ [[mmg3d],[-lmmg3d],[/usr/include/libmmg3d.h],[]],
++ [[mshmet],[-lmshmet],[],[]],
++ [[gsl],[-lgsl -lgslcblas -lm],[/usr/include/gsl/gsl_sf.h],[]],
++ [[parms],[-lparms2 -llapack -lblas -lm],[/usr/include/parms2],[]],
++ [[tetgen],[-ltet],[/usr/include/tetgen.h],[]],
+ ]
+ )
+
+Index: ffcs-11.7/ff/upstream/download/hips/Makefile
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/download/hips/Makefile 2011-04-01 14:51:12.000000000 +0200
++++ ffcs-11.7/ff/upstream/download/hips/Makefile 2011-04-01 14:52:38.000000000 +0200
+@@ -196,7 +196,10 @@
+
+ # FFCS: avoid loops when SRCDIR does not exist
+ clean-local:
+- -cd $(SRCDIR) && $(MAKE) clean
++ if [ -d $(SRCDIR) ] ; then \
++ cd $(SRCDIR);\
++ $(MAKE) clean ;\
++ fi
+
+ clean: clean-local
+ rm makefile.inc
+@@ -207,4 +210,4 @@
+ -rm -rf $(SRCDIR)/$(INSTALL)/include/hips/
+ -rm -rf $(SRCDIR)
+ rm FAIT
+-.PHONY:$(SRCDIR)/$(INSTALL)
+\ No newline at end of file
++.PHONY:$(SRCDIR)/$(INSTALL)
+Index: ffcs-11.7/ff/upstream/download/yams/Makefile
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/download/yams/Makefile 2011-04-01 14:54:26.000000000 +0200
++++ ffcs-11.7/ff/upstream/download/yams/Makefile 2011-04-01 14:55:09.000000000 +0200
+@@ -67,7 +67,10 @@
+ # infinite loop.
+ clean-local:
+ -rm FAIRE FAIT
+- cd $(YAMS_DIR) && make clean;
++ if [ -d $(YAMS_DIR) ] ; then \
++ cd $(YAMS_DIR);\
++ $(MAKE) clean ;\
++ fi
+ -rm $(YAMS_OBJDIR)/libyams.a
+
+ clean: clean-local
+@@ -92,4 +95,4 @@
+ grep 'LIBS *=' ../Makefile >> ff-flags
+
+
+-.PHONY: $(SRCDIR)/$(INSTALL)
+\ No newline at end of file
++.PHONY: $(SRCDIR)/$(INSTALL)
+Index: ffcs-11.7/ff/upstream/download/blacs/Makefile
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/download/blacs/Makefile 2011-04-01 14:57:03.000000000 +0200
++++ ffcs-11.7/ff/upstream/download/blacs/Makefile 2011-04-01 15:00:17.000000000 +0200
+@@ -77,11 +77,14 @@
+ # FFCS: only run make clean if cd to SRCDIR worked, otherwise this is
+ # infinite loop.
+ clean-local:
+- -cd $(SRCDIR)/SRC/MPI && make clean
++ if [ -d $(SRCDIR) ] ; then \
++ -cd $(SRCDIR)/SRC/MPI; \
++ make clean; \
++ fi
+
+ clean: clean-local
+ -rm Bmake.inc FAIRE
+ -rm $(SRCDIR)/$(INSTALL)/lib/blacs/*.a
+ -rm -rf $(SRCDIR)
+
+-.PHONY:$(SRCDIR)/$(INSTALL) compile install
+\ No newline at end of file
++.PHONY:$(SRCDIR)/$(INSTALL) compile install
+Index: ffcs-11.7/ff/upstream/download/superludist/Makefile
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/download/superludist/Makefile 2011-04-01 14:59:26.000000000 +0200
++++ ffcs-11.7/ff/upstream/download/superludist/Makefile 2011-04-01 15:00:44.000000000 +0200
+@@ -66,7 +66,10 @@
+ # FFCS: only run make clean if cd to SRCDIR worked, otherwise this is
+ # infinite loop.
+ clean-local:
+- -cd $(SRCDIR) && $(MAKE) clean
++ if [ -d $(SRCDIR) ] ; then \
++ -cd $(SRCDIR); \
++ make clean; \
++ fi
+
+ clean: clean-local
+ -rm -rf $(SRCDIR)
+Index: ffcs-11.7/ff/upstream/download/mumps/Makefile
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/download/mumps/Makefile 2011-04-01 15:01:12.000000000 +0200
++++ ffcs-11.7/ff/upstream/download/mumps/Makefile 2011-04-01 15:01:34.000000000 +0200
+@@ -53,7 +53,10 @@
+ # FFCS: only run make clean if cd to SRCDIR worked, otherwise this is
+ # infinite loop.
+ clean-local:
+- -cd $(SRCDIR) && make clean
++ if [ -d $(SRCDIR) ] ; then \
++ -cd $(SRCDIR); \
++ make clean; \
++ fi
+
+ clean: clean-local
+ rm Makefile.inc FAIRE
+@@ -61,4 +64,4 @@
+ -rm -rf $(SRCDIR)/$(INSTALL)/lib/lib*mumps* $(SRCDIR)/$(INSTALL)/lib/libpord*.a
+ -rm -rf $(SRCDIR)
+
+-.PHONY:$(SRCDIR)/$(INSTALL)
+\ No newline at end of file
++.PHONY:$(SRCDIR)/$(INSTALL)
+Index: ffcs-11.7/ff/upstream/download/pastix/Makefile
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/download/pastix/Makefile 2011-04-01 15:02:13.000000000 +0200
++++ ffcs-11.7/ff/upstream/download/pastix/Makefile 2011-04-01 15:02:44.000000000 +0200
+@@ -129,7 +129,10 @@
+
+ # FFCS: avoid loops when SRCDIR does not exist
+ clean-local:
+- -cd $(SRCDIR)/src/ && $(MAKE) clean
++ if [ -d $(SRCDIR) ] ; then \
++ -cd $(SRCDIR); \
++ make clean; \
++ fi
+
+ clean: clean-local
+ -rm config.in FAIRE
+@@ -140,4 +143,4 @@
+ -rm -rf $(SRCDIR)/$(INSTALL)/lib/pastix/complex
+ -rm -rf $(SRCDIR)
+
+-.PHONY:$(SRCDIR)/$(INSTALL)
+\ No newline at end of file
++.PHONY:$(SRCDIR)/$(INSTALL)
Added: packages/ffcs/trunk/debian/patches/old/ff-examples++-load.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/ff-examples%2B%2B-load.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/ff-examples++-load.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/ff-examples++-load.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,12 @@
+Index: ffcs-11.7/ff/upstream/examples++-load/ilut.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-load/ilut.cpp 2011-03-16 10:20:20.000000000 +0100
++++ ffcs-11.7/ff/upstream/examples++-load/ilut.cpp 2011-03-16 10:20:20.000000000 +0100
+@@ -16,7 +16,6 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+-//ff-c++-LIBRARY-dep: gmm
+ //ff-c++-cpp-dep:
+
+ #include <cmath>
Added: packages/ffcs/trunk/debian/patches/old/ff-examples++-mpi.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/ff-examples%2B%2B-mpi.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/ff-examples++-mpi.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/ff-examples++-mpi.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,84 @@
+Index: ffcs-11.7/ff/upstream/examples++-mpi/MUMPS_FreeFem.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-mpi/MUMPS_FreeFem.cpp 2011-03-29 09:49:57.000000000 +0200
++++ ffcs-11.7/ff/upstream/examples++-mpi/MUMPS_FreeFem.cpp 2011-03-29 12:53:16.000000000 +0200
+@@ -7,7 +7,7 @@
+ // AUTHOR : Jacques Morice
+ // E-MAIL : jacques.morice at ann.jussieu.fr
+ //
+-//ff-c++-LIBRARY-dep: mumps parmetis ptscotch scalapack blacs blas mpifc fc
++//ff-c++-LIBRARY-dep: mumps_ptscotch blas ptscotch blacs scalapack mpifc fc
+ //ff-c++-cpp-dep:
+
+ /*
+Index: ffcs-11.7/ff/upstream/examples++-mpi/dSuperLU_DIST.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-mpi/dSuperLU_DIST.cpp 2011-03-29 09:49:57.000000000 +0200
++++ ffcs-11.7/ff/upstream/examples++-mpi/dSuperLU_DIST.cpp 2011-03-29 12:53:16.000000000 +0200
+@@ -1,4 +1,4 @@
+-//ff-c++-LIBRARY-dep: metis superlu_dist mpi
++//ff-c++-LIBRARY-dep: metis superlu-dist mpi
+ //ff-c++-cpp-dep:
+ /*
+ Interface freefem++ et SuperLU_DIST_2.3
+Index: ffcs-11.7/ff/upstream/examples++-mpi/complex_SuperLU_DIST_FreeFem.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-mpi/complex_SuperLU_DIST_FreeFem.cpp 2011-03-29 09:49:57.000000000 +0200
++++ ffcs-11.7/ff/upstream/examples++-mpi/complex_SuperLU_DIST_FreeFem.cpp 2011-03-29 12:53:16.000000000 +0200
+@@ -1,5 +1,5 @@
+ // for automatic compilation with ff-c++
+-//ff-c++-LIBRARY-dep: superlu_dist blas parmetis metis mpi fc
++//ff-c++-LIBRARY-dep: superlu-dist blas parmetis metis mpi fc
+ //ff-c++-cpp-dep:
+ // ORIG-DATE: 02/2009
+ // -*- Mode : c++ -*-
+Index: ffcs-11.7/ff/upstream/examples++-mpi/complex_pastix_FreeFem.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-mpi/complex_pastix_FreeFem.cpp 2011-03-29 09:49:57.000000000 +0200
++++ ffcs-11.7/ff/upstream/examples++-mpi/complex_pastix_FreeFem.cpp 2011-03-29 12:53:16.000000000 +0200
+@@ -28,7 +28,7 @@
+ Thank to the ARN () FF2A3 grant
+ ref:ANR-07-CIS7-002-01
+ */
+-//ff-c++-LIBRARY-dep: complex_pastix blas parmetis metis scotch mpi fc
++//ff-c++-LIBRARY-dep: pastix blas parmetis metis scotch mpi fc
+ //ff-c++-cpp-dep:
+ /*
+ Interface entre freefem++ et pastix
+Index: ffcs-11.7/ff/upstream/examples++-mpi/interfacepastix.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-mpi/interfacepastix.cpp 2011-03-29 09:49:57.000000000 +0200
++++ ffcs-11.7/ff/upstream/examples++-mpi/interfacepastix.cpp 2011-03-29 12:53:16.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ Interface entre freefem++ et pastix
+ */
+-//ff-c++-LIBRARY-dep: double_pastix blas parmetis metis scotch mpi fc
++//ff-c++-LIBRARY-dep: pastix blas parmetis metis scotch mpi fc
+ //ff-c++-cpp-dep:
+ #include <mpi.h>
+ #include <iostream>
+Index: ffcs-11.7/ff/upstream/examples++-mpi/real_SuperLU_DIST_FreeFem.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-mpi/real_SuperLU_DIST_FreeFem.cpp 2011-03-29 09:49:57.000000000 +0200
++++ ffcs-11.7/ff/upstream/examples++-mpi/real_SuperLU_DIST_FreeFem.cpp 2011-03-29 12:53:16.000000000 +0200
+@@ -1,5 +1,5 @@
+ // for automatic compilation with ff-c++
+-//ff-c++-LIBRARY-dep: superlu_dist blas parmetis metis mpi fc
++//ff-c++-LIBRARY-dep: superlu-dist blas parmetis metis mpi fc
+ //ff-c++-cpp-dep:
+ //
+ // ORIG-DATE: 02/2009
+Index: ffcs-11.7/ff/upstream/examples++-mpi/real_pastix_FreeFem.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-mpi/real_pastix_FreeFem.cpp 2011-03-29 09:49:57.000000000 +0200
++++ ffcs-11.7/ff/upstream/examples++-mpi/real_pastix_FreeFem.cpp 2011-03-29 12:53:16.000000000 +0200
+@@ -7,7 +7,7 @@
+ // AUTHOR : Jacques Morice
+ // E-MAIL : jacques.morice at ann.jussieu.fr
+ //
+-//ff-c++-LIBRARY-dep: double_pastix blas parmetis metis scotch mpi fc
++//ff-c++-LIBRARY-dep: pastix blas parmetis metis scotch mpi fc
+ //ff-c++-cpp-dep:
+
+ /*
Added: packages/ffcs/trunk/debian/patches/old/ff-examples-bamg.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/ff-examples-bamg.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/ff-examples-bamg.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/ff-examples-bamg.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,11 @@
+ /*
+Index: ffcs-11.7/ff/upstream/examples-bamg/test/dotest.pl
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples-bamg/test/dotest.pl 2011-03-29 12:53:57.000000000 +0200
++++ ffcs-11.7/ff/upstream/examples-bamg/test/dotest.pl 2011-03-29 12:54:05.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ # ----- clean ---
+ unlink <*.mesh>;
+ unlink <*.am_fmt>;
Added: packages/ffcs/trunk/debian/patches/old/ff-pkg-download.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/ff-pkg-download.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/ff-pkg-download.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/ff-pkg-download.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,32 @@
+Index: ffcs-11.7/ff/upstream/examples++-load/ff-pkg-download.in
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-load/ff-pkg-download.in 2011-03-08 14:31:50.000000000 +0100
++++ ffcs-11.7/ff/upstream/examples++-load/ff-pkg-download.in 2011-03-15 16:32:59.000000000 +0100
+@@ -1,3 +1,5 @@
++#!/bin/sh
++
+ ff=$0;
+ bb=`basename $0`
+ DIR=`dirname $ff`
+@@ -29,9 +31,11 @@
+ INC="$DIR/include"
+ cd "$LIB"
+ # set -x
+- for i in $LIB/WHERE.* ; do
+- sed "s;@DIR@;$DIR;" <$i
+- done
++ [ -f $LIB/WHERE.* ] && {
++ for i in $LIB/WHERE.* ; do
++ sed "s;@DIR@;$DIR;" <$i
++ done
++ }
+ # return
+ for la in arpack umfpack amd fftw3 blas lapack mmg3d; do
+ l=`echo $la |sed -e s/^tet$/tetgen/`
+@@ -53,4 +57,4 @@
+ done
+ else
+ echo error not directory $DIR/lib and $DIR/include $DIRP
+-fi
+\ No newline at end of file
++fi
Added: packages/ffcs/trunk/debian/patches/old/ff-superlu.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/ff-superlu.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/ff-superlu.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/ff-superlu.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,845 @@
+Index: ffcs-11.7/ff/upstream/examples++-load/SuperLu.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/examples++-load/SuperLu.cpp 2011-03-08 14:31:50.000000000 +0100
++++ ffcs-11.7/ff/upstream/examples++-load/SuperLu.cpp 2011-03-15 16:33:14.000000000 +0100
+@@ -1,7 +1,7 @@
+ // for automatic compilation with ff-c++
+ //ff-c++-LIBRARY-dep: superlu blas
+ //ff-c++-cpp-dep:
+-// for Super4.0 library
++//
+ #include "ff++.hpp"
+ /*
+ #include <iostream>
+@@ -15,23 +15,19 @@
+ #include "MatriceCreuse_tpl.hpp"
+ */
+ #include "slu_ddefs.h"
+-
+ #define GlobalLU_t GlobalLU_txxxx
+ #define countnz countnzxxxx
+ #define fixupL fixupLxxxx
+ #define print_lu_col print_lu_colxxxx
+ #define check_tempv check_tempvxxxx
+ #define PrintPerf PrintPerfxxxx
+-#define ilu_countnz ilu_countnzxxxx
+ #include "slu_zdefs.h"
+-
+ #undef GlobalLU_t
+ #undef countnz
+ #undef fixupL
+ #undef print_lu_col
+ #undef check_tempv
+ #undef PrintPerf
+-#undef ilu_countnz
+
+
+ template <class R> struct SuperLUDriver
+@@ -627,8 +623,7 @@
+ printf("No of nonzeros in L+U = %d\n", Lstore->nnz + Ustore->nnz - n);
+ printf("L\\U MB %.3f\ttotal MB needed %.3f\texpansions %d\n",
+ mem_usage.for_lu/1e6, mem_usage.total_needed/1e6,
+- stat.expansions
+- );
++ mem_usage.expansions);
+ fflush(stdout);
+
+ } else if ( info > 0 && lwork == -1 ) {
+Index: ffcs-11.7/ff/upstream/examples++-load/SuperLu4.cpp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ffcs-11.7/ff/upstream/examples++-load/SuperLu4.cpp 2011-03-15 16:33:14.000000000 +0100
+@@ -0,0 +1,793 @@
++// for automatic compilation with ff-c++
++//ff-c++-LIBRARY-dep: superlu blas
++//ff-c++-cpp-dep:
++// for Super4.0 library
++#include "ff++.hpp"
++/*
++#include <iostream>
++using namespace std;
++
++#include "rgraph.hpp"
++#include "error.hpp"
++#include "AFunction.hpp"
++
++//#include "lex.hpp"
++#include "MatriceCreuse_tpl.hpp"
++*/
++#include "slu_ddefs.h"
++
++#define GlobalLU_t GlobalLU_txxxx
++#define countnz countnzxxxx
++#define fixupL fixupLxxxx
++#define print_lu_col print_lu_colxxxx
++#define check_tempv check_tempvxxxx
++#define PrintPerf PrintPerfxxxx
++#define ilu_countnz ilu_countnzxxxx
++#include "slu_zdefs.h"
++
++#undef GlobalLU_t
++#undef countnz
++#undef fixupL
++#undef print_lu_col
++#undef check_tempv
++#undef PrintPerf
++#undef ilu_countnz
++
++
++template <class R> struct SuperLUDriver
++{
++
++};
++
++template <> struct SuperLUDriver<double>
++{
++ /* Driver routines */
++ static Dtype_t R_SLU_T() { return SLU_D;}
++ static void
++ gssv(superlu_options_t * p1, SuperMatrix * p2, int * p3, int * p4, SuperMatrix * p5,
++ SuperMatrix * p6, SuperMatrix * p7 , SuperLUStat_t * p8, int * p9)
++ { dgssv( p1,p2,p3,p4,p5,p6,p7,p8,p9); }
++
++
++ static void
++ gssvx(superlu_options_t * p1, SuperMatrix * p2, int * p3, int * p4, int * p5,
++ char * p6, double * p7, double * p8, SuperMatrix * p9, SuperMatrix * p10,
++ void * p11, int p12, SuperMatrix * p13, SuperMatrix * p14,
++ double * p15, double * p16, double * p17, double * p18,
++ mem_usage_t * p19, SuperLUStat_t * p20, int * p21)
++ { dgssvx( p1,p2,p3,p4,p5,p6,p7,p8,p9,p10, p11,p12,p13,p14,p15,p16,p17,p18,p19,p20, p21); }
++
++
++
++ /* Supernodal LU factor related */
++ static void
++ Create_CompCol_Matrix(SuperMatrix * p1, int p2 , int p3, int p4, double * p5,
++ int * p6, int * p7, Stype_t p8, Dtype_t p9 , Mtype_t p10)
++ {
++ dCreate_CompCol_Matrix( p1,p2,p3,p4,p5,p6,p7,p8,p9,p10);
++ }
++
++
++ static void
++ Create_CompRow_Matrix(SuperMatrix * p1, int p2, int p3, int p4, double * p5,
++ int * p6, int * p7, Stype_t p8, Dtype_t p9, Mtype_t p10)
++ {
++ dCreate_CompRow_Matrix( p1,p2,p3,p4,p5,p6,p7,p8,p9,p10);
++ }
++
++
++ static void
++ Create_Dense_Matrix(SuperMatrix * p1, int p2, int p3, double * p4, int p5,
++ Stype_t p6, Dtype_t p7, Mtype_t p8)
++ {
++ dCreate_Dense_Matrix( p1,p2,p3,p4,p5,p6,p7,p8);
++ }
++
++
++ static void
++ Create_SuperNode_Matrix(SuperMatrix * p1, int p2, int p3, int p4, double * p5,
++ int * p6, int * p7, int * p8, int * p9, int * p10,
++ Stype_t p11, Dtype_t p12, Mtype_t p13)
++ {
++ dCreate_SuperNode_Matrix( p1,p2,p3,p4,p5,p6,p7,p8,p9,p10, p11,p12,p13);
++ }
++
++ static void
++ CompRow_to_CompCol(int p1, int p2, int p3,
++ double *p4, int *p5, int *p6,
++ double **p7, int **p8, int **p9)
++ {
++ dCompRow_to_CompCol( p1, p2, p3, p4, p5, p6, p7, p8, p9);
++ }
++
++
++};
++
++
++
++template <> struct SuperLUDriver<Complex>
++{
++ /* Driver routines */
++ static Dtype_t R_SLU_T() { return SLU_Z;}
++ static doublecomplex *dc(Complex *p) { return (doublecomplex *) (void *) p;}
++ static doublecomplex **dc(Complex **p) { return (doublecomplex **) (void *) p;}
++
++ static void
++ gssv(superlu_options_t * p1, SuperMatrix * p2, int * p3, int * p4, SuperMatrix * p5,
++ SuperMatrix * p6, SuperMatrix * p7 , SuperLUStat_t * p8, int * p9)
++ { zgssv( p1,p2,p3,p4,p5,p6,p7,p8,p9); }
++
++
++ static void
++ gssvx(superlu_options_t * p1, SuperMatrix * p2, int * p3, int * p4, int * p5,
++ char * p6, double * p7, double * p8, SuperMatrix * p9, SuperMatrix * p10,
++ void * p11, int p12, SuperMatrix * p13, SuperMatrix * p14,
++ double * p15, double * p16, double * p17, double * p18,
++ mem_usage_t * p19, SuperLUStat_t * p20, int * p21)
++ { zgssvx( p1,p2,p3,p4,p5,p6,p7,p8,p9,p10, p11,p12,p13,p14,p15,p16,p17,p18,p19,p20, p21); }
++
++
++
++ /* Supernodal LU factor related */
++ static void
++ Create_CompCol_Matrix(SuperMatrix * p1, int p2 , int p3, int p4, Complex * p5,
++ int * p6, int * p7, Stype_t p8, Dtype_t p9 , Mtype_t p10)
++ {
++ zCreate_CompCol_Matrix( p1,p2,p3,p4,dc(p5),p6,p7,p8,p9,p10);
++ }
++
++
++ static void
++ Create_CompRow_Matrix(SuperMatrix * p1, int p2, int p3, int p4, Complex * p5,
++ int * p6, int * p7, Stype_t p8, Dtype_t p9, Mtype_t p10)
++ {
++ zCreate_CompRow_Matrix( p1,p2,p3,p4,dc(p5),p6,p7,p8,p9,p10);
++ }
++
++
++ static void
++ Create_Dense_Matrix(SuperMatrix * p1, int p2, int p3, Complex * p4, int p5,
++ Stype_t p6, Dtype_t p7, Mtype_t p8)
++ {
++ zCreate_Dense_Matrix( p1,p2,p3,dc(p4),p5,p6,p7,p8);
++ }
++
++
++ static void
++ Create_SuperNode_Matrix(SuperMatrix * p1, int p2, int p3, int p4, Complex * p5,
++ int * p6, int * p7, int * p8, int * p9, int * p10,
++ Stype_t p11, Dtype_t p12, Mtype_t p13)
++ {
++ zCreate_SuperNode_Matrix( p1,p2,p3,p4,dc(p5),p6,p7,p8,p9,p10, p11,p12,p13);
++ }
++
++ static void
++ CompRow_to_CompCol(int p1, int p2, int p3, Complex *p4, int *p5,
++ int *p6, Complex **p7, int **p8, int **p9)
++ {
++ zCompRow_to_CompCol( p1, p2, p3, dc(p4), p5, p6, dc(p7), p8, p9);
++ }
++
++};
++
++// read options for superlu in freefem++
++/*
++#ifdef __cpluscplus
++int s_(char *ff, ...)
++{
++ int i = 0;
++ while( *(++i+&str) != 0 )
++ if( strcmp(str, (char*)*(&str+i)) == 0)
++ return i;
++ return 0;
++}
++
++#else
++*/
++int s_(char* str, const char* cmp[])
++{
++ int i = 0;
++ while( cmp[i] != 0){
++ if( strcmp(str, cmp[i]) == 0){
++ //cout << *str << " return" << i << endl;
++ return i+1 ;
++ }
++ i++;
++ }
++ //cout << *str << " return 0" << endl;
++ return 0;
++}
++//#endif
++/*
++ static const yes_no_t enumyes_no_t[2] = {NO, YES};
++ static const fact_t enumfact_t[4] = {DOFACT, SamePattern, SamePattern_SameRowPerm, FACTORED};
++ static const colperm_t enumcolperm_t[5] = {NATURAL, MMD_ATA, MMD_AT_PLUS_A, COLAMD, MY_PERMC};
++ static const trans_t enumtrans_t[3] = {NOTRANS, TRANS, CONJ};
++ static const IterRefine_t enumIterRefine_t[4] = {NOREFINE, SINGLE, DOUBLE, EXTRA};
++
++ static const char* compyes_no_t[] = {"NO", "YES",0};
++ static const char* compfact_t[] = {"DOFACT", "SamePattern", "SamePattern_SameRowPerm", "FACTORED",0};
++ static const char* compcolperm_t[] = {"NATURAL", "MMD_ATA", "MMD_AT_PLUS_A", "COLAMD", "MY_PERMC",0};
++ static const char* comptrans_t[] = {"NOTRANS", "TRANS", "CONJ",0};
++ static const char* compIterRefine_t[] = {"NOREFINE", "SINGLE", "DOUBLE", "EXTRA",0};
++
++ static const char* comp[] = {"Fact", "Equil","ColPerm",
++ "DiagPivotThresh","Trans","IterRefine",
++ "SymmetricMode","PivotGrowth","ConditionNumber",
++ "PrintStat",0};
++*/
++
++void read_options_freefem(string string_option, superlu_options_t *options){
++ static const yes_no_t enumyes_no_t[2] = {NO, YES};
++ static const fact_t enumfact_t[4] = {DOFACT, SamePattern, SamePattern_SameRowPerm, FACTORED};
++ static const colperm_t enumcolperm_t[5] = {NATURAL, MMD_ATA, MMD_AT_PLUS_A, COLAMD, MY_PERMC};
++ static const trans_t enumtrans_t[3] = {NOTRANS, TRANS, CONJ};
++ static const IterRefine_t enumIterRefine_t[4] = {NOREFINE, SINGLE, DOUBLE, EXTRA};
++
++ static const char* compyes_no_t[] = {"NO", "YES",0};
++ static const char* compfact_t[] = {"DOFACT", "SamePattern", "SamePattern_SameRowPerm", "FACTORED",0};
++ static const char* compcolperm_t[] = {"NATURAL", "MMD_ATA", "MMD_AT_PLUS_A", "COLAMD", "MY_PERMC",0};
++ static const char* comptrans_t[] = {"NOTRANS", "TRANS", "CONJ",0};
++ static const char* compIterRefine_t[] = {"NOREFINE", "SINGLE", "DOUBLE", "EXTRA",0};
++
++ static const char* comp[] = {"Fact", "Equil","ColPerm",
++ "DiagPivotThresh","Trans","IterRefine",
++ "SymmetricMode","PivotGrowth","ConditionNumber",
++ "PrintStat",0};
++
++
++ /* Set the default values for options argument:
++ options.Fact = DOFACT;
++ options.Equil = YES;
++ options.ColPerm = COLAMD;
++ options.DiagPivotThresh = 1.0;
++ options.Trans = NOTRANS;
++ options.IterRefine = NOREFINE;
++ options.SymmetricMode = NO;
++ options.PivotGrowth = NO;
++ options.ConditionNumber = NO;
++ options.PrintStat = YES;
++ */
++ //cout << "string_option" << *string_option << endl;
++ KN<char> kdata(string_option.size()+1);
++
++ char * data=kdata;
++ strcpy( data, string_option.c_str());
++ cout << "data=" << data << endl;
++ char * tictac;
++ tictac = strtok(data," =,\t\n");
++ cout << "tictac=" << data << endl;
++// #ifdef __cplusplus
++// while(tictac != NULL){
++// int id_option = s_(tictac, "Fact", "Equil","ColPerm",
++// "DiagPivotThresh","Trans","IterRefine",
++// "SymmetricMode","PivotGrowth","ConditionNumber",
++// "PrintStat",0);
++// tictac = strtok(NULL," ,\t\n");
++// int val_options;
++// switch (id_option)
++// {
++// case 1 : // Fact
++// val_options= s_(tictac, "DOFACT", "SamePattern", "SamePattern_SameRowPerm", "FACTORED",0);
++// if( val_options == 0){
++// printf("value given for SuperLU for options %s is not correct\n","Fact");
++// exit(1);
++// }
++// options->Fact= enumfact_t[val_options-1];
++// break;
++// case 2: // Equil
++// val_options= s_(tictac, "NO", "YES", 0);
++// if( val_options == 0){
++// printf("value given for SuperLU for options %s is not correct\n","Equil");
++// exit(1);
++// }
++// options->Equil= enumyes_no_t[val_options-1];
++// break;
++// case 3: // ColPerm
++// val_options= s_(tictac,"NATURAL", "MMD_ATA", "MMD_AT_PLUS_A", "COLAMD", "MY_PERMC", 0);
++// if( val_options == 0){
++// printf("value given for SuperLU for options %s is not correct\n","ColPerm");
++// exit(1);
++// }
++// options->ColPerm= enumcolperm_t[val_options-1];
++// case 4: // DiagPivotThresh
++// options->DiagPivotThresh= strtod(tictac,&tictac);
++// break;
++// case 5: // Trans
++// val_options= s_(tictac, "NOTRANS", "TRANS", "CONJ",0);
++// if( val_options == 0){
++// printf("value given for SuperLU for options %s is not correct\n","Trans");
++// exit(1);
++// }
++// options->Trans= enumtrans_t[val_options-1];
++// break;
++// case 6: // IterRefine
++// val_options= s_(tictac, "NOREFINE", "SINGLE", "DOUBLE", "EXTRA",0);
++// if( val_options == 0){
++// printf("value given for SuperLU for options %s is not correct\n","IterRefine");
++// exit(1);
++// }
++// options->IterRefine= enumIterRefine_t[val_options-1];
++// break;
++// case 7: // SymmetricMode
++// val_options= s_(tictac, "NO","YES",0);
++// if( val_options == 0){
++// printf("value given for SuperLU for options %s is not correct\n","SymmetricMode");
++// exit(1);
++// }
++// options->SymmetricMode= enumyes_no_t[val_options-1];
++// break;
++// case 8: // PivotGrowth
++// val_options= s_(tictac, "NO","YES",0);
++// if( val_options == 0){
++// printf("value given for SuperLU for options %s is not correct\n","PivotGrowth");
++// exit(1);
++// }
++// options->PivotGrowth= enumyes_no_t[val_options-1];
++// break;
++// case 9: // ConditionNumber
++// val_options= s_(tictac, "NO","YES",0);
++// if( val_options == 0){
++// printf("value given for SuperLU for options %s is not correct\n","ConditionNumber");
++// exit(1);
++// }
++// options->ConditionNumber = enumyes_no_t[val_options-1];
++// break;
++// case 10: // PrintStat
++// val_options= s_(tictac, "NO","YES",0);
++// if( val_options == 0){
++// printf("value given for SuperLU for options %s is not correct\n","PrintStat");
++// exit(1);
++// }
++// options->PrintStat = enumyes_no_t[val_options-1];
++// break;
++// case 0: // Equivalent of case default
++// printf("A false parameter for SuperLU is given %s \n",tictac);
++// exit(1);
++// }
++// tictac = strtok(NULL," ,\t\n");
++// }
++// #else
++ while(tictac != NULL){
++ //char* comp[] = {"Fact", "Equil","ColPerm",
++ //"DiagPivotThresh","Trans","IterRefine",
++ //"SymmetricMode","PivotGrowth","ConditionNumber",
++ //"PrintStat",0 };
++ int id_option = s_(tictac, comp);
++ tictac = strtok(NULL," =,\t\n");
++ int val_options;
++
++ switch (id_option)
++ {
++ case 1 : // Fact
++ //char* comp1[] = {"DOFACT", "SamePattern", "SamePattern_SameRowPerm", "FACTORED",0};
++ val_options= s_(tictac,compfact_t);
++ if( val_options == 0){
++ printf("value given for SuperLU for options %s is not correct\n","Fact");
++ exit(1);
++ }
++ options->Fact = enumfact_t[val_options-1];
++ break;
++ case 2: // Equil
++ //char* comp2[] = {"NO", "YES", 0};
++ val_options= s_(tictac,compyes_no_t);
++ if( val_options == 0){
++ printf("value given for SuperLU for options %s is not correct\n","Equil");
++ exit(1);
++ }
++ options->Equil = enumyes_no_t[val_options-1];
++ break;
++ case 3: // ColPerm
++ //char* comp3[] = {"NATURAL", "MMD_ATA", "MMD_AT_PLUS_A", "COLAMD", "MY_PERMC", 0};
++ val_options= s_(tictac,compcolperm_t);
++ if( val_options == 0){
++ printf("value given for SuperLU for options %s is not correct\n","ColPerm");
++ exit(1);
++ }
++ options->ColPerm = enumcolperm_t[val_options-1];
++ break;
++ case 4: // DiagPivotThresh
++ options->DiagPivotThresh= strtod(tictac,&tictac);
++ break;
++ case 5: // Trans
++ //char* comp5[] = {"NOTRANS", "TRANS", "CONJ", 0};
++ val_options= s_(tictac, comptrans_t);
++ if( val_options == 0){
++ printf("value given for SuperLU for options %s is not correct\n","Trans");
++ exit(1);
++ }
++ options->Trans = enumtrans_t[val_options-1];
++ break;
++ case 6: // IterRefine
++ //char* comp6[] = {"NOREFINE", "SINGLE", "DOUBLE", "EXTRA", 0};
++ val_options= s_(tictac, compIterRefine_t);
++ if( val_options == 0){
++ printf("value given for SuperLU for options %s is not correct\n","IterRefine");
++ exit(1);
++ }
++ options->IterRefine = enumIterRefine_t[val_options-1];
++ break;
++ case 7: // SymmetricMode
++ //char* comp7[] = {"NO","YES", 0};
++ val_options= s_(tictac, compyes_no_t);
++ if( val_options == 0){
++ printf("value given for SuperLU for options %s is not correct\n","SymmetricMode");
++ exit(1);
++ }
++ options->SymmetricMode= enumyes_no_t[val_options-1];
++ break;
++ case 8: // PivotGrowth
++ //char* comp8[] = {"NO","YES", 0};
++ val_options= s_(tictac,compyes_no_t);
++ if( val_options == 0){
++ printf("value given for SuperLU for options %s is not correct\n","PivotGrowth");
++ exit(1);
++ }
++ options->PivotGrowth = enumyes_no_t[val_options-1];
++ break;
++ case 9: // ConditionNumber
++ //char* comp9[] = {"NO","YES", 0};
++ val_options= s_(tictac, compyes_no_t);
++ if( val_options == 0){
++ printf("value given for SuperLU for options %s is not correct\n","ConditionNumber");
++ exit(1);
++ }
++ options->ConditionNumber = enumyes_no_t[val_options-1];
++ break;
++ case 10: // PrintStat
++ val_options= s_(tictac, compyes_no_t);
++ if( val_options == 0){
++ printf("value given for SuperLU for options %s is not correct\n","PrintStat");
++ exit(1);
++ }
++ options->PrintStat = enumyes_no_t[val_options-1];
++ break;
++ case 0: // Equivalent of case default
++ break;
++ }
++ tictac = strtok(NULL," =,\t\n");
++ }
++ //#endif
++}
++
++
++
++
++
++
++template<class R>
++class SolveSuperLU : public MatriceMorse<R>::VirtualSolver, public SuperLUDriver<R> {
++ double eps;
++ mutable double epsr;
++ double tgv;
++ double tol_pivot_sym,tol_pivot; //Add 31 oct 2005
++
++
++ mutable char equed[1];
++ yes_no_t equil;
++ mutable SuperMatrix A, L, U;
++ NCformat *Astore;
++ NCformat *Ustore;
++ SCformat *Lstore;
++ R *a;
++ int *asub, *xa;
++ KN<int> perm_c; /* column permutation vector */
++ KN<int> perm_r; /* row permutations from partial pivoting */
++ string string_option;
++ //string *file_option;
++ //string *file_perm_r;
++ //string *file_perm_c;
++
++ KN<int> etree;
++ R *rhsb, *rhsx, *xact;
++ double *RR, *CC;
++ int m, n, nnz;
++
++ R *arow;
++ int *asubrow, *xarow;
++
++
++ mutable superlu_options_t options;
++ mutable mem_usage_t mem_usage;
++
++public:
++ SolveSuperLU(const MatriceMorse<R> &AA,int strategy,double ttgv, double epsilon,
++ double pivot,double pivot_sym, string & param_char, KN<long> pperm_r,
++ KN<long> pperm_c ) :
++ eps(epsilon),epsr(0),
++ tgv(ttgv),
++ etree(0),string_option(param_char),perm_r(pperm_r), perm_c(pperm_c),
++ RR(0), CC(0),
++ tol_pivot_sym(pivot_sym),tol_pivot(pivot)
++ {
++ SuperMatrix B, X;
++ SuperLUStat_t stat;
++ void *work=0;
++ int info, lwork=0, nrhs=1;
++ int i;
++ double ferr[1];
++ double berr[1];
++ double rpg, rcond;
++
++ R *bb;
++ R *xx;
++
++ A.Store=0;
++ B.Store=0;
++ X.Store=0;
++ L.Store=0;
++ U.Store=0;
++
++ int status;
++
++ n=AA.n;
++ m=AA.m;
++ nnz=AA.nbcoef;
++
++ arow=AA.a;
++ asubrow=AA.cl;
++ xarow=AA.lg;
++
++ /* FreeFem++ use Morse Format */
++ CompRow_to_CompCol(m, n, nnz, arow, asubrow, xarow,
++ &a, &asub, &xa);
++
++ /* Defaults */
++ lwork = 0;
++ nrhs = 0;
++
++ /* Set the default values for options argument:
++ options.Fact = DOFACT;
++ options.Equil = YES;
++ options.ColPerm = COLAMD;
++ options.DiagPivotThresh = 1.0;
++ options.Trans = NOTRANS;
++ options.IterRefine = NOREFINE;
++ options.SymmetricMode = NO;
++ options.PivotGrowth = NO;
++ options.ConditionNumber = NO;
++ options.PrintStat = YES;
++ */
++ set_default_options(&options);
++
++ printf(".. default options:\n");
++ printf("\tFact\t %8d\n", options.Fact);
++ printf("\tEquil\t %8d\n", options.Equil);
++ printf("\tColPerm\t %8d\n", options.ColPerm);
++ printf("\tDiagPivotThresh %8.4f\n", options.DiagPivotThresh);
++ printf("\tTrans\t %8d\n", options.Trans);
++ printf("\tIterRefine\t%4d\n", options.IterRefine);
++ printf("\tSymmetricMode\t%4d\n", options.SymmetricMode);
++ printf("\tPivotGrowth\t%4d\n", options.PivotGrowth);
++ printf("\tConditionNumber\t%4d\n", options.ConditionNumber);
++ printf("..\n");
++
++ if(!string_option.empty()) read_options_freefem(string_option,&options);
++
++ printf(".. options:\n");
++ printf("\tFact\t %8d\n", options.Fact);
++ printf("\tEquil\t %8d\n", options.Equil);
++ printf("\tColPerm\t %8d\n", options.ColPerm);
++ printf("\tDiagPivotThresh %8.4f\n", options.DiagPivotThresh);
++ printf("\tTrans\t %8d\n", options.Trans);
++ printf("\tIterRefine\t%4d\n", options.IterRefine);
++ printf("\tSymmetricMode\t%4d\n", options.SymmetricMode);
++ printf("\tPivotGrowth\t%4d\n", options.PivotGrowth);
++ printf("\tConditionNumber\t%4d\n", options.ConditionNumber);
++ printf("..\n");
++
++ Dtype_t R_SLU = SuperLUDriver<R>::R_SLU_T();
++
++ Create_CompCol_Matrix(&A, m, n, nnz, a, asub, xa, SLU_NC, R_SLU, SLU_GE);
++
++ Create_Dense_Matrix(&B, m, 0, (R*) 0, m, SLU_DN, R_SLU, SLU_GE);
++ Create_Dense_Matrix(&X, m, 0, (R*) 0, m, SLU_DN, R_SLU, SLU_GE);
++
++
++ if ( etree.size() ==0 ) etree.resize(n);
++ if ( perm_r.size() ==0 ) perm_r.resize(n);
++ if ( perm_c.size() ==0 ) perm_c.resize(n);
++
++ if ( !(RR = new double[n]) )
++ ABORT("SUPERLU_MALLOC fails for R[].");
++ for(int ii=0; ii<n; ii++){
++ RR[ii]=1.;
++ }
++ if ( !(CC = new double[m]) )
++ ABORT("SUPERLU_MALLOC fails for C[].");
++ for(int ii=0; ii<n; ii++){
++ CC[ii]=1.;
++ }
++ ferr[0]=0;
++ berr[0]=0;
++ /* Initialize the statistics variables. */
++ StatInit(&stat);
++
++ /* ONLY PERFORM THE LU DECOMPOSITION */
++ B.ncol = 0; /* Indicate not to solve the system */
++ SuperLUDriver<R>::gssvx(&options, &A, perm_c, perm_r, etree, equed, RR, CC,
++ &L, &U, work, lwork, &B, &X, &rpg, &rcond, ferr, berr,
++ &mem_usage, &stat, &info);
++
++
++
++ if(verbosity>2)
++ printf("LU factorization: dgssvx() returns info %d\n", info);
++ if(verbosity>3)
++ {
++ if ( info == 0 || info == n+1 ) {
++
++ if ( options.PivotGrowth ) printf("Recip. pivot growth = %e\n", rpg);
++ if ( options.ConditionNumber )
++ printf("Recip. condition number = %e\n", rcond);
++ Lstore = (SCformat *) L.Store;
++ Ustore = (NCformat *) U.Store;
++ printf("No of nonzeros in factor L = %d\n", Lstore->nnz);
++ printf("No of nonzeros in factor U = %d\n", Ustore->nnz);
++ printf("No of nonzeros in L+U = %d\n", Lstore->nnz + Ustore->nnz - n);
++ printf("L\\U MB %.3f\ttotal MB needed %.3f\texpansions %d\n",
++ mem_usage.for_lu/1e6, mem_usage.total_needed/1e6,
++ stat.expansions
++ );
++ fflush(stdout);
++
++ } else if ( info > 0 && lwork == -1 ) {
++ printf("** Estimated memory: %d bytes\n", info - n);
++ }
++ }
++ if ( verbosity>5 ) StatPrint(&stat);
++ StatFree(&stat);
++ if( B.Store) Destroy_SuperMatrix_Store(&B);
++ if( X.Store) Destroy_SuperMatrix_Store(&X);
++ options.Fact = FACTORED; /* Indicate the factored form of A is supplied. */
++
++
++ }
++ void Solver(const MatriceMorse<R> &AA,KN_<R> &x,const KN_<R> &b) const {
++ SuperMatrix B, X;
++ SuperLUStat_t stat;
++ void *work=0;
++ int info=0, lwork=0, nrhs=1;
++ int i;
++ double ferr[1], berr[1];
++ double rpg, rcond;
++ double *xx;
++
++ B.Store=0;
++ X.Store=0;
++ ffassert ( &x[0] != &b[0]);
++ epsr = (eps < 0) ? (epsr >0 ? -epsr : -eps ) : eps ;
++ Dtype_t R_SLU = SuperLUDriver<R>::R_SLU_T();
++
++
++ Create_Dense_Matrix(&B, m, 1, b, m, SLU_DN, R_SLU, SLU_GE);
++ Create_Dense_Matrix(&X, m, 1, x, m, SLU_DN, R_SLU, SLU_GE);
++
++ B.ncol = nrhs; /* Set the number of right-hand side */
++
++ /* Initialize the statistics variables. */
++ StatInit(&stat);
++
++
++ SuperLUDriver<R>::gssvx(&options, &A, perm_c, perm_r, etree, equed, RR, CC,
++ &L, &U, work, lwork, &B, &X, &rpg, &rcond, ferr, berr,
++ &mem_usage, &stat, &info);
++
++
++
++ if(verbosity>2)
++ printf("Triangular solve: dgssvx() returns info %d\n", info);
++
++
++
++ if(verbosity>3)
++ {
++ if ( info == 0 || info == n+1 ) {
++
++ /* This is how you could access the solution matrix. */
++ R *sol = (R*) ((DNformat*) X.Store)->nzval;
++
++
++ if ( options.IterRefine ) {
++ printf("Iterative Refinement:\n");
++ printf("%8s%8s%16s%16s\n", "rhs", "Steps", "FERR", "BERR");
++ printf("%8d%8d%16e%16e\n", i+1, stat.RefineSteps, ferr[0], berr[0]);
++ }
++ fflush(stdout);
++ } else if ( info > 0 && lwork == -1 ) {
++ printf("** Estimated memory: %d bytes\n", info - n);
++ }
++ }
++
++
++ //cout << " x min max " << x.min() << " " <<x.max() << endl;
++ //cout << "=========================================" << endl;
++ if( B.Store) Destroy_SuperMatrix_Store(&B);
++ if( X.Store) Destroy_SuperMatrix_Store(&X);
++ }
++
++ ~SolveSuperLU() {
++ if(verbosity>3)
++ cout << "~SolveSuperLU S:" << endl;
++ // if (etree) delete[] etree;
++ // if (perm_r) delete[] perm_r;
++ // if (perm_c) delete[] perm_c;
++ if (RR) delete[] RR;
++ if (CC) delete[] CC;
++ if( A.Store) Destroy_SuperMatrix_Store(&A);
++ if( L.Store) Destroy_SuperNode_Matrix(&L);
++ if( U.Store) Destroy_CompCol_Matrix(&U);
++
++ }
++ void addMatMul(const KN_<R> & x, KN_<R> & Ax) const
++ {
++ ffassert(x.N()==Ax.N());
++ Ax += (const MatriceMorse<R> &) (*this) * x;
++ }
++
++};
++
++MatriceMorse<double>::VirtualSolver *
++BuildSolverSuperLU(DCL_ARG_SPARSE_SOLVER(double,A))
++{
++ if(verbosity>9)
++ cout << " BuildSolverSuperLU<double>" << endl;
++ return new SolveSuperLU<double>(*A,ds.strategy,ds.tgv,ds.epsilon,ds.tol_pivot,ds.tol_pivot_sym,ds.sparams,ds.perm_r,ds.perm_c);
++}
++
++MatriceMorse<Complex>::VirtualSolver *
++BuildSolverSuperLU(DCL_ARG_SPARSE_SOLVER(Complex,A))
++{
++ if(verbosity>9)
++ cout << " BuildSolverSuperLU<Complex>" << endl;
++ return new SolveSuperLU<Complex>(*A,ds.strategy,ds.tgv,ds.epsilon,ds.tol_pivot,ds.tol_pivot_sym,ds.sparams,ds.perm_r,ds.perm_c);
++}
++
++
++class Init { public:
++ Init();
++};
++
++// the 2 default sparse solver double and complex
++DefSparseSolver<double>::SparseMatSolver SparseMatSolver_R ; ;
++DefSparseSolver<Complex>::SparseMatSolver SparseMatSolver_C;
++// the default probleme solver
++TypeSolveMat::TSolveMat TypeSolveMatdefaultvalue=TypeSolveMat::defaultvalue;
++
++bool SetDefault()
++{
++ if(verbosity>1)
++ cout << " SetDefault sparse to default" << endl;
++ DefSparseSolver<double>::solver =SparseMatSolver_R;
++ DefSparseSolver<Complex>::solver =SparseMatSolver_C;
++ TypeSolveMat::defaultvalue =TypeSolveMat::SparseSolver;
++}
++
++bool SetSuperLU4()
++{
++ if(verbosity>1)
++ cout << " SetDefault sparse solver to SuperLU4" << endl;
++ DefSparseSolver<double>::solver =BuildSolverSuperLU;
++ DefSparseSolver<Complex>::solver =BuildSolverSuperLU;
++ TypeSolveMat::defaultvalue =TypeSolveMatdefaultvalue;
++}
++
++
++
++Init init;
++Init::Init()
++{
++
++ SparseMatSolver_R= DefSparseSolver<double>::solver;
++ SparseMatSolver_C= DefSparseSolver<Complex>::solver;
++
++ if(verbosity>1)
++ cout << "\n Add: SuperLU4, defaultsolver defaultsolverSuperLU4" << endl;
++ TypeSolveMat::defaultvalue=TypeSolveMat::SparseSolver;
++ DefSparseSolver<double>::solver =BuildSolverSuperLU;
++ DefSparseSolver<Complex>::solver =BuildSolverSuperLU;
++ if(! Global.Find("defaultsolver").NotNull() )
++ Global.Add("defaultsolver","(",new OneOperator0<bool>(SetDefault));
++ Global.Add("defaulttoSuperLU4","(",new OneOperator0<bool>(SetSuperLU4));
++}
++
Added: packages/ffcs/trunk/debian/patches/old/ffcs-dev.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/ffcs-dev.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/ffcs-dev.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/ffcs-dev.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,282 @@
+Index: ffcs-11.9/ff/upstream/examples++-load/Makefile.am
+===================================================================
+--- ffcs-11.9.orig/ff/upstream/examples++-load/Makefile.am 2011-04-07 16:06:46.000000000 +0200
++++ ffcs-11.9/ff/upstream/examples++-load/Makefile.am 2011-04-07 16:06:46.000000000 +0200
+@@ -135,6 +135,12 @@
+ ../config.status --file=$@:$@.in
+ chmod a+x $@
+ -if [ -d ../download/bin ] ;then cp $@ ../download/bin; fi
++ffcs-get-dep:ffcs-get-dep.in
++ ../config.status --file=$@:$@.in
++ chmod a+x $@
++ffcs-c++:ffcs-c++.in
++ ../config.status --file=$@:$@.in
++ chmod a+x $@
+ WHERE_LIBRARY-download:ff-pkg-download FORCE WHERE_LIBRARY-config
+ ./ff-pkg-download >$@-new
+ if [ -f $@ ] ; then { diff $@-new $@ || cp $@-new $@ ; }; fi;
+Index: ffcs-11.9/ff/upstream/examples++-load/ffcs-get-dep.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ffcs-11.9/ff/upstream/examples++-load/ffcs-get-dep.in 2011-04-07 16:06:46.000000000 +0200
+@@ -0,0 +1,59 @@
++#!/bin/sh
++# ff-c++ `./ff-get-dep -ff metis.cpp`
++wherelib=WHERE_LIBRARY
++if [ -f "$wherelib-download" ] ; then
++ wherelib=WHERE_LIBRARY
++elif [ -f '@libdir@/freefem++-cs/Contents/Linux/WHERE_LIBRARY-download' ] ; then
++ wherelib='@libdir@/freefem++-cs/Contents/Linux/WHERE_LIBRARY'
++else
++ echo " error no WHERE_LIBRARY file "
++ exit 1;
++fi
++
++
++case "$1" in
++ -i*)
++ shift;
++ for i in $@ ; do
++ # echo "$1"
++ # echo awk -v p="$1" -v m=INCLUDE ' ($1 == p) && ($2 == m) { for (i=3;i<=NF;++i) {print $i," ";}}' $wherelib $wherelib-download
++ awk -v p="$i" -v m=INCLUDE ' ($1 == p) && ($2 == m) && (!first){ first=1;for (i=3;i<=NF;++i) {print $i," ";}}' "$wherelib" "$wherelib"-config "$wherelib"-download
++ done
++
++ ;;
++ -l*)
++ shift;
++ for i in $@ ; do
++ awk -v p="$i" -v m=LD ' ($1 == p) && ($2 == m) && (!first) {first=1; for (i=3;i<=NF;++i) {print $i," "};}
++ END { if(!first) print "ERROR-missing-lib:" p;} ' "$wherelib" "$wherelib"-config "$wherelib"-download
++ done
++ ;;
++ -dlib)
++ shift
++ awk -F: '/ff-c[+][+]-LIBRARY-dep/ { print $2}' $@
++ ;;
++ -dcpp)
++ shift
++ awk -F: '/ff-c[+][+]-cpp-dep/ { print $2}' $@
++ echo $@
++ ;;
++ -ff)
++ shift;
++ libs=`$0 -dlib $@`
++ cpp=`$0 -dcpp $@`
++ inclins=`$0 -i $libs`
++ ldlibs=`$0 -l $libs`
++ if [ -n "$ldlibs" -o -z "$libs" ]; then
++ echo "$cpp" "$inclins" "$ldlibs"
++ else
++ echo " erreur find libs of $0 : $libs " 1>&2
++ fi
++ ;;
++ *)
++ for i in $@ ; do
++ awk -v p="$i" ' ($1 == p) { k=0; for (i=3;i<=NF;++i) {k=1;} print k}' "$wherelib" "$wherelib"-config "$wherelib"-download
++ done
++
++shift;;
++esac
++
+Index: ffcs-11.9/ff/upstream/examples++-load/ffcs-c++.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ffcs-11.9/ff/upstream/examples++-load/ffcs-c++.in 2011-04-07 16:28:09.000000000 +0200
+@@ -0,0 +1,196 @@
++#!/bin/sh
++# Create a loadable object from a C++ function defined in a .cpp file
++# $Id$
++thecommand="$0"
++#dircommand=`dirname "$0"`
++
++FFVERSION='@VERSION@'
++FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@'
++FFFFLAGS='@FFLAGS@'
++FFFLIBS='@FLIBS@'
++INCFF='-I at includedir@/freefem++-cs'
++
++do="yes"
++DEBUG=""
++CONLY="false"
++uu=`uname -s`
++INC=""
++LIBS=""
++DLL=""
++bin="."
++out=""
++files=""
++fileso=""
++OTHER="";
++WIN32="";
++
++autodep=""
++withmpi=""
++args=""
++
++while [ $# -ne 0 ] ; do
++ argsp=$args
++ args="$args '$1'"
++ case "$1" in
++ -[h?]*) echo usage $0 "[-n] [-g] [-win32] [-l libfile] [-I includedir] files"
++ echo " -auto : build automaticaly the dependance (in test FH) "
++ echo " -n : do nothing just print"
++ echo " -g : compile with -g option"
++ echo " -c : compile only"
++ echo " -mpi: with mpi"
++ echo " -O* : compile with -O* option"
++ echo " -cygwin: compile for cygwin/win32 OS (Window XP, ...)"
++ echo " -win32: compile for win32 OS (Window XP, ...) default under cygwin"
++ echo " -l files add files to the ld process (link)"
++ echo " -I dir add dir in include seach dir for compilation"
++ echo " -b dir to change the default install dir "
++ echo " -dll file add dll and this file copie in the install dir"
++ echo " -o outputfile without suffix"
++ echo " file.{cpp,cp,cxx,c,f,F}"
++ exit 0;
++ ;;
++ F77=*) F77=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
++ CXX=*) CXX=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
++ MPICXX=*) MPICXX=`echo $1|sed 's/[A-Z0-9]*=//'`;withmpi=yes ;;
++ F77=*) F77=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
++ CXXFLAGS=*) CXXFLAGS=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
++ FFLAGS=*) FFFFLAGS=`echo $1|sed 's/[A-Z0-9]*=//'` ;;
++ -auto) autodep=yes;args=$argsp;;
++ -mpi) withmpi=yes;;
++ -n) do="no";;
++ -g) DEBUG="$DEBUG $1";;
++ -c) CONLY=yes;;
++ -O*) DEBUG="$DEBUG $1";;
++ -cygwin) onwin32=1; uu="cygwin-version";;
++ -win32) onwin32=1; uu="win32";;
++ -b) bin=$2 ; shift;;
++ -I*) INC="$INC '$1'";;
++ -D*) INC="$INC '$1'";;
++ -dll) DLL="$DLL '$2'";shift;;
++ -[Ll]*) LIBS="$LIBS $1" ;;
++ *.a) LIBS="$LIBS $1" ;;
++ *.so) LIBS="$LIBS $1" ;;
++ *.dll) if [ -f "$1" ] ; then LIBS="$LIBS '$1'"
++ elif [ -f "$bin/$1" ] ; then LIBS="$LIBS '$bin/$1'"
++ else
++ echo " erreur file not found $1" ;
++ exit 1;
++ fi;;
++ -Wl*) LIBS="$LIBS $1" ;;
++ *.cpp) files="$files '$1'"; o=`basename "$1" .cpp` ; fileso="$fileso '$o.o'"; args=$argsp;;
++ *.cp) files="$files '$1'"; o=`basename "$1" .cp` ; fileso="$fileso '$o.o'"; args=$argsp;;
++ *.cxx) files="$files '$1'"; o=`basename "$1" .cxx` ; fileso="$fileso '$o.o'"; args=$argsp;;
++ *.c) files="$files '$1'"; o=`basename "$1" .c` ; fileso="$fileso '$o.o'"; args=$argsp;;
++ *.f) ffiles="$ffiles '$1'"; o=`basename "$1" .f` ; fileso="$fileso '$o.o'";;
++ *.F) ffiles="$ffiles '$1'"; o=`basename "$1" .F` ; fileso="$fileso '$o.o'";;
++ *.o) fileso="$fileso '$1'"; o=`basename "$1" .o` ;;
++ -o) out="$2"; shift;;
++ *) OTHER="$OTHER $1";;
++ esac
++ shift
++done
++if [ -n "$autodep" ] ; then
++# echo "$thecommand" $args `eval "'$dircommand/ff-get-dep'" -ff $files`
++ argsdep=`eval "'ffcs-get-dep'" -ff $files`
++
++ error=`echo "$argsdep"| grep ERROR`
++ if [ -n "$error" ] ; then
++ echo " ERROR in auto dependance seach. sorry : $error "
++ exit 0;
++ fi
++ echo eval "$thecommand" $args $argsdep
++ eval "$thecommand" $args $argsdep
++
++ # FFCS needs an error exit code to make sure that all libraries
++ # are correctly compiled
++ ###exit 0;
++ exit $?;
++fi
++
++if [ -n "$onwin32" -a ! -f "$bin/libff.dll" ] ; then
++ echo " Error the file libff.dll must be exist in '$bin' the install directory,"
++ echo " to link on windows OS "
++ echo " Use the parameter -b to set the correct install directory "
++ exit 1;
++fi
++
++if [ -z "$out" ] ; then out=$o ; fi;
++# Default compiler
++if [ -z "$CXX" ];then CXX=g++ ; fi
++if [ -n "$withmpi" ]; then CXX=$MPICXX;fi
++
++INC="$INCFF $INC"
++SUF=so
++SHARED="-shared"
++case "$WIN32$uu" in
++ Darwin*)
++# echo "export MACOSX_DEPLOYMENT_TARGET=10.3"
++ export MACOSX_DEPLOYMENT_TARGET=10.4
++ SUF=dylib
++ SHARED="-bundle -undefined dynamic_lookup" ;;
++ win32-CYGWIN*|win32-win32)
++ echo " Window without cygwin "
++ b="$bin"
++ LIBS=" '$b/libff.dll' $LIBS $DLL"
++ SHARED="-shared --unresolved-symbols=ignore-all -Wl,--enable-auto-import"
++ FLAGS=' -mno-cygwin '
++ SUF=dll;;
++ win32-cygwin-version)
++ echo " cygwin-version "
++ b=$bin
++ FLAGS=' '
++ LIBS="'$b/libff.dll' $LIBS $DLL"
++ SUF=dll;;
++ FreeBSD|NetBSD)
++ SHARED="-shared"
++ FLAGS='-fPIC';;
++ # 64 bit Linux needs -fPIC (ALH)
++ SunOS)
++ SHARED="-shared"
++ FLAGS='-fPIC';;
++ # 64 bit Linux needs -fPIC (ALH)
++ Linux)
++ FLAGS='-fPIC'
++ SHARED="-shared " ;;
++ *)
++ echo "sorry unknown achitecture "`uname`
++ exit 1;;
++esac
++FLAGS="$FLAGS $DEBUG $FFCXXFLAGS"
++if [ -n "$ffiles$files$fileso" ] ; then
++ if [ -n "$WIN32" -a ! -f "$bin/libff.dll" ]; then
++ echo " Sorry, no freefem .dll file (libff.dll) in $bin dir "
++ echo " try with -b dir-path where the file libff.dll exist"
++ exit 1;
++ fi
++ if [ "$files" ] ;then
++ echo $CXX -c $FLAGS $CXXFLAGS $INC $PIC $files
++ if [ $do = yes ] ; then
++ eval $CXX -c $INC $FLAGS $CXXFLAGS $PIC $files
++ ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
++ fi
++ fi
++ if [ "$ffiles" ] ;then
++ echo $F77 -c $FLAGS $FFFFLAGS $INC $PIC $ffiles
++ LIBS="$FFFLIBS $LIBS"
++ if [ $do = yes ] ; then
++ eval $F77 -c $INC $FLAGS $FFFFLAGS $PIC $ffiles
++ ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
++ fi
++ fi
++ if [ "$CONLY" != yes ]; then
++ echo $CXX $SHARED $FLAGS $CXXFLAGS $fileso -o $out.$SUF $LIBS $DLL $OTHER $MPI_LIB
++ if [ $do = yes ] ; then
++ eval $CXX $SHARED $FLAGS $CXXFLAGS $fileso -o $out.$SUF $LIBS $DLL $OTHER $MPI_LIB
++ ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
++ fi
++ if [ "$bin" != "." ]; then
++ echo cp $out.$SUF $bin
++ test $do = yes && cp $out.$SUF "$bin"
++ fi
++ if [ -n "$DLL" ] ; then
++ echo cp $DLL $bin
++ test $do = yes && cp $DLL "$bin"
++ fi
++ fi
++fi
Added: packages/ffcs/trunk/debian/patches/old/gcc45.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/gcc45.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/gcc45.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/gcc45.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,13 @@
+Index: ffcs-11.7/ff/upstream/src/medit/Makefile.am
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/src/medit/Makefile.am 2011-03-31 08:06:46.000000000 +0200
++++ ffcs-11.7/ff/upstream/src/medit/Makefile.am 2011-03-31 08:07:00.000000000 +0200
+@@ -17,7 +17,7 @@
+ eigenv.h grafic.h medit.h sproto.h
+
+
+-LDADD=picking.$(OBJEXT) ../libMesh/libMesh.a $(LIBSGLUT)
++LDADD=picking.$(OBJEXT) ../libMesh/libMesh.a $(LIBSGLUT) -lm
+ INCLUDES=-I../libMesh
+ BUILT_SOURCES=compil.date
+ compil.date: $(ffmedit_SOURCES)
Added: packages/ffcs/trunk/debian/patches/old/gcc46.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/gcc46.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/gcc46.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/gcc46.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,15 @@
+Index: ffcs-11.10/src/regression.cpp
+===================================================================
+--- ffcs-11.10.orig/src/regression.cpp 2011-10-03 10:31:01.000000000 +0200
++++ ffcs-11.10/src/regression.cpp 2011-10-03 10:31:03.000000000 +0200
+@@ -992,9 +992,7 @@
+
+ /// warns the user that regression tests are in progress
+ void showstandby(void*){
+- fl_alert((string("Regression tests in progress\n")
+- +"Final report in "+logfile+"\n"
+- +"Press \"Close\" to interrupt").c_str());
++ fl_alert("Regression tests in progress\nFinal report in %s Press \"Close\" to interrupt", logfile.c_str());
+ quitcode(1,true);
+ }
+
Added: packages/ffcs/trunk/debian/patches/old/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/install.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/install.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/install.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,111 @@
+Index: ffcs-11.8/pack/Makefile.am
+===================================================================
+--- ffcs-11.8.orig/pack/Makefile.am 2011-04-05 10:36:27.000000000 +0200
++++ ffcs-11.8/pack/Makefile.am 2011-04-05 11:12:36.000000000 +0200
+@@ -316,7 +316,7 @@
+
+ examples:examples-dir examples-main examples-tutorial examples-3d \
+ examples-eigen examples-mpi examples-chapt3 examples-other \
+- examples-load examples-ffcs
++ examples-load examples-ffcs examples-bamg
+ examples-dir:${resdir}/examples
+ ${resdir}/examples:
+ mkdir -p $@
+@@ -328,6 +328,8 @@
+ rsync -avq --delete ../ff/upstream/examples++-3d/ ${resdir}/examples/3d
+ examples-eigen:
+ rsync -avq --delete ../ff/upstream/examples++-eigen/ ${resdir}/examples/eigen
++examples-bamg:
++ rsync -avq --delete ../ff/upstream/examples-bamg/ ${resdir}/examples/bamg
+
+ # we remove all dlls from examples++-mpi (they are already in lib/).
+ examples-mpi:
+@@ -487,7 +489,7 @@
+
+ if LINUX
+ install:filetree
+- cd work && ./install_as_root ${prefix} ${bindir}
++ cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
+ endif
+ if MACOS
+ install:finaldir
+@@ -499,7 +501,7 @@
+ # because the actual install would need administrator credentials, and
+ # we want to run tests unattended.
+ install:filetree
+- cd work && ./install_as_root ${prefix} ${bindir}
++ cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
+ endif
+
+ # Source package check
+Index: ffcs-11.8/pack/install.m4
+===================================================================
+--- ffcs-11.8.orig/pack/install.m4 2011-04-05 10:36:27.000000000 +0200
++++ ffcs-11.8/pack/install.m4 2011-04-05 10:36:27.000000000 +0200
+@@ -47,11 +47,6 @@
+ prefix=$1
+ fi
+
+-# actual file transfer
+-mkdir -p $prefix
+-installdir="$prefix/FreeFem++-cs VERSION"
+-rsync -a "$location/" "$installdir"
+-
+ # links to the executable in a standard 'bin' directory given by $2
+ # (default is /usr/local/bin)
+ bindir=$prefix/bin
+@@ -59,7 +54,20 @@
+ then
+ bindir=$2
+ fi
+-mkdir -p $bindir
++
++ # select destination ($3) or use default
++DESTDIR=
++if test "$3" != ""
++then
++ DESTDIR=$3
++fi
++
++# actual file transfer
++installdir="$DESTDIR/$prefix/lib/freefem++-cs"
++mkdir -p $installdir
++rsync -a "$location/" "$installdir"
++
++mkdir -p $DESTDIR/$bindir
+
+ #find script (which may be at a different location and with a
+ #different name in Linux and Mac setups)
+@@ -89,15 +97,15 @@
+ }
+
+ ifelse(ENABLE_CLIENT,yes,
+-publishscript "$ffcsscript" $bindir/FreeFem++-cs
+-publishscript "$ffcsscript" $bindir/FreeFem++-cs-VERSION
+-publishscript "$ffgscript" $bindir/ffg
+-publishscript "$ffgscript" $bindir/ffg-VERSION)
++publishscript "$ffcsscript" $DESTDIR/$bindir/FreeFem++-cs
++publishscript "$ffcsscript" $DESTDIR/$bindir/FreeFem++-cs-VERSION
++publishscript "$ffgscript" $DESTDIR/$bindir/ffg
++publishscript "$ffgscript" $DESTDIR/$bindir/ffg-VERSION)
+ ifelse(ENABLE_SERVER,yes,
+-publishscript "$ffsscript" $bindir/ffs
+-publishscript "$ffsscript" $bindir/ffs-VERSION
+-publishscript "$ffsscript" $bindir/ffsmpi
+-publishscript "$ffsscript" $bindir/ffsmpi-VERSION)
++publishscript "$ffsscript" $DESTDIR/$bindir/ffs
++publishscript "$ffsscript" $DESTDIR/$bindir/ffs-VERSION
++publishscript "$ffsscript" $DESTDIR/$bindir/ffsmpi
++publishscript "$ffsscript" $DESTDIR/$bindir/ffsmpi-VERSION)
+
+ # completing the uninstall script
+ echo rm $bindir/FreeFem++-cs-VERSION-uninstall >> "$uninstall"
+@@ -105,7 +113,7 @@
+ echo echo Uninstall OK >> "$uninstall"
+
+ chmod a+x "$uninstall"
+-ln -s -f "$uninstall" $bindir/FreeFem++-cs-VERSION-uninstall
++ln -s -f "$uninstall" $DESTDIR/$bindir/FreeFem++-cs-VERSION-uninstall
+
+ # Local Variables:
+ # mode:shell-script
Added: packages/ffcs/trunk/debian/patches/old/pref.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/pref.patch?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/pref.patch (added)
+++ packages/ffcs/trunk/debian/patches/old/pref.patch Mon Nov 14 09:50:22 2011
@@ -1,0 +1,13 @@
+Index: ffcs-11.7/ff/upstream/src/fflib/environment.cpp
+===================================================================
+--- ffcs-11.7.orig/ff/upstream/src/fflib/environment.cpp 2011-03-30 15:10:46.000000000 +0200
++++ ffcs-11.7/ff/upstream/src/fflib/environment.cpp 2011-03-30 15:10:49.000000000 +0200
+@@ -265,7 +265,7 @@
+ void GetEnvironment()
+ {
+ char * ff_verbosity=0,* ff_loadpath=0,* ff_incpath=0,* home=0;
+- string ffpref="freefem++.pref";
++ string ffpref="freefem++-cs.pref";
+ #ifdef HAVE_GETENV
+ ff_verbosity = getenv("FF_VERBOSITY");
+ ff_loadpath = getenv("FF_LOADPATH");
Added: packages/ffcs/trunk/debian/patches/old/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/old/series?rev=44028&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/old/series (added)
+++ packages/ffcs/trunk/debian/patches/old/series Mon Nov 14 09:50:22 2011
@@ -1,0 +1,12 @@
+install.patch
+configure.patch
+ff-configure.patch
+ff-examples++-load.patch
+ff-pkg-download.patch
+ff-superlu.patch
+ff-examples++-mpi.patch
+ff-examples-bamg.patch
+#gcc45.patch
+#ff-c++.patch
+ffcs-dev.patch
+gcc46.patch
Modified: packages/ffcs/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/series?rev=44028&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/series (original)
+++ packages/ffcs/trunk/debian/patches/series Mon Nov 14 09:50:22 2011
@@ -1,12 +1,11 @@
install.patch
configure.patch
-ff-configure.patch
-ff-examples++-load.patch
-ff-pkg-download.patch
-ff-superlu.patch
-ff-examples++-mpi.patch
-ff-examples-bamg.patch
-#gcc45.patch
-#ff-c++.patch
+fltk.patch
+#
+ff-examples++-load-Makefile.patch
+ff-kfreebsd.patch
+ff-examples-bamg-test-dotest-pl.patch
+ff-examples-load-WHERE-LIBRARY.patch
+#
ffcs-dev.patch
-gcc46.patch
+ff-gcc4.6.patch
Modified: packages/ffcs/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/rules?rev=44028&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/rules (original)
+++ packages/ffcs/trunk/debian/rules Mon Nov 14 09:50:22 2011
@@ -21,6 +21,13 @@
#export CXX=g++-4.5
#export CC=gcc-4.5
#export FC=gfortran-4.5
+
+#include /usr/share/hardening-includes/hardening.make
+#
+#CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+#LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+#CFLAGS+=$(HARDENING_CFLAGS)
+#LDFLAGS+=$(HARDENING_LDFLAGS)
update-config::
rm -f configure
@@ -86,27 +93,32 @@
cd $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/doc .
# Install binaries
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/ffg $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs
+ #install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/ffg $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs
install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-cs $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs
+ install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-vtk $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs
mkdir -p $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffmedit \
$(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffg \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
+ #install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffg \
+ # $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffglut \
$(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/FreeFem++-cs\ $(DEB_UPSTREAM_VERSION) \
$(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
+ install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/FreeFem++-vtk \
+ $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
# Strip binaries
- strip $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/ffg
+ #strip $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/ffg
strip $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/FreeFem++-cs
+ strip $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/FreeFem++-vtk
# Client side (?)
mkdir -p $(CURDIR)/debian/ffcs-client/usr/bin
- cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/Contents/Linux/ffc .
- cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/ffg .
- cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/ffg ffg-$(version)
+ install $(CURDIR)/debian/tmp/usr/bin/FreeFem++-client $(CURDIR)/debian/ffcs-client/usr/bin
+ install $(CURDIR)/debian/tmp/usr/bin/FreeFem++-vtk $(CURDIR)/debian/ffcs-client/usr/bin
+ #cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/ffg .
+ #cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/ffg ffg-$(version)
cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-cs .
cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-cs FreeFem++-cs-$(version)
@@ -149,26 +161,21 @@
# Install binaries (?)
mkdir -p $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/ffs* $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs
+ install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-server $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs
+ install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-mpiserver $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs
install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/uninstall $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffc \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffs \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffsmpi \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/FreeFem++-cs\ $(DEB_UPSTREAM_VERSION) \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
+ install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/FreeFem++-*server \
+ $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs/Contents/Linux
# Strip binaries
- strip $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs/ffs*
+ strip $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs/FreeFem++-*server
# Server (?)
mkdir -p $(CURDIR)/debian/ffcs-server/usr/bin
- cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffs .
- cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffs ffs-$(version)
- cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffsmpi .
- cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffsmpi ffsmpi-$(version)
+ install $(CURDIR)/debian/tmp/usr/bin/FreeFem++*server $(CURDIR)/debian/ffcs-server/usr/bin
+ #cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffs ffs-$(version)
+ #cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffsmpi .
+ #cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffsmpi ffsmpi-$(version)
cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/uninstall FreeFem++-cs-$(version)-uninstall
# Remove path from bindir
More information about the debian-science-commits
mailing list