r44109 - in /packages/ffcs/trunk/debian: ./ patches/ patches/old/

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Fri Dec 9 09:47:00 UTC 2011 

Author: trophime-guest
Date: Fri Dec  9 09:46:59 2011
New Revision: 44109

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44109
Log:
update to 11.4 (warning debian/watch not working)

Added:
    packages/ffcs/trunk/debian/watch
Removed:
    packages/ffcs/trunk/debian/patches/old/
Modified:
    packages/ffcs/trunk/debian/README.Debian
    packages/ffcs/trunk/debian/changelog
    packages/ffcs/trunk/debian/patches/configure.patch
    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-gcc4.6.patch
    packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch
    packages/ffcs/trunk/debian/patches/ffcs-dev.patch
    packages/ffcs/trunk/debian/patches/fltk.patch
    packages/ffcs/trunk/debian/patches/install.patch
    packages/ffcs/trunk/debian/rules

Modified: packages/ffcs/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/README.Debian?rev=44109&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/README.Debian (original)
+++ packages/ffcs/trunk/debian/README.Debian Fri Dec  9 09:46:59 2011
@@ -2,6 +2,6 @@
 ---------------
 
 ffcs and freefem++ can be used at the same time.
-Note that ffcs ships with 3.12 version of freefem++
+Note that ffcs ships with 3.17 version of freefem++
 
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Mon, 03 Oct 2011 11:21:31 +0200
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Thu, 08 Dec 2011 08:21:31 +0200

Modified: packages/ffcs/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/changelog?rev=44109&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/changelog (original)
+++ packages/ffcs/trunk/debian/changelog Fri Dec  9 09:46:59 2011
@@ -1,4 +1,4 @@
-ffcs (11.11-1) unstable; urgency=low
+ffcs (11.14-1) unstable; urgency=low
 
   * Initial release (Closes: #643865)
 

Modified: packages/ffcs/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/configure.patch?rev=44109&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/configure.patch (original)
+++ packages/ffcs/trunk/debian/patches/configure.patch Fri Dec  9 09:46:59 2011
@@ -1,33 +1,11 @@
-Index: ffcs-11.11/configure.ac
-===================================================================
---- ffcs-11.11.orig/configure.ac	2011-11-21 11:58:03.000000000 +0100
-+++ ffcs-11.11/configure.ac	2011-11-21 12:00:59.000000000 +0100
-@@ -880,7 +880,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.11/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
-@@ -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 @@
+@@ -81,7 +81,7 @@
+ tags:TAGS
  TAGS:upstream/config.status
- 	etags --etags-include=upstream/TAGS *.?pp \
- 		|| etags -i upstream/TAGS *.?pp
+ 	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::

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=44109&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  9 09:46:59 2011
@@ -1,35 +1,28 @@
-Fix finding of file freefem++.pref
-Index: ffcs-11.11/ff/upstream/examples++-load/Makefile.am
+Locate freefem++.pref and ignore nlopt from building
+Index: ffcs-11.14/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}
+--- 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 @@
+ load_compile:
+ 	$(MAKE) $(AM_MAKEFLAGS) ff-c++
+ 	$(MAKE) $(AM_MAKEFLAGS) freefem++.pref WHERE_LIBRARY-download  include
+-	$(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-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=44109&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  9 09:46:59 2011
@@ -1,8 +1,8 @@
 Fix location of perl executable
-Index: ffcs-11.7/ff/upstream/examples-bamg/test/dotest.pl
+Index: ffcs-11.14/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
+--- 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
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl

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=44109&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-gcc4.6.patch Fri Dec  9 09:46:59 2011
@@ -7,7 +7,7 @@
                    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)
++                if ( copt && Kv.number<1 )
                   {
                       R cc  =  GetAny<R>(ll.second.eval(stack));
                       if ( c != cc) { 

Modified: 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=44109&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch Fri Dec  9 09:46:59 2011
@@ -1,7 +1,9 @@
 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 @@
+Index: ffcs-11.14/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
+@@ -202,7 +202,7 @@
          FLAGS=' '
          LIBS="'$b/libff.dll' $LIBS $DLL"
          SUF=dll;;

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=44109&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ffcs-dev.patch (original)
+++ packages/ffcs/trunk/debian/patches/ffcs-dev.patch Fri Dec  9 09:46:59 2011
@@ -1,7 +1,7 @@
-Index: ffcs-11.11/ff/upstream/examples++-load/Makefile.am
+Index: ffcs-11.14/ff/upstream/examples++-load/Makefile.am
 ===================================================================
---- 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
+--- 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
 @@ -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 \
-@@ -123,7 +123,7 @@
+@@ -146,12 +146,15 @@
  $(LIST_COMPILE):ff-c++ include Makefile 
  
  clean-local:
@@ -20,7 +20,25 @@
  	  $(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 @@
+ 	../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
+@@ -163,6 +166,9 @@
+ 	../config.status  --file=$@:$@.in
+ 	chmod a+x $@
+ 	-if [ -d ../download/bin ] ;then cp $@ ../download/bin; fi
++ffcs-get-dep:ffcs-get-dep.in Makefile
++	../config.status  --file=$@:$@.in
++	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)
+@@ -183,6 +189,8 @@
  	$(INSTALL_SCRIPT) ff-c++  $(DESTDIR)${bindir}
  	$(INSTALL_SCRIPT) ff-pkg-download  $(DESTDIR)${bindir}
  	$(INSTALL_SCRIPT) ff-get-dep  $(DESTDIR)${bindir}
@@ -29,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.11/ff/upstream/examples++-load/ffcs-get-dep.in
+Index: ffcs-11.14/ff/upstream/examples++-load/ffcs-get-dep.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ffcs-11.11/ff/upstream/examples++-load/ffcs-get-dep.in	2011-11-14 08:55:21.944546804 +0100
++++ ffcs-11.14/ff/upstream/examples++-load/ffcs-get-dep.in	2011-12-09 09:01:27.000000000 +0100
 @@ -0,0 +1,61 @@
 +#!/bin/sh
 +# ffcs-c++ `./ffcs-get-dep -ff metis.cpp`

Modified: packages/ffcs/trunk/debian/patches/fltk.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/fltk.patch?rev=44109&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/fltk.patch (original)
+++ packages/ffcs/trunk/debian/patches/fltk.patch Fri Dec  9 09:46:59 2011
@@ -1,7 +1,7 @@
-Index: ffcs-11.11/fltk/Makefile.am
+Index: ffcs-11.14/fltk/Makefile.am
 ===================================================================
---- ffcs-11.11.orig/fltk/Makefile.am	2011-11-21 14:44:14.000000000 +0100
-+++ ffcs-11.11/fltk/Makefile.am	2011-11-21 14:44:34.000000000 +0100
+--- ffcs-11.14.orig/fltk/Makefile.am	2011-12-05 14:23:54.000000000 +0100
++++ ffcs-11.14/fltk/Makefile.am	2011-12-08 16:46:09.000000000 +0100
 @@ -35,9 +35,15 @@
  	cd upstream && ./configure @FLTKOPTS@
  
@@ -43,10 +43,10 @@
  clean-local::
  	-rm include.mak
  
-Index: ffcs-11.11/src/Makefile.am
+Index: ffcs-11.14/src/Makefile.am
 ===================================================================
---- ffcs-11.11.orig/src/Makefile.am	2011-11-21 14:44:14.000000000 +0100
-+++ ffcs-11.11/src/Makefile.am	2011-11-21 14:44:27.000000000 +0100
+--- ffcs-11.14.orig/src/Makefile.am	2011-12-05 14:24:01.000000000 +0100
++++ ffcs-11.14/src/Makefile.am	2011-12-08 16:46:09.000000000 +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	\
@@ -56,7 +56,7 @@
  FreeFem___client_CFLAGS=@REGEXINCLUDE@
  FreeFem___client_LDFLAGS=@GUI_LDFLAGS@ @DEBUG_LDFLAGS@
  
-@@ -260,7 +260,7 @@
+@@ -252,7 +252,7 @@
  # ---------------------------
  
  dashboardui.hpp dashboardui.cpp:dashboardui.fl
@@ -65,10 +65,10 @@
  
  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
+Index: ffcs-11.14/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx
 ===================================================================
---- ffcs-11.11.orig/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx	2011-11-21 14:44:14.000000000 +0100
-+++ ffcs-11.11/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx	2011-11-21 14:44:27.000000000 +0100
+--- ffcs-11.14.orig/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx	2011-12-05 14:24:03.000000000 +0100
++++ ffcs-11.14/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx	2011-12-08 16:46:09.000000000 +0100
 @@ -33,7 +33,7 @@
  // FLTK
  //ALH-seems not to be included by default, and __APPLE_COCOA__ is not seen
@@ -78,11 +78,11 @@
  #include <FL/x.H>
  // vtk
  #include <vtkRenderWindow.h>
-Index: ffcs-11.11/src/editor.cpp
+Index: ffcs-11.14/src/editor.cpp
 ===================================================================
---- ffcs-11.11.orig/src/editor.cpp	2011-11-21 14:44:14.000000000 +0100
-+++ ffcs-11.11/src/editor.cpp	2011-11-21 14:44:27.000000000 +0100
-@@ -520,7 +520,7 @@
+--- ffcs-11.14.orig/src/editor.cpp	2011-12-05 14:24:01.000000000 +0100
++++ ffcs-11.14/src/editor.cpp	2011-12-08 16:46:09.000000000 +0100
+@@ -569,7 +569,7 @@
    // replace them with one regular LF.
    int i=0;
    while(i<editorbuffer->length()){
@@ -91,11 +91,11 @@
      else i++;
    }
  #endif
-Index: ffcs-11.11/configure.ac
+Index: ffcs-11.14/configure.ac
 ===================================================================
---- ffcs-11.11.orig/configure.ac	2011-11-21 14:44:27.000000000 +0100
-+++ ffcs-11.11/configure.ac	2011-11-21 14:44:27.000000000 +0100
-@@ -978,7 +978,7 @@
+--- ffcs-11.14.orig/configure.ac	2011-12-05 14:23:39.000000000 +0100
++++ ffcs-11.14/configure.ac	2011-12-08 16:46:09.000000000 +0100
+@@ -1049,7 +1049,7 @@
  # made).
  
  with_fltk=none

Modified: packages/ffcs/trunk/debian/patches/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/install.patch?rev=44109&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/install.patch (original)
+++ packages/ffcs/trunk/debian/patches/install.patch Fri Dec  9 09:46:59 2011
@@ -1,7 +1,7 @@
-Index: ffcs-11.8/pack/install.m4
+Index: ffcs-11.14/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
+--- ffcs-11.14.orig/pack/install.m4	2011-12-09 08:56:31.000000000 +0100
++++ ffcs-11.14/pack/install.m4	2011-12-09 08:56:34.000000000 +0100
 @@ -47,11 +47,6 @@
      prefix=$1
  fi
@@ -69,29 +69,29 @@
  
  # Local Variables:
  # mode:shell-script
-Index: ffcs-11.11/pack/install.m4
+Index: ffcs-11.14/pack/Makefile.am
 ===================================================================
---- 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 @@
+--- ffcs-11.14.orig/pack/Makefile.am	2011-12-09 08:56:31.000000000 +0100
++++ ffcs-11.14/pack/Makefile.am	2011-12-09 08:59:57.000000000 +0100
+@@ -297,7 +297,7 @@
+ 	convert $< $@
  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 @@
+-examples:examples-main examples-tutorial examples-3d examples-eigen examples-mpi examples-chapt3 examples-other examples-load	\
++examples:examples-main examples-tutorial examples-3d examples-eigen examples-mpi examples-chapt3 examples-other examples-load examples-bamg	\
+ 	examples-ffcs
+ 
+ # separate goal for examples-dir to avoid parallel processes that put the cart before the horses
+@@ -313,6 +313,8 @@
  	rsync -avq --delete ../ff/upstream/examples++-3d/ ${resdir}/examples/3d
- examples-eigen:
+ examples-eigen:examples-dir
  	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 @@
+ examples-mpi:examples-dir
+@@ -458,7 +460,7 @@
  
  if LINUX
  install:filetree
@@ -100,7 +100,7 @@
  endif
  if MACOS
  install:finaldir
-@@ -459,7 +461,7 @@
+@@ -469,7 +471,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

Modified: packages/ffcs/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/rules?rev=44109&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/rules (original)
+++ packages/ffcs/trunk/debian/rules Fri Dec  9 09:46:59 2011
@@ -74,11 +74,12 @@
 	
 	
 	# fix executable-not-elf-or-script
-	chmod ugo-xr $(CURDIR)/debian/tmp/usr/share/ffcs/examples/bamg/square/dotest
-	chmod ugo-xr $(CURDIR)/debian/tmp/usr/share/ffcs/examples/bamg/NACA012/data*
-	chmod ugo-xr $(CURDIR)/debian/tmp/usr/share/ffcs/examples/bamg/NACA012/*.awk
-	chmod ugo-xr $(CURDIR)/debian/tmp/usr/share/ffcs/examples/tutorial/xyf
-
+	chmod ugo-x $(CURDIR)/debian/tmp/usr/share/ffcs/examples/bamg/square/dotest
+	chmod ugo-x $(CURDIR)/debian/tmp/usr/share/ffcs/examples/bamg/NACA012/data*
+	chmod ugo-x $(CURDIR)/debian/tmp/usr/share/ffcs/examples/bamg/NACA012/*.awk
+	chmod ugo-x $(CURDIR)/debian/tmp/usr/share/ffcs/examples/tutorial/xyf
+	find $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/examples/ -name \*.edp | xargs chmod ugo-x
+	
 	# Remove uneeded files
 	find $(CURDIR)/debian/tmp/usr/share/ffcs -name \*.m4 | xargs -r rm
 	find $(CURDIR)/debian/tmp/usr/share/ffcs -name \Makefile.am | xargs -r rm

Added: packages/ffcs/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/watch?rev=44109&op=file
==============================================================================
--- packages/ffcs/trunk/debian/watch (added)
+++ packages/ffcs/trunk/debian/watch Fri Dec  9 09:46:59 2011
@@ -1,0 +1,3 @@
+# Compulsory line, this is a version 3 file
+version=3
+  http://www.ljll.math.upmc.fr/lehyaric/ffcs/packs /lehyaric/ffcs/packs/index.php\?dir=\&amp\;file\=ffcs-(.+)-src\.tgz

More information about the debian-science-commits mailing list