r46823 - in /packages/ffcs/trunk/debian: control ffcs-client.install ffcs-server.install patches/configure.patch patches/ff-configure.patch patches/ff-remove_examples.patch patches/install.patch patches/series rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Thu Jul 17 12:05:08 UTC 2014


Author: trophime-guest
Date: Thu Jul 17 12:05:08 2014
New Revision: 46823

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46823
Log:
package build with jessie

Modified:
    packages/ffcs/trunk/debian/control
    packages/ffcs/trunk/debian/ffcs-client.install
    packages/ffcs/trunk/debian/ffcs-server.install
    packages/ffcs/trunk/debian/patches/configure.patch
    packages/ffcs/trunk/debian/patches/ff-configure.patch
    packages/ffcs/trunk/debian/patches/ff-remove_examples.patch
    packages/ffcs/trunk/debian/patches/install.patch
    packages/ffcs/trunk/debian/patches/series
    packages/ffcs/trunk/debian/rules

Modified: packages/ffcs/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/control?rev=46823&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/control	(original)
+++ packages/ffcs/trunk/debian/control	Thu Jul 17 12:05:08 2014
@@ -16,7 +16,7 @@
  flex, 
  bison, 
  libhypre-dev, 
- libfftw3-mpi-dev,
+ libfftw3-dev,
  libblas-dev,
  libgsl0-dev,
  libarpack2-dev,

Modified: packages/ffcs/trunk/debian/ffcs-client.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/ffcs-client.install?rev=46823&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/ffcs-client.install	(original)
+++ packages/ffcs/trunk/debian/ffcs-client.install	Thu Jul 17 12:05:08 2014
@@ -1,10 +1,12 @@
 usr/lib/freefem++-cs/FreeFem++-cs
+usr/lib/freefem++-cs/FreeFem++-cli
+usr/lib/freefem++-cs/FreeFem++-*lang
 usr/lib/freefem++-cs/FreeFem++-vtk
-usr/lib/freefem++-cs/Contents/Linux/ffmedit
-usr/lib/freefem++-cs/Contents/Linux/ffglut
-usr/lib/freefem++-cs/Contents/Linux/FreeFem++-cs*
+usr/lib/freefem++-cs/prettyedp
+usr/lib/freefem++-cs/Contents/Linux/FreeFem++-cli
+usr/lib/freefem++-cs/Contents/Linux/FreeFem++-gui
+usr/lib/freefem++-cs/Contents/Linux/FreeFem++-*lang
 usr/lib/freefem++-cs/Contents/Linux/FreeFem++-vtk
-usr/lib/freefem++-cs/Contents/Linux/FreeFem++-client
 
 usr/lib/freefem++-cs/Contents/Resources/logo.xpm
 usr/lib/freefem++-cs/Contents/Resources/examples

Modified: packages/ffcs/trunk/debian/ffcs-server.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/ffcs-server.install?rev=46823&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/ffcs-server.install	(original)
+++ packages/ffcs/trunk/debian/ffcs-server.install	Thu Jul 17 12:05:08 2014
@@ -1,8 +1,6 @@
-usr/lib/freefem++-cs/FreeFem++-server
-usr/lib/freefem++-cs/FreeFem++-mpiserver
+usr/lib/freefem++-cs/FreeFem++-*server
 
 usr/lib/freefem++-cs/Contents/Linux/FreeFem++-*server
 usr/lib/freefem++-cs/Contents/Linux/*.so
 
-usr/bin/FreeFem++-server
-usr/bin/FreeFem++-mpiserver
+usr/bin/FreeFem++-*server

Modified: packages/ffcs/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/configure.patch?rev=46823&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/configure.patch	(original)
+++ packages/ffcs/trunk/debian/patches/configure.patch	Thu Jul 17 12:05:08 2014
@@ -1,14 +1,183 @@
-Index: ffcs-14.5/ff/Makefile.am
+Index: ffcs-14.5/configure.ac
 ===================================================================
---- ffcs-14.5.orig/ff/Makefile.am
-+++ ffcs-14.5/ff/Makefile.am
-@@ -98,7 +98,7 @@ compile:upstream/config.status
- tags:TAGS
- TAGS:upstream/config.status
- 	etags --etags-include=upstream/TAGS *.?pp || etags -i upstream/TAGS *.?pp
--	cd upstream && $(MAKE) $(AM_MAKEFLAGS) tags
-+	cd upstream && $(MAKE) -i $(AM_MAKEFLAGS) tags
+--- ffcs-14.5.orig/configure.ac
++++ ffcs-14.5/configure.ac
+@@ -1702,14 +1702,14 @@ then
+     # line numbers in the editor, patch from the FLTK web site applied by Cico). But it will become active again as soon
+     # as line numbers are included in the default FLTK version.
+ 
+-###    if test "$enable_reuse" = yes
+-###    then
+-###	if test -f /usr/bin/fluid; then
+-###	    ffcs_fluid=/usr/bin/fluid;
+-###	elif test -f /usr/bin/fluid13; then
+-###	    ffcs_fluid=/usr/bin/fluid13;
+-###	fi
+-###    fi
++    if test "$enable_reuse" = yes
++    then
++	if test -f /usr/bin/fluid; then
++	    ffcs_fluid=/usr/bin/fluid;
++	elif test -f /usr/bin/fluid13; then
++	    ffcs_fluid=/usr/bin/fluid13;
++	fi
++    fi
+ ###    if test $ffcs_ostype = windows
+ ###    then
+ ###	ffcs_fluid="$MINGWEXEC $ffcs_fluid"
+@@ -1871,6 +1871,10 @@ if test $ffcs_ostype = macos
+ then
+     ffcs_finaldir="FreeFem++-cs $VERSION$ffcs_versiontail.app"
+ fi
++if test $ffcs_ostype = linux
++then
++    ffcs_finaldir="lib/freefem++-cs"
++fi
+ AC_MSG_RESULT("$ffcs_finaldir")
+ AC_SUBST(FINALDIR,"$ffcs_finaldir")
+ 
+Index: ffcs-14.5/pack/install.m4
+===================================================================
+--- ffcs-14.5.orig/pack/install.m4
++++ ffcs-14.5/pack/install.m4
+@@ -49,10 +49,16 @@ then
+     prefix=$1
+ fi
+ 
++DESTDIR=
++if test "$3" != ""
++then
++    DESTDIR=$3
++fi
++
+ # actual file transfer
+ 
+-mkdir -p $prefix
+-rsync -a "$location/" "$prefix/FINALDIR"
++mkdir -p "$DESTDIR/$prefix/FINALDIR"
++rsync -a "$location/" "$DESTDIR/$prefix/FINALDIR"
+ 
+ # links to the executable in a standard 'bin' directory given by $2 (default is /usr/local/bin)
+ 
+@@ -61,12 +67,12 @@ if test "$2" != ""
+ then
+     bindir=$2
+ fi
+-mkdir -p $bindir
++mkdir -p $DESTDIR/$bindir
+ 
+ # link to scripts with and without version numbers in the given 'bin' directory, and create the uninstall script at the
+ # same time
+ 
+-uninstall="$prefix/FINALDIR/uninstall"
++uninstall="$DESTDIR/$prefix/FINALDIR/uninstall"
+ echo '#!/bin/sh -x' > "$uninstall"
+ echo echo Removing installed FreeFem++-cs VERSION >> "$uninstall"
+ 
+@@ -85,7 +91,7 @@ function publishscript () {
+ # no space in its path to work properly. We cannot place that file in /var/tmp because uninstalling will certainly
+ # have problems if /var/tmp is cleaned.
+ 
+-desktopfile="$prefix/FINALDIR/ffcs-VERSION.desktop"
++desktopfile="$DESTDIR/$prefix/FINALDIR/ffcs-VERSION.desktop"
+ 
+ function writedesktopfile () {
+ 
+@@ -118,38 +124,43 @@ function writedesktopfile () {
+ # find script (which may be at a different location and with a different name in Linux and Mac setups)
+ 
+ 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
+ 
+ ifelse(ENABLE_GUI,yes,
+ ffcsscript="$prefix/FINALDIR"/FreeFem++-cs
+-publishscript "$ffcsscript" $bindir/FreeFem++-cs
+-publishscript "$ffcsscript" $bindir/FreeFem++-cs-VERSION
++publishscript "$ffcsscript" $DESTDIR/$bindir/FreeFem++-cs
++publishscript "$ffcsscript" $DESTDIR/$bindir/FreeFem++-cs-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,
+ 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)
+ 
+ # this will default to use system menus when user is root, and user menus when user is not root
++if test "$DESTDIR" != ""
++then
++    echo "do not install $desktopfile"
++else
+ if test -x /usr/bin/xdg-desktop-menu
+ then
+     writedesktopfile
+     xdg-desktop-menu install --novendor $desktopfile
+     echo xdg-desktop-menu uninstall $desktopfile >> "$uninstall"
+ fi
++fi
+ 
+ # completing the uninstall script
+ echo rm $bindir/FreeFem++-cs-VERSION-uninstall >> "$uninstall"
+@@ -157,7 +168,7 @@ echo rm -rf "'$prefix/FINALDIR'" >> "$un
+ echo echo Uninstall OK >> "$uninstall"
+ 
+ chmod a+x "$uninstall"
+-ln -s -f "$uninstall" $bindir/FreeFem++-cs-VERSION-uninstall
++ln -s -f "$uninstall" $DESTDIR/$bindir/FreeFem++-cs-VERSION-uninstall
+ 
+ # Local Variables:
+ # mode:shell-script
+Index: ffcs-14.5/pack/Makefile.am
+===================================================================
+--- ffcs-14.5.orig/pack/Makefile.am
++++ ffcs-14.5/pack/Makefile.am
+@@ -419,7 +419,7 @@ work/Contents/Resources/cs-logo-128-4.pn
+ endif
+ 
+ examples:examples-main examples-tutorial examples-3d examples-eigen examples-mpi examples-chapt3 examples-other	\
+-	examples-load examples-ffcs examples-contrib
++	examples-load examples-ffcs examples-contrib examples-bamg
+ 
+ # separate goal for examples-dir to avoid parallel processes that put the cart before the horses
+ work/Contents/Resources/examples/.dirok:work/Contents/Resources/.dirok
+@@ -466,6 +466,10 @@ examples-contrib:work/Contents/Resources
+ 	rsync ${rsyncparm} ../contrib/*.edp --exclude ../contrib/*-ffcsref.edp	\
+ 		work/Contents/Resources/examples/contrib
+ 
++examples-bamg:work/Contents/Resources/examples/.dirok
++	rsync ${rsyncparm} ../ff/upstream/examples-bamg/ \
++	        work/Contents/Resources/examples/bamg
++
+ ref:work/Contents/Resources/.dirok
+ 	rsync ${rsyncparm} ../ff/ref/ work/Contents/Resources/ref
+ 
+@@ -582,7 +586,7 @@ ffcs-src.tgz:
+ # credentials, and we want to run tests unattended.
+ 
+ install-exec-local:filetree
+-	cd work && ./install_as_root ${prefix} ${bindir}
++	cd work && ./install_as_root ${prefix} ${bindir} ${DESTDIR}
+ 
  clean-local::
- 	-rm TAGS
- 
- 
+ 	-rm *.done

Modified: packages/ffcs/trunk/debian/patches/ff-configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-configure.patch?rev=46823&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-configure.patch	(original)
+++ packages/ffcs/trunk/debian/patches/ff-configure.patch	Thu Jul 17 12:05:08 2014
@@ -87,3 +87,16 @@
  
  ff_blacs="-lblacsCinit$ff_with_mpi     -lblacsF77init$ff_with_mpi      -lblacs$ff_with_mpi"
  ff_scalapack=-lscalapack
+Index: ffcs-14.5/ff/Makefile.am
+===================================================================
+--- ffcs-14.5.orig/ff/Makefile.am
++++ ffcs-14.5/ff/Makefile.am
+@@ -98,7 +98,7 @@ compile:upstream/config.status
+ tags:TAGS
+ TAGS:upstream/config.status
+ 	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::
+ 	-rm TAGS
+ 

Modified: packages/ffcs/trunk/debian/patches/ff-remove_examples.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-remove_examples.patch?rev=46823&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-remove_examples.patch	(original)
+++ packages/ffcs/trunk/debian/patches/ff-remove_examples.patch	Thu Jul 17 12:05:08 2014
@@ -16,15 +16,17 @@
  hypre_FreeFem.cpp \
  interfacepastix.cpp \
  parms_FreeFem.cpp \
-@@ -59,7 +56,7 @@ MUMPS.edp  dmatrix.hpp
+@@ -59,8 +56,8 @@ MUMPS.edp  dmatrix.hpp
  # [[file:../../../configure.ac::tools_problems_all_platforms]] for reasons why some tools may be
  # deactivated).
  
 -LIST_COMPILE=@TOOL_DYLIB_mumps@ @TOOL_DYLIB_hips@ @TOOL_DYLIB_superludist@ @TOOL_DYLIB_pastix@ MPICG.$(DYLIB_SUFFIX)	\
+- at TOOL_DYLIB_parms@ mpi-cmaes.$(DYLIB_SUFFIX)
 +LIST_COMPILE=@TOOL_DYLIB_mumps@ @TOOL_DYLIB_superludist@ MPICG.$(DYLIB_SUFFIX)	\
- @TOOL_DYLIB_parms@ mpi-cmaes.$(DYLIB_SUFFIX)
++ mpi-cmaes.$(DYLIB_SUFFIX)
  
  if FFCS_MPIOK
+ 
 @@ -74,13 +71,13 @@ else
  all-local:
  endif
@@ -58,3 +60,61 @@
  TOOL_DISABLE(umfpack,UMFPACK64.$DYLIB_SUFFIX)
  TOOL_DISABLE(yams,freeyams.$DYLIB_SUFFIX)
  TOOL_DISABLE(pipe,pipe.$DYLIB_SUFFIX)
+Index: ffcs-14.5/ff/upstream/examples++-mpi/parms_FreeFem.cpp
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/examples++-mpi/parms_FreeFem.cpp
++++ ffcs-14.5/ff/upstream/examples++-mpi/parms_FreeFem.cpp
+@@ -33,7 +33,7 @@
+  */
+ 
+ #include <mpi.h>
+-#include  <iostream>
++#include <iostream>
+ using namespace std;
+ 
+ 
+@@ -60,16 +60,6 @@ extern "C" {
+ #endif
+ 
+ extern "C" {
+-
+-  // ALH - 24/7/13 - we need to include metis/defs.h explicitely
+-  // because pARMS also contains an include file called defs.h and
+-  // both include directories are specified on the command line to
+-  // compile this file.  Without this only one defs.h would be
+-  // included, the one from the first package specified above on the
+-  // line [[LIBRARY-dep]]
+-
+-  #include "../download/include/metis/defs.h"
+-
+   #include "metis.h"
+ }
+ 
+Index: ffcs-14.5/ff/upstream/src/solver/parms_FreeFem.cpp
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/src/solver/parms_FreeFem.cpp
++++ ffcs-14.5/ff/upstream/src/solver/parms_FreeFem.cpp
+@@ -30,7 +30,8 @@
+  */
+ 
+ 
+-#include  <iostream>
++#include <mpi.h>
++#include <iostream>
+ using namespace std;
+ 
+ 
+Index: ffcs-14.5/ff/upstream/src/solver/real_pastix_FreeFem.cpp
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/src/solver/real_pastix_FreeFem.cpp
++++ ffcs-14.5/ff/upstream/src/solver/real_pastix_FreeFem.cpp
+@@ -32,7 +32,8 @@
+ /*
+   Interface entre freefem++ et pastix
+ */
+-#include  <iostream>
++#include <mpi.h>
++#include <iostream>
+ using namespace std;
+    
+ #include "rgraph.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=46823&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/install.patch	(original)
+++ packages/ffcs/trunk/debian/patches/install.patch	Thu Jul 17 12:05:08 2014
@@ -2,7 +2,50 @@
 ===================================================================
 --- ffcs-14.5.orig/pack/install.m4
 +++ ffcs-14.5/pack/install.m4
-@@ -118,30 +118,30 @@ function writedesktopfile () {
+@@ -49,10 +49,16 @@ then
+     prefix=$1
+ fi
+ 
++DESTDIR=
++if test "$3" != ""
++then
++    DESTDIR=$3
++fi
++
+ # actual file transfer
+ 
+-mkdir -p $prefix
+-rsync -a "$location/" "$prefix/FINALDIR"
++mkdir -p $DESTDIR/$prefix
++rsync -a "$location/" "$DESTDIR/$prefix/FINALDIR"
+ 
+ # links to the executable in a standard 'bin' directory given by $2 (default is /usr/local/bin)
+ 
+@@ -61,12 +67,12 @@ if test "$2" != ""
+ then
+     bindir=$2
+ fi
+-mkdir -p $bindir
++mkdir -p $DESTDIR/$bindir
+ 
+ # link to scripts with and without version numbers in the given 'bin' directory, and create the uninstall script at the
+ # same time
+ 
+-uninstall="$prefix/FINALDIR/uninstall"
++uninstall="$DESTDIR/$prefix/FINALDIR/uninstall"
+ echo '#!/bin/sh -x' > "$uninstall"
+ echo echo Removing installed FreeFem++-cs VERSION >> "$uninstall"
+ 
+@@ -85,7 +91,7 @@ function publishscript () {
+ # no space in its path to work properly. We cannot place that file in /var/tmp because uninstalling will certainly
+ # have problems if /var/tmp is cleaned.
+ 
+-desktopfile="$prefix/FINALDIR/ffcs-VERSION.desktop"
++desktopfile="$DESTDIR/$prefix/FINALDIR/ffcs-VERSION.desktop"
+ 
+ function writedesktopfile () {
+ 
+@@ -118,38 +124,43 @@ function writedesktopfile () {
  # find script (which may be at a different location and with a different name in Linux and Mac setups)
  
  ffcliscript="$prefix/FINALDIR"/FreeFem++-cli
@@ -44,8 +87,21 @@
 +publishscript "$ffmpilangscript" $DESTDIR/$bindir/FreeFem++-mpilang-VERSION)
  
  # this will default to use system menus when user is root, and user menus when user is not root
++if test "$DESTDIR" != ""
++then
++    echo "do not install $desktopfile"
++else
  if test -x /usr/bin/xdg-desktop-menu
-@@ -157,7 +157,7 @@ echo rm -rf "'$prefix/FINALDIR'" >> "$un
+ then
+     writedesktopfile
+     xdg-desktop-menu install --novendor $desktopfile
+     echo xdg-desktop-menu uninstall $desktopfile >> "$uninstall"
+ fi
++fi
+ 
+ # completing the uninstall script
+ echo rm $bindir/FreeFem++-cs-VERSION-uninstall >> "$uninstall"
+@@ -157,7 +168,7 @@ echo rm -rf "'$prefix/FINALDIR'" >> "$un
  echo echo Uninstall OK >> "$uninstall"
  
  chmod a+x "$uninstall"
@@ -72,7 +128,7 @@
  		work/Contents/Resources/examples/contrib
  
 +examples-bamg:work/Contents/Resources/examples/.dirok
-+	rsync ${rsyncparm} ../ff/upstream/examples++-bamg/ \
++	rsync ${rsyncparm} ../ff/upstream/examples-bamg/ \
 +	        work/Contents/Resources/examples/bamg
 +
  ref:work/Contents/Resources/.dirok
@@ -83,7 +139,7 @@
  
  install-exec-local:filetree
 -	cd work && ./install_as_root ${prefix} ${bindir}
-+	cd work && ./install_as_root ${prefix} ${bindir} $(DESTDIR)
++	cd work && ./install_as_root ${prefix} ${bindir} ${DESTDIR}
  
  clean-local::
  	-rm *.done

Modified: packages/ffcs/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/series?rev=46823&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/series	(original)
+++ packages/ffcs/trunk/debian/patches/series	Thu Jul 17 12:05:08 2014
@@ -1,7 +1,8 @@
+configure.patch
+disable_linenumbering.patch
+#
+#  freefem++ patches
 ff-configure.patch
-install.patch
-configure.patch
-#
 ff-src-Graphics-sansgraph-cpp.patch
 ff-src-Graphics-xglrgraf-cpp.patch
 ff-examples++-load-Makefile.patch
@@ -10,7 +11,5 @@
 #
 ffcs-dev.patch
 #
-# more freefem++ patches
-#
 ff-examples++-load.patch
 ff-remove_examples.patch

Modified: packages/ffcs/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/rules?rev=46823&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/rules	(original)
+++ packages/ffcs/trunk/debian/rules	Thu Jul 17 12:05:08 2014
@@ -71,8 +71,8 @@
 	cd $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/doc .
 	
 	# Strip binaries
-	strip $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-cs
-	strip $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-vtk
+	strip $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-*
+	strip $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/FreeFem++-*
 	
 	# Client side (?)
 	-rm -f $(CURDIR)/debian/tmp/usr/bin/FreeFem++-cs
@@ -99,7 +99,7 @@
         # Server (?)
 	-rm -f $(CURDIR)/debian/tmp/usr/bin/FreeFem++-*server
 	cd $(CURDIR)/debian/tmp/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-server
-	cd $(CURDIR)/debian/tmp/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-mpiserver
+	#cd $(CURDIR)/debian/tmp/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-mpiserver
 
 clean::
 	-rm -rf autom4te.cache INSTALL missing install-sh compile depcomp 




More information about the debian-science-commits mailing list