r45465 - /packages/ffcs/trunk/debian/patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Dec 14 08:37:27 UTC 2012
Author: trophime-guest
Date: Fri Dec 14 08:37:26 2012
New Revision: 45465
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45465
Log:
update patches
Modified:
packages/ffcs/trunk/debian/patches/configure.patch
packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch
packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch
packages/ffcs/trunk/debian/patches/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/ffcs-dev.patch
packages/ffcs/trunk/debian/patches/install.patch
packages/ffcs/trunk/debian/patches/series
Modified: packages/ffcs/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/configure.patch?rev=45465&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/configure.patch (original)
+++ packages/ffcs/trunk/debian/patches/configure.patch Fri Dec 14 08:37:26 2012
@@ -1,8 +1,8 @@
-Index: ffcs-11.11/ff/Makefile.am
+Index: ffcs-12.6/ff/Makefile.am
===================================================================
---- ffcs-11.11.orig/ff/Makefile.am 2011-11-21 11:58:03.000000000 +0100
-+++ ffcs-11.11/ff/Makefile.am 2011-11-21 12:00:59.000000000 +0100
-@@ -81,7 +81,7 @@
+--- ffcs-12.6.orig/ff/Makefile.am 2012-12-14 09:27:19.000000000 +0100
++++ ffcs-12.6/ff/Makefile.am 2012-12-14 09:27:27.000000000 +0100
+@@ -99,7 +99,7 @@
tags:TAGS
TAGS:upstream/config.status
etags --etags-include=upstream/TAGS *.?pp || etags -i upstream/TAGS *.?pp
Modified: packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-examples%2B%2B-load-Makefile.patch?rev=45465&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch Fri Dec 14 08:37:26 2012
@@ -1,23 +1,9 @@
Locate freefem++.pref and ignore nlopt from building
-Index: ffcs-11.14/ff/upstream/examples++-load/Makefile.am
+Index: ffcs-12.6/ff/upstream/examples++-load/Makefile.am
===================================================================
---- ffcs-11.14.orig/ff/upstream/examples++-load/Makefile.am 2011-12-08 17:36:50.000000000 +0100
-+++ ffcs-11.14/ff/upstream/examples++-load/Makefile.am 2011-12-08 17:49:52.000000000 +0100
-@@ -69,11 +69,11 @@
- isolineP1.$(DYLIB_SUFFIX) thresholdings.$(DYLIB_SUFFIX) \
- VTK_writer_3d.$(DYLIB_SUFFIX) VTK_writer.$(DYLIB_SUFFIX) \
- splitedges.$(DYLIB_SUFFIX) Element_Mixte.$(DYLIB_SUFFIX) \
-- myfunction2.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
-+ myfunction2.$(DYLIB_SUFFIX) ff-cmaes.$(DYLIB_SUFFIX)
-
- # FFCS - lapack.dll and fflapack.dll removed as long as there is no Lapack complete library to link them to on Win64
- # FFCS - gsl.* removed since it does not have a specific download, so it can only work properly on prepackaged systems
--LIST_COMPILE_PKG=tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) metis.$(DYLIB_SUFFIX) \
-+LIST_COMPILE_PKG=tetgen.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) metis.$(DYLIB_SUFFIX) \
- UMFPACK64.$(DYLIB_SUFFIX) NewSolver.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
- freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX)
- bin_PROGRAMS=
-@@ -83,7 +83,7 @@
+--- ffcs-12.6.orig/ff/upstream/examples++-load/Makefile.am 2012-12-14 09:30:54.000000000 +0100
++++ ffcs-12.6/ff/upstream/examples++-load/Makefile.am 2012-12-14 09:35:52.000000000 +0100
+@@ -90,7 +90,7 @@
load_compile:
$(MAKE) $(AM_MAKEFLAGS) ff-c++
$(MAKE) $(AM_MAKEFLAGS) freefem++.pref WHERE_LIBRARY-download include
Modified: packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-examples%2B%2B-load-load-link-in.patch?rev=45465&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch Fri Dec 14 08:37:26 2012
@@ -1,8 +1,8 @@
Recognition of GNU/kFreeBSD architecture
-Index: ffcs-11.14/ff/upstream/examples++-load/load.link.in
+Index: ffcs-12.6/ff/upstream/examples++-load/load.link.in
===================================================================
---- ffcs-11.14.orig/ff/upstream/examples++-load/load.link.in 2011-12-05 14:23:54.000000000 +0100
-+++ ffcs-11.14/ff/upstream/examples++-load/load.link.in 2011-12-08 16:46:25.000000000 +0100
+--- ffcs-12.6.orig/ff/upstream/examples++-load/load.link.in 2012-06-11 10:45:45.000000000 +0200
++++ ffcs-12.6/ff/upstream/examples++-load/load.link.in 2012-12-14 09:35:59.000000000 +0100
@@ -202,7 +202,7 @@
FLAGS=' '
LIBS="'$b/libff.dll' $LIBS $DLL"
Modified: 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=45465&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples-bamg-test-dotest-pl.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-examples-bamg-test-dotest-pl.patch Fri Dec 14 08:37:26 2012
@@ -1,8 +1,8 @@
Fix location of perl executable
-Index: ffcs-11.14/ff/upstream/examples-bamg/test/dotest.pl
+Index: ffcs-12.6/ff/upstream/examples-bamg/test/dotest.pl
===================================================================
---- ffcs-11.14.orig/ff/upstream/examples-bamg/test/dotest.pl 2011-12-05 14:23:54.000000000 +0100
-+++ ffcs-11.14/ff/upstream/examples-bamg/test/dotest.pl 2011-12-08 16:46:33.000000000 +0100
+--- ffcs-12.6.orig/ff/upstream/examples-bamg/test/dotest.pl 2012-06-11 10:45:45.000000000 +0200
++++ ffcs-12.6/ff/upstream/examples-bamg/test/dotest.pl 2012-12-14 09:36:07.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
Modified: 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=45465&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples-load-WHERE-LIBRARY.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-examples-load-WHERE-LIBRARY.patch Fri Dec 14 08:37:26 2012
@@ -1,7 +1,7 @@
Create empty file examples++-load/WHERE_LIBRARY
-Index: ffcs-11.7/ff/upstream/examples++-load/WHERE_LIBRARY
+Index: ffcs-12.6/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
++++ ffcs-12.6/ff/upstream/examples++-load/WHERE_LIBRARY 2012-12-14 09:36:12.000000000 +0100
@@ -0,0 +1 @@
+# Empty file to be used during build time
Modified: 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=45465&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch Fri Dec 14 08:37:26 2012
@@ -1,8 +1,8 @@
-Index: ffcs-11.11/ff/upstream/src/fflib/problem.cpp
+Index: ffcs-12.6/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 @@
+--- ffcs-12.6.orig/ff/upstream/src/fflib/problem.cpp 2012-06-11 10:45:45.000000000 +0200
++++ ffcs-12.6/ff/upstream/src/fflib/problem.cpp 2012-12-14 09:36:25.000000000 +0100
+@@ -2653,7 +2653,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));
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=45465&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ffcs-dev.patch (original)
+++ packages/ffcs/trunk/debian/patches/ffcs-dev.patch Fri Dec 14 08:37:26 2012
@@ -1,7 +1,7 @@
-Index: ffcs-11.14/ff/upstream/examples++-load/Makefile.am
+Index: ffcs-12.6/ff/upstream/examples++-load/Makefile.am
===================================================================
---- ffcs-11.14.orig/ff/upstream/examples++-load/Makefile.am 2011-12-09 09:01:27.000000000 +0100
-+++ ffcs-11.14/ff/upstream/examples++-load/Makefile.am 2011-12-09 09:25:08.000000000 +0100
+--- ffcs-12.6.orig/ff/upstream/examples++-load/Makefile.am 2012-12-14 09:35:52.000000000 +0100
++++ ffcs-12.6/ff/upstream/examples++-load/Makefile.am 2012-12-14 09:36:18.000000000 +0100
@@ -6,7 +6,7 @@
EXEEXT=$(EXEEXT) X11PROG=$(X11PROG) GLXPROG=$(GLXPROG) \
AGLPROG=$(AGLPROG) MPIPROG=$(MPIPROG) IDEPROG="$(IDEPROG)" \
@@ -11,7 +11,7 @@
BernadiRaugel.cpp Morley.cpp dfft.cpp \
funcTemplate.cpp mat_dervieux.cpp mat_psi.cpp myfunction.cpp \
mat_dervieux.cpp convect_dervieux.edp funcTemplate.cpp \
-@@ -146,12 +146,15 @@
+@@ -153,12 +153,15 @@
$(LIST_COMPILE):ff-c++ include Makefile
clean-local:
@@ -28,7 +28,7 @@
load.link:load.link.in Makefile
../config.status --file=load.link:load.link.in
chmod a+x load.link
-@@ -163,6 +166,9 @@
+@@ -170,6 +173,9 @@
../config.status --file=$@:$@.in
chmod a+x $@
-if [ -d ../download/bin ] ;then cp $@ ../download/bin; fi
@@ -38,7 +38,7 @@
WHERE_LIBRARY-download:ff-pkg-download FORCE WHERE_LIBRARY-config WHERE_LIBRARY
@./ff-pkg-download >$@-new
@diff $@-new $@ || (cp $@-new $@ ;touch WHERE_LIBRARY)
-@@ -183,6 +189,8 @@
+@@ -190,6 +196,8 @@
$(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
@@ -47,10 +47,10 @@
-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.14/ff/upstream/examples++-load/ffcs-get-dep.in
+Index: ffcs-12.6/ff/upstream/examples++-load/ffcs-get-dep.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffcs-11.14/ff/upstream/examples++-load/ffcs-get-dep.in 2011-12-09 09:01:27.000000000 +0100
++++ ffcs-12.6/ff/upstream/examples++-load/ffcs-get-dep.in 2012-12-14 09:36:18.000000000 +0100
@@ -0,0 +1,61 @@
+#!/bin/sh
+# ffcs-c++ `./ffcs-get-dep -ff metis.cpp`
Modified: packages/ffcs/trunk/debian/patches/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/install.patch?rev=45465&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/install.patch (original)
+++ packages/ffcs/trunk/debian/patches/install.patch Fri Dec 14 08:37:26 2012
@@ -1,7 +1,7 @@
Index: ffcs-12.6/pack/install.m4
===================================================================
---- ffcs-12.6.orig/pack/install.m4 2012-06-22 16:20:56.000000000 +0200
-+++ ffcs-12.6/pack/install.m4 2012-06-22 16:26:46.000000000 +0200
+--- ffcs-12.6.orig/pack/install.m4 2012-12-14 09:27:19.000000000 +0100
++++ ffcs-12.6/pack/install.m4 2012-12-14 09:27:21.000000000 +0100
@@ -84,30 +84,30 @@
# find script (which may be at a different location and with a different name in Linux and Mac setups)
@@ -56,8 +56,8 @@
# mode:shell-script
Index: ffcs-12.6/pack/Makefile.am
===================================================================
---- ffcs-12.6.orig/pack/Makefile.am 2012-06-22 16:22:38.000000000 +0200
-+++ ffcs-12.6/pack/Makefile.am 2012-06-22 16:26:46.000000000 +0200
+--- ffcs-12.6.orig/pack/Makefile.am 2012-12-14 09:27:19.000000000 +0100
++++ ffcs-12.6/pack/Makefile.am 2012-12-14 09:27:21.000000000 +0100
@@ -345,7 +345,7 @@
endif
Modified: packages/ffcs/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/series?rev=45465&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/series (original)
+++ packages/ffcs/trunk/debian/patches/series Fri Dec 14 08:37:26 2012
@@ -1,6 +1,6 @@
install.patch
configure.patch
-fltk.patch
+#fltk.patch
#
ff-src-Graphics-sansgraph-cpp.patch
ff-src-Graphics-xglrgraf-cpp.patch
More information about the debian-science-commits
mailing list