r45469 - in /packages/ffcs/trunk/debian: control patches/ff-examples++-load-Makefile.patch patches/ffcs-dev.patch patches/series

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Fri Dec 14 15:20:23 2012
New Revision: 45469

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45469
Log:
update patches - try to fix ffcs modules compiles

Modified:
    packages/ffcs/trunk/debian/control
    packages/ffcs/trunk/debian/patches/ff-examples++-load-Makefile.patch
    packages/ffcs/trunk/debian/patches/ffcs-dev.patch
    packages/ffcs/trunk/debian/patches/series

Modified: packages/ffcs/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/control?rev=45469&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/control (original)
+++ packages/ffcs/trunk/debian/control Fri Dec 14 15:20:23 2012
@@ -9,17 +9,17 @@
  libxpm-dev, mpi-default-dev, libfftw3-dev, libblas-dev, libgsl0-dev,
  libarpack2-dev, libsuitesparse-dev, libsuperlu3-dev, imagemagick, 
  libfltk1.3-dev | libfltk-dev, freeglut3-dev, texlive, texlive-extra-utils, 
- texlive-latex-extra, texlive-font-utils, libmumps-ptscotch-dev, libgmm++-dev, 
+ texlive-latex-extra, texlive-font-utils, libmumps-dev, libmumps-ptscotch-dev, libgmm++-dev, 
  libmumps-dev, libblacs-mpi-dev, libscalapack-mpi-dev, 
  libscotch-dev, ghostscript, libptscotch-dev, libmumps-scotch-dev,
  libxext-dev, libxpm-dev, libxt-dev, libvtk5-dev (>= 5.6),
  libtiff4-dev, libjpeg-dev, zlib1g-dev, libpng12-dev, 
  fluid, libfltk1.3-dev, 
  rsync,
- libnlopt-dev,
+ libnlopt-dev, coinor-libipopt-dev,
  libtet1.4-dev,
  libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint,
- libparms2-dev, libhips-dev
+ libparms2-dev, libhips-dev, libpastix-dev
 # libmysqlclient-dev (>= 5.1.56),
 # hardening-includes,hardening-wrapper
 Standards-Version: 3.9.2

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=45469&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 15:20:23 2012
@@ -1,8 +1,8 @@
 Locate freefem++.pref and ignore nlopt from building
 Index: ffcs-12.17/ff/upstream/examples++-load/Makefile.am
 ===================================================================
---- 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
+--- ffcs-12.17.orig/ff/upstream/examples++-load/Makefile.am	2012-12-14 15:02:32.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples++-load/Makefile.am	2012-12-14 16:03:26.000000000 +0100
 @@ -94,7 +94,7 @@
  load_compile:
  	$(MAKE) $(AM_MAKEFLAGS) ff-c++

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=45469&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ffcs-dev.patch (original)
+++ packages/ffcs/trunk/debian/patches/ffcs-dev.patch Fri Dec 14 15:20:23 2012
@@ -1,7 +1,7 @@
 Index: ffcs-12.17/ff/upstream/examples++-load/Makefile.am
 ===================================================================
---- 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
+--- ffcs-12.17.orig/ff/upstream/examples++-load/Makefile.am	2012-12-14 16:06:05.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples++-load/Makefile.am	2012-12-14 16:15:25.000000000 +0100
 @@ -6,7 +6,7 @@
  	EXEEXT=$(EXEEXT) X11PROG=$(X11PROG) GLXPROG=$(GLXPROG)		\
  	AGLPROG=$(AGLPROG) MPIPROG=$(MPIPROG) IDEPROG="$(IDEPROG)"	\
@@ -28,7 +28,7 @@
  load.link:load.link.in  Makefile
  	../config.status  --file=load.link:load.link.in
  	chmod a+x load.link
-@@ -175,6 +178,9 @@
+@@ -175,9 +178,12 @@
  	../config.status  --file=$@:$@.in
  	chmod a+x $@
  	-if [ -d ../download/bin ] ;then cp $@ ../download/bin; fi
@@ -37,11 +37,15 @@
 +	chmod a+x $@
  WHERE_LIBRARY-download:ff-pkg-download FORCE  WHERE_LIBRARY-config WHERE_LIBRARY
  	@./ff-pkg-download >$@-new
- 	@diff $@-new $@  || (cp $@-new $@ ;touch WHERE_LIBRARY)
+-	@diff $@-new $@  || (cp $@-new $@ ;touch WHERE_LIBRARY)
++	@diff $@-new $@  || (cp $@-new $@ ;cat WHERE_LIBRARY-config >> $@; cp $@ WHERE_LIBRARY)
+ WHERE_LIBRARY:
+ 	touch $@
+ FORCE: ;
 Index: ffcs-12.17/ff/upstream/examples++-load/ffcs-get-dep.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffcs-12.17/ff/upstream/examples++-load/ffcs-get-dep.in	2012-12-14 10:55:31.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples++-load/ffcs-get-dep.in	2012-12-14 16:06:05.000000000 +0100
 @@ -0,0 +1,61 @@
 +#!/bin/sh
 +# ffcs-c++ `./ffcs-get-dep -ff metis.cpp`

Modified: packages/ffcs/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/series?rev=45469&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/series (original)
+++ packages/ffcs/trunk/debian/patches/series Fri Dec 14 15:20:23 2012
@@ -1,3 +1,4 @@
+ff-configure.patch
 install.patch
 configure.patch
 #fltk.patch