r45464 - in /packages/ffcs/trunk/debian: changelog patches/ff-examples++-load-load-link-in.patch patches/ff-kfreebsd.patch patches/ff-src-Graphics-sansgraph-cpp.patch patches/ff-src-Graphics-xglrgraf-cpp.patch patches/install.patch patches/series watch

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Fri Dec 14 08:25:30 UTC 2012 

Author: trophime-guest
Date: Fri Dec 14 08:25:29 2012
New Revision: 45464

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45464
Log:
update to 12.6

Added:
    packages/ffcs/trunk/debian/patches/ff-examples++-load-load-link-in.patch
      - copied unchanged from r45047, packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch
    packages/ffcs/trunk/debian/patches/ff-src-Graphics-sansgraph-cpp.patch
    packages/ffcs/trunk/debian/patches/ff-src-Graphics-xglrgraf-cpp.patch
Removed:
    packages/ffcs/trunk/debian/patches/ff-kfreebsd.patch
Modified:
    packages/ffcs/trunk/debian/changelog
    packages/ffcs/trunk/debian/patches/install.patch
    packages/ffcs/trunk/debian/patches/series
    packages/ffcs/trunk/debian/watch

Modified: packages/ffcs/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/changelog?rev=45464&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/changelog (original)
+++ packages/ffcs/trunk/debian/changelog Fri Dec 14 08:25:29 2012
@@ -1,3 +1,9 @@
+ffcs (12.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Fri, 15 Jun 2012 14:37:44 +0200
+
 ffcs (11.14-1) unstable; urgency=low
 
   * Initial release (Closes: #643865)

Added: 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=45464&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-src-Graphics-sansgraph-cpp.patch (added)
+++ packages/ffcs/trunk/debian/patches/ff-src-Graphics-sansgraph-cpp.patch Fri Dec 14 08:25:29 2012
@@ -1,0 +1,11 @@
+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
+@@ -34,6 +34,7 @@
+ #include <iostream>
+ #include <cassert>
+ #include "rgraph.hpp"
++#include <unistd.h>
+ 
+ #include "error.hpp"
+ #ifdef macintoshxx

Added: 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=45464&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-src-Graphics-xglrgraf-cpp.patch (added)
+++ packages/ffcs/trunk/debian/patches/ff-src-Graphics-xglrgraf-cpp.patch Fri Dec 14 08:25:29 2012
@@ -1,0 +1,9 @@
+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
+@@ -27,4 +27,5 @@
+  */
+ #define XGL
+ #define FF_GRAPH_SET_PTR
++#include <unistd.h>
+ #include "glrgraph.hpp"

Modified: packages/ffcs/trunk/debian/patches/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/install.patch?rev=45464&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/install.patch (original)
+++ packages/ffcs/trunk/debian/patches/install.patch Fri Dec 14 08:25:29 2012
@@ -1,66 +1,51 @@
-Index: ffcs-11.14/pack/install.m4
+Index: ffcs-12.6/pack/install.m4
 ===================================================================
---- 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
+--- 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
+@@ -84,30 +84,30 @@
+ # find script (which may be at a different location and with a different name in Linux and Mac setups)
  
--# 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
+ ffcliscript="$prefix/FINALDIR"/FreeFem++-cli
+-publishscript "$ffcliscript" $bindir/FreeFem++-cli
+-publishscript "$ffcliscript" $bindir/FreeFem++-cli-VERSION
++publishscript "$ffcliscript" $DESTDIR/$bindir/FreeFem++-cli
++publishscript "$ffcliscript" $DESTDIR/$bindir/FreeFem++-cli-VERSION
  
- #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,
+ ifelse(ENABLE_GUI,yes,
+ ffcsscript="$prefix/FINALDIR"/FreeFem++-cs
 -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)
+ 
+ ffvtkscript="$prefix/FINALDIR"/FreeFem++-vtk
+-publishscript "$ffvtkscript" $bindir/FreeFem++-vtk
+-publishscript "$ffvtkscript" $bindir/FreeFem++-vtk-VERSION)
++publishscript "$ffvtkscript" $DESTDIR/$bindir/FreeFem++-vtk
++publishscript "$ffvtkscript" $DESTDIR/$bindir/FreeFem++-vtk-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)
+ ffserverscript="$prefix/FINALDIR"/FreeFem++-server
+-publishscript "$ffserverscript" $bindir/FreeFem++-server
+-publishscript "$ffserverscript" $bindir/FreeFem++-server-VERSION
++publishscript "$ffserverscript" $DESTDIR/$bindir/FreeFem++-server
++publishscript "$ffserverscript" $DESTDIR/$bindir/FreeFem++-server-VERSION
+ 
+ fflangscript="$prefix/FINALDIR"/FreeFem++-lang
+-publishscript "$ffserverscript" $bindir/FreeFem++-lang
+-publishscript "$ffserverscript" $bindir/FreeFem++-lang-VERSION
++publishscript "$ffserverscript" $DESTDIR/$bindir/FreeFem++-lang
++publishscript "$ffserverscript" $DESTDIR/$bindir/FreeFem++-lang-VERSION
+ 
+ ffmpilangscript="$prefix/FINALDIR"/FreeFem++-mpilang
+-publishscript "$ffmpilangscript" $bindir/FreeFem++-mpilang
+-publishscript "$ffmpilangscript" $bindir/FreeFem++-mpilang-VERSION)
++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"
-@@ -105,7 +113,7 @@
+@@ -115,7 +115,7 @@
  echo echo Uninstall OK >> "$uninstall"
  
  chmod a+x "$uninstall"
@@ -69,43 +54,34 @@
  
  # Local Variables:
  # mode:shell-script
-Index: ffcs-11.14/pack/Makefile.am
+Index: ffcs-12.6/pack/Makefile.am
 ===================================================================
---- 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 $< $@
+--- 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
+@@ -345,7 +345,7 @@
  endif
  
--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
+ examples:examples-main examples-tutorial examples-3d examples-eigen examples-mpi examples-chapt3 examples-other	\
+-	examples-load examples-ffcs
++	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-dir:${resdir}/examples
+@@ -364,6 +364,8 @@
+ 	rsync ${rsyncparm} ../ff/upstream/examples++-3d/ ${resdir}/examples/3d
  examples-eigen:examples-dir
- 	rsync -avq --delete ../ff/upstream/examples++-eigen/ ${resdir}/examples/eigen
+ 	rsync ${rsyncparm} ../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:examples-dir
-@@ -458,7 +460,7 @@
+@@ -511,7 +513,7 @@
+ # credentials, and we want to run tests unattended.
  
- if LINUX
- install:filetree
+ install-exec-local:filetree
 -	cd work && ./install_as_root ${prefix} ${bindir}
 +	cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
- endif
- if MACOS
- install:finaldir
-@@ -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
--	cd work && ./install_as_root ${prefix} ${bindir}
-+	cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
- endif
  
  # Source package check
+ # --------------------

Modified: packages/ffcs/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/series?rev=45464&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/series (original)
+++ packages/ffcs/trunk/debian/patches/series Fri Dec 14 08:25:29 2012
@@ -2,8 +2,10 @@
 configure.patch
 fltk.patch
 #
+ff-src-Graphics-sansgraph-cpp.patch
+ff-src-Graphics-xglrgraf-cpp.patch
 ff-examples++-load-Makefile.patch
-ff-kfreebsd.patch
+ff-examples++-load-load-link-in.patch
 ff-examples-bamg-test-dotest-pl.patch
 ff-examples-load-WHERE-LIBRARY.patch
 #

Modified: packages/ffcs/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/watch?rev=45464&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/watch (original)
+++ packages/ffcs/trunk/debian/watch Fri Dec 14 08:25:29 2012
@@ -1,4 +1,4 @@
 # Compulsory line, this is a version 3 file
 version=3
 opts=filenamemangle=s/.*=(.*)/$1/ \
-  http://www.ljll.math.upmc.fr/lehyaric/ffcs/packs /lehyaric/ffcs/packs/index.php\?dir=\&amp\;file\=ffcs-(\d+)\.(\d+)\.tgz
+  http://www.ljll.math.upmc.fr/lehyaric/ffcs/packs /lehyaric/ffcs/packs/index.php\?dir=\&amp\;file\=ffcs-(\d+)\.(\d+)-src\.tgz

More information about the debian-science-commits mailing list