r45468 - in /packages/ffcs/trunk/debian: ./ patches/

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Fri Dec 14 09:56:33 UTC 2012 

Author: trophime-guest
Date: Fri Dec 14 09:56:33 2012
New Revision: 45468

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45468
Log:
update patches

Modified:
    packages/ffcs/trunk/debian/control
    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/ff-src-Graphics-sansgraph-cpp.patch
    packages/ffcs/trunk/debian/patches/ff-src-Graphics-xglrgraf-cpp.patch
    packages/ffcs/trunk/debian/patches/ffcs-dev.patch
    packages/ffcs/trunk/debian/patches/install.patch

Modified: packages/ffcs/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/control?rev=45468&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/control (original)
+++ packages/ffcs/trunk/debian/control Fri Dec 14 09:56:33 2012
@@ -20,7 +20,6 @@
  libtet1.4-dev,
  libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint,
  libparms2-dev, libhips-dev
- 
 # libmysqlclient-dev (>= 5.1.56),
 # hardening-includes,hardening-wrapper
 Standards-Version: 3.9.2

Modified: packages/ffcs/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/configure.patch?rev=45468&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/configure.patch (original)
+++ packages/ffcs/trunk/debian/patches/configure.patch Fri Dec 14 09:56:33 2012
@@ -1,8 +1,8 @@
-Index: ffcs-12.6/ff/Makefile.am
+Index: ffcs-12.17/ff/Makefile.am
 ===================================================================
---- 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 @@
+--- ffcs-12.17.orig/ff/Makefile.am	2012-12-14 10:55:02.000000000 +0100
++++ ffcs-12.17/ff/Makefile.am	2012-12-14 10:55:12.000000000 +0100
+@@ -100,7 +100,7 @@
  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=45468&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 09:56:33 2012
@@ -1,12 +1,12 @@
 Locate freefem++.pref and ignore nlopt from building
-Index: ffcs-12.6/ff/upstream/examples++-load/Makefile.am
+Index: ffcs-12.17/ff/upstream/examples++-load/Makefile.am
 ===================================================================
---- 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 @@
+--- ffcs-12.17.orig/ff/upstream/examples++-load/Makefile.am	2012-12-14 10:55:02.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples++-load/Makefile.am	2012-12-14 10:55:20.000000000 +0100
+@@ -94,7 +94,7 @@
  load_compile:
  	$(MAKE) $(AM_MAKEFLAGS) ff-c++
- 	$(MAKE) $(AM_MAKEFLAGS) freefem++.pref WHERE_LIBRARY-download  include
+ 	$(MAKE) $(AM_MAKEFLAGS) WHERE_LIBRARY-download  include.done
 -	$(MAKE) $(AM_MAKEFLAGS) $(LIST_COMPILE)  $(LIST_COMPILE_PKG)
 +	$(MAKE) -i $(AM_MAKEFLAGS) $(LIST_COMPILE)  $(LIST_COMPILE_PKG)
  	echo " finish build list $(DYLIB_SUFFIX)"

Modified: packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-examples%2B%2B-load-load-link-in.patch?rev=45468&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 09:56:33 2012
@@ -1,9 +1,9 @@
 Recognition of GNU/kFreeBSD architecture
-Index: ffcs-12.6/ff/upstream/examples++-load/load.link.in
+Index: ffcs-12.17/ff/upstream/examples++-load/load.link.in
 ===================================================================
---- 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 @@
+--- ffcs-12.17.orig/ff/upstream/examples++-load/load.link.in	2012-12-14 10:55:02.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples++-load/load.link.in	2012-12-14 10:55:23.000000000 +0100
+@@ -206,7 +206,7 @@
          FLAGS=' '
          LIBS="'$b/libff.dll' $LIBS $DLL"
          SUF=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=45468&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 09:56:33 2012
@@ -1,8 +1,8 @@
 Fix location of perl executable
-Index: ffcs-12.6/ff/upstream/examples-bamg/test/dotest.pl
+Index: ffcs-12.17/ff/upstream/examples-bamg/test/dotest.pl
 ===================================================================
---- 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
+--- ffcs-12.17.orig/ff/upstream/examples-bamg/test/dotest.pl	2012-12-14 10:55:02.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples-bamg/test/dotest.pl	2012-12-14 10:55:25.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=45468&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 09:56:33 2012
@@ -1,7 +1,7 @@
 Create empty file examples++-load/WHERE_LIBRARY
-Index: ffcs-12.6/ff/upstream/examples++-load/WHERE_LIBRARY
+Index: ffcs-12.17/ff/upstream/examples++-load/WHERE_LIBRARY
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffcs-12.6/ff/upstream/examples++-load/WHERE_LIBRARY	2012-12-14 09:36:12.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples++-load/WHERE_LIBRARY	2012-12-14 10:55:28.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=45468&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch Fri Dec 14 09:56:33 2012
@@ -1,8 +1,8 @@
-Index: ffcs-12.6/ff/upstream/src/fflib/problem.cpp
+Index: ffcs-12.17/ff/upstream/src/fflib/problem.cpp
 ===================================================================
---- 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 @@
+--- ffcs-12.17.orig/ff/upstream/src/fflib/problem.cpp	2012-12-14 10:55:02.000000000 +0100
++++ ffcs-12.17/ff/upstream/src/fflib/problem.cpp	2012-12-14 10:55:33.000000000 +0100
+@@ -2654,7 +2654,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/ff-src-Graphics-sansgraph-cpp.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-src-Graphics-sansgraph-cpp.patch?rev=45468&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-src-Graphics-sansgraph-cpp.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-src-Graphics-sansgraph-cpp.patch Fri Dec 14 09:56:33 2012
@@ -1,6 +1,8 @@
 Fix FTBFS due to recent g++-4.7
---- ffcs-11.14.orig/ff/upstream/src/Graphics/sansrgraph.cpp
-+++ ffcs-11.14/ff/upstream/src/Graphics/sansrgraph.cpp
+Index: ffcs-12.17/ff/upstream/src/Graphics/sansrgraph.cpp
+===================================================================
+--- ffcs-12.17.orig/ff/upstream/src/Graphics/sansrgraph.cpp	2012-12-14 10:55:02.000000000 +0100
++++ ffcs-12.17/ff/upstream/src/Graphics/sansrgraph.cpp	2012-12-14 10:55:15.000000000 +0100
 @@ -34,6 +34,7 @@
  #include <iostream>
  #include <cassert>

Modified: packages/ffcs/trunk/debian/patches/ff-src-Graphics-xglrgraf-cpp.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-src-Graphics-xglrgraf-cpp.patch?rev=45468&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-src-Graphics-xglrgraf-cpp.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-src-Graphics-xglrgraf-cpp.patch Fri Dec 14 09:56:33 2012
@@ -1,6 +1,8 @@
 Fix FTBFS due to g++-4.7
---- ffcs-11.14.orig/ff/upstream/src/Graphics/xglrgraf.cpp
-+++ ffcs-11.14/ff/upstream/src/Graphics/xglrgraf.cpp
+Index: ffcs-12.17/ff/upstream/src/Graphics/xglrgraf.cpp
+===================================================================
+--- ffcs-12.17.orig/ff/upstream/src/Graphics/xglrgraf.cpp	2012-12-14 10:55:02.000000000 +0100
++++ ffcs-12.17/ff/upstream/src/Graphics/xglrgraf.cpp	2012-12-14 10:55:17.000000000 +0100
 @@ -27,4 +27,5 @@
   */
  #define XGL

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=45468&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ffcs-dev.patch (original)
+++ packages/ffcs/trunk/debian/patches/ffcs-dev.patch Fri Dec 14 09:56:33 2012
@@ -1,7 +1,7 @@
-Index: ffcs-12.6/ff/upstream/examples++-load/Makefile.am
+Index: ffcs-12.17/ff/upstream/examples++-load/Makefile.am
 ===================================================================
---- 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
+--- ffcs-12.17.orig/ff/upstream/examples++-load/Makefile.am	2012-12-14 10:55:20.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples++-load/Makefile.am	2012-12-14 10:55:31.000000000 +0100
 @@ -6,7 +6,7 @@
  	EXEEXT=$(EXEEXT) X11PROG=$(X11PROG) GLXPROG=$(GLXPROG)		\
  	AGLPROG=$(AGLPROG) MPIPROG=$(MPIPROG) IDEPROG="$(IDEPROG)"	\
@@ -11,24 +11,24 @@
   BernadiRaugel.cpp Morley.cpp dfft.cpp  \
   funcTemplate.cpp mat_dervieux.cpp mat_psi.cpp myfunction.cpp \
   mat_dervieux.cpp convect_dervieux.edp funcTemplate.cpp \
-@@ -153,12 +153,15 @@
- $(LIST_COMPILE):ff-c++ include Makefile 
+@@ -158,12 +158,15 @@
+ $(LIST_COMPILE):ff-c++ include.done Makefile 
  
  clean-local:
 -	-rm *.o  load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
-+	-rm *.o  load.link WHERE_LIBRARY-download ffcs-get-dep ffcs-c++ ff-get-dep ff-c++ ff-pkg-download \
++	-rm *.o  load.link WHERE_LIBRARY-download ffcs-get-dep ff-get-dep ff-c++ ff-pkg-download \
  	  $(LIST_COMPILE) $(LIST_COMPILE_PKG)  regtests.edp makeref.edp
- 	-rm -rf include
+ 	-rm -rf include include.done
  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
++ffcs-c++:load.link.in  Makefile load.link WHERE_LIBRARY-download ffcs-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
-@@ -170,6 +173,9 @@
+@@ -175,6 +178,9 @@
  	../config.status  --file=$@:$@.in
  	chmod a+x $@
  	-if [ -d ../download/bin ] ;then cp $@ ../download/bin; fi
@@ -38,19 +38,10 @@
  WHERE_LIBRARY-download:ff-pkg-download FORCE  WHERE_LIBRARY-config WHERE_LIBRARY
  	@./ff-pkg-download >$@-new
  	@diff $@-new $@  || (cp $@-new $@ ;touch WHERE_LIBRARY)
-@@ -190,6 +196,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-12.6/ff/upstream/examples++-load/ffcs-get-dep.in
+Index: ffcs-12.17/ff/upstream/examples++-load/ffcs-get-dep.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffcs-12.6/ff/upstream/examples++-load/ffcs-get-dep.in	2012-12-14 09:36:18.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples++-load/ffcs-get-dep.in	2012-12-14 10:55:31.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=45468&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/install.patch (original)
+++ packages/ffcs/trunk/debian/patches/install.patch Fri Dec 14 09:56:33 2012
@@ -1,8 +1,8 @@
-Index: ffcs-12.6/pack/install.m4
+Index: ffcs-12.17/pack/install.m4
 ===================================================================
---- 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 @@
+--- ffcs-12.17.orig/pack/install.m4	2012-12-14 10:55:02.000000000 +0100
++++ ffcs-12.17/pack/install.m4	2012-12-14 10:55:06.000000000 +0100
+@@ -105,30 +105,30 @@
  # find script (which may be at a different location and with a different name in Linux and Mac setups)
  
  ffcliscript="$prefix/FINALDIR"/FreeFem++-cli
@@ -43,9 +43,9 @@
 +publishscript "$ffmpilangscript" $DESTDIR/$bindir/FreeFem++-mpilang
 +publishscript "$ffmpilangscript" $DESTDIR/$bindir/FreeFem++-mpilang-VERSION)
  
- # completing the uninstall script
- echo rm $bindir/FreeFem++-cs-VERSION-uninstall >> "$uninstall"
-@@ -115,7 +115,7 @@
+ # this will default to use system menus when user is root, and user menus when user is not root
+ if test -x /usr/bin/xdg-desktop-menu
+@@ -144,7 +144,7 @@
  echo echo Uninstall OK >> "$uninstall"
  
  chmod a+x "$uninstall"
@@ -54,11 +54,11 @@
  
  # Local Variables:
  # mode:shell-script
-Index: ffcs-12.6/pack/Makefile.am
+Index: ffcs-12.17/pack/Makefile.am
 ===================================================================
---- 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 @@
+--- ffcs-12.17.orig/pack/Makefile.am	2012-12-14 10:55:02.000000000 +0100
++++ ffcs-12.17/pack/Makefile.am	2012-12-14 10:55:06.000000000 +0100
+@@ -437,7 +437,7 @@
  endif
  
  examples:examples-main examples-tutorial examples-3d examples-eigen examples-mpi examples-chapt3 examples-other	\
@@ -66,17 +66,17 @@
 +	examples-load examples-bamg examples-ffcs
  
  # separate goal for examples-dir to avoid parallel processes that put the cart before the horses
- examples-dir:${resdir}/examples
-@@ -364,6 +364,8 @@
- 	rsync ${rsyncparm} ../ff/upstream/examples++-3d/ ${resdir}/examples/3d
- examples-eigen:examples-dir
- 	rsync ${rsyncparm} ../ff/upstream/examples++-eigen/ ${resdir}/examples/eigen
-+examples-bamg:
-+	rsync -avq --delete ../ff/upstream/examples-bamg/ ${resdir}/examples/bamg
+ work_Contents_Resources_examples.done:work_Contents_Resources.done
+@@ -457,6 +457,8 @@
+ 	rsync ${rsyncparm} ../ff/upstream/examples++-3d/ work/Contents/Resources/examples/3d
+ examples-eigen:work_Contents_Resources_examples.done
+ 	rsync ${rsyncparm} ../ff/upstream/examples++-eigen/ work/Contents/Resources/examples/eigen
++examples-bamg:work_Contents_Resources_examples.done
++	rsync ${rsyncparm} ../ff/upstream/examples++-bamg/ work/Contents/Resources/examples/bamg
  
  # we remove all dlls from examples++-mpi (they are already in lib/).
- examples-mpi:examples-dir
-@@ -511,7 +513,7 @@
+ examples-mpi:work_Contents_Resources_examples.done
+@@ -605,7 +607,7 @@
  # credentials, and we want to run tests unattended.
  
  install-exec-local:filetree

More information about the debian-science-commits mailing list