r44042 - in /packages/ffcs/trunk/debian: changelog control ffcs-client.install ffcs-dev.install ffcs-server.install patches/configure.patch patches/fltk.patch rules
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Mon Nov 21 17:11:45 UTC 2011
Author: trophime-guest
Date: Mon Nov 21 17:11:40 2011
New Revision: 44042
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44042
Log:
some cleanup
Added:
packages/ffcs/trunk/debian/ffcs-client.install
packages/ffcs/trunk/debian/ffcs-dev.install
packages/ffcs/trunk/debian/ffcs-server.install
Modified:
packages/ffcs/trunk/debian/changelog
packages/ffcs/trunk/debian/control
packages/ffcs/trunk/debian/patches/configure.patch
packages/ffcs/trunk/debian/patches/fltk.patch
packages/ffcs/trunk/debian/rules
Modified: packages/ffcs/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/changelog?rev=44042&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/changelog (original)
+++ packages/ffcs/trunk/debian/changelog Mon Nov 21 17:11:40 2011
@@ -2,5 +2,5 @@
* Initial release (Closes: #643865)
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Mon, 03 Oct 2011 11:21:31 +0200
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Mon, 21 Nov 2011 16:12:15 +0100
Modified: packages/ffcs/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/control?rev=44042&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/control (original)
+++ packages/ffcs/trunk/debian/control Mon Nov 21 17:11:40 2011
@@ -13,20 +13,10 @@
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, libmysqlclient-dev (>= 5.1.56),
- rsync,
- hardening-includes,hardening-wrapper
-#
-# quilt, cdbs, debhelper (>= 7.0.50~), autotools-dev,
-# autoconf, automake,
-# bison, freeglut3-dev, g++ (>= 4:4.4.3), gfortran (>= 4:4.4.3),
-# libxext-dev, libxpm-dev, libxt-dev, m4, dpkg-dev (>= 1.13.5), patch,
-# libvtk5-dev (>= 5.6),
-# mpi-default-bin, mpi-default-dev, rsync, libgmm++-dev,
+ fluid, libfltk1.3-dev,
+ rsync
# libmysqlclient-dev (>= 5.1.56),
-# libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev,
-# See README.Debian for the rational on the gcc version.
-# g++-4.5, gfortran-4.5
+# hardening-includes,hardening-wrapper
Standards-Version: 3.9.2
Homepage: http://www.ljll.math.upmc.fr/lehyaric/ffcs/index.htm
#Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/ffcs
Added: packages/ffcs/trunk/debian/ffcs-client.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/ffcs-client.install?rev=44042&op=file
==============================================================================
--- packages/ffcs/trunk/debian/ffcs-client.install (added)
+++ packages/ffcs/trunk/debian/ffcs-client.install Mon Nov 21 17:11:40 2011
@@ -1,0 +1,25 @@
+usr/lib/freefem++-cs/FreeFem++-cs
+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/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
+usr/lib/freefem++-cs/Contents/Resources/ref
+usr/lib/freefem++-cs/Contents/Resources/doc
+
+usr/bin/FreeFem++-cs
+
+usr/share/ffcs/logo.xpm
+
+debian/FreeFem++-cs.1 usr/share/man/man1
+debian/FreeFem++-vtk.1 usr/share/man/man1
+debian/ffcs-client.desktop usr/share/applications
+debian/freefem++-cs.xpm usr/share/pixmaps
+
+debian/tmp/usr/lib/freefem++-cs/Contents/Resources/doc/* usr/share/ffcs/doc
+debian/tmp/usr/lib/freefem++-cs/Contents/Resources/ref/* usr/share/ffcs/ref
+debian/tmp/usr/lib/freefem++-cs/Contents/Resources/examples/* usr/share/ffcs/examples
Added: packages/ffcs/trunk/debian/ffcs-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/ffcs-dev.install?rev=44042&op=file
==============================================================================
--- packages/ffcs/trunk/debian/ffcs-dev.install (added)
+++ packages/ffcs/trunk/debian/ffcs-dev.install Mon Nov 21 17:11:40 2011
@@ -1,0 +1,9 @@
+ff/upstream/examples++-load/include/* usr/include/freefem++-cs
+ff/upstream/src/libMesh/*.h* usr/include/freefem++-cs/libMesh
+ff/upstream/examples++-load/ffcs-c++ usr/bin
+ff/upstream/examples++-load/ffcs-get-dep usr/bin
+
+debian/ffcs-*.1 usr/share/man/man1
+
+ff/upstream/examples++-load/WHERE_LIBRARY-download usr/lib/freefem++-cs/Contents/Linux
+ff/upstream/examples++-load/WHERE_LIBRARY-config usr/lib/freefem++-cs/Contents/Linux
Added: packages/ffcs/trunk/debian/ffcs-server.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/ffcs-server.install?rev=44042&op=file
==============================================================================
--- packages/ffcs/trunk/debian/ffcs-server.install (added)
+++ packages/ffcs/trunk/debian/ffcs-server.install Mon Nov 21 17:11:40 2011
@@ -1,0 +1,8 @@
+usr/lib/freefem++-cs/FreeFem++-server
+usr/lib/freefem++-cs/FreeFem++-mpiserver
+
+usr/lib/freefem++-cs/Contents/Linux/FreeFem++-*server
+usr/lib/freefem++-cs/Contents/Linux/*.so
+
+usr/bin/FreeFem++-server
+usr/bin/FreeFem++-mpiserver
Modified: packages/ffcs/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/configure.patch?rev=44042&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/configure.patch (original)
+++ packages/ffcs/trunk/debian/patches/configure.patch Mon Nov 21 17:11:40 2011
@@ -1,8 +1,8 @@
-Index: ffcs-11.8/configure.ac
+Index: ffcs-11.11/configure.ac
===================================================================
---- ffcs-11.8.orig/configure.ac 2011-04-04 12:54:53.000000000 +0200
-+++ ffcs-11.8/configure.ac 2011-04-04 12:54:53.000000000 +0200
-@@ -837,7 +837,7 @@
+--- 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.
@@ -11,10 +11,10 @@
# reuse the same compilers for FF configuration in case a specific
# one was specified here (eg for MingW64)
-Index: ffcs-11.8/ff/Makefile.am
+Index: ffcs-11.11/ff/Makefile.am
===================================================================
---- ffcs-11.8.orig/ff/Makefile.am 2011-04-04 12:54:53.000000000 +0200
-+++ ffcs-11.8/ff/Makefile.am 2011-04-04 12:54:53.000000000 +0200
+--- 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.
Modified: packages/ffcs/trunk/debian/patches/fltk.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/fltk.patch?rev=44042&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/fltk.patch (original)
+++ packages/ffcs/trunk/debian/patches/fltk.patch Mon Nov 21 17:11:40 2011
@@ -1,22 +1,22 @@
Index: ffcs-11.11/fltk/Makefile.am
===================================================================
---- ffcs-11.11.orig/fltk/Makefile.am 2011-11-09 15:56:28.450825146 +0100
-+++ ffcs-11.11/fltk/Makefile.am 2011-11-09 15:56:29.000000000 +0100
+--- 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
@@ -35,9 +35,15 @@
cd upstream && ./configure @FLTKOPTS@
if ENABLE_CLIENT
-all:upstream/config.status all_fltk include.mak
-+ all_client: upstream/config.status all_fltk include.mak
++all_client: upstream/config.status all_fltk include.mak
else
-all:
-+ all_client:
++all_client:
+endif
+
+if DEBIAN
-+ all: include.mak
++all-local: debian_include.mak
+else
-+ all: all_client
++all-local: all_client
endif
# add the MinGW dir to the path otherwise FLTK will not find
@@ -32,10 +32,21 @@
# This dependency is required for parallel make to understand that it
# has to wait for FLTK to be built before using FLTKCONF
+@@ -80,6 +90,10 @@
+ echo FLTKCONF=$< > $@
+ echo FLTK_CXXFLAGS=`$< ${FLTK_OPTIONS} --cxxflags` >> $@
+ echo FLTK_LDFLAGS=`$< ${FLTK_OPTIONS} --ldflags` >> $@
++debian_include.mak:
++ echo FLTKCONF=${FLTKCONF} > include.mak
++ echo FLTK_CXXFLAGS=`${FLTKCONF} ${FLTK_OPTIONS} --cxxflags` >> include.mak
++ echo FLTK_LDFLAGS=`${FLTKCONF} ${FLTK_OPTIONS} --ldflags` >> include.mak
+ clean-local::
+ -rm include.mak
+
Index: ffcs-11.11/src/Makefile.am
===================================================================
---- ffcs-11.11.orig/src/Makefile.am 2011-11-09 15:56:28.506825143 +0100
-+++ ffcs-11.11/src/Makefile.am 2011-11-09 16:09:05.806793291 +0100
+--- 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
@@ -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,8 +67,8 @@
../vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx ffg.cpp menu.hpp menu.cpp visucontrol.hpp visucontrol.cpp \
Index: ffcs-11.11/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx
===================================================================
---- ffcs-11.11.orig/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx 2011-11-09 15:56:28.482825145 +0100
-+++ ffcs-11.11/vtkFlRWI/upstream/vtkFlRenderWindowInteractor.cxx 2011-11-09 15:56:29.000000000 +0100
+--- 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
@@ -33,7 +33,7 @@
// FLTK
//ALH-seems not to be included by default, and __APPLE_COCOA__ is not seen
@@ -69,8 +80,8 @@
#include <vtkRenderWindow.h>
Index: ffcs-11.11/src/editor.cpp
===================================================================
---- ffcs-11.11.orig/src/editor.cpp 2011-11-09 15:56:28.538825142 +0100
-+++ ffcs-11.11/src/editor.cpp 2011-11-09 15:56:29.000000000 +0100
+--- 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 @@
// replace them with one regular LF.
int i=0;
@@ -80,3 +91,16 @@
else i++;
}
#endif
+Index: ffcs-11.11/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 @@
+ # made).
+
+ with_fltk=none
+-if test $enable_client = yes
++if test $enable_client = yes && test "$enable_debian" != yes
+ then
+
+ # FLTK-specific options
Modified: packages/ffcs/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/rules?rev=44042&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/rules (original)
+++ packages/ffcs/trunk/debian/rules Mon Nov 21 17:11:40 2011
@@ -18,18 +18,15 @@
--with-parallel-build=$(NUMJOBS) \
--with-freefem-options="--enable-optim --enable-generic --disable-pdf --disable-download --with-mpi=yes --program-transform-name=\"s/^FreeFem++/freefem++/\" "
-#export CXX=g++-4.5
-#export CC=gcc-4.5
-#export FC=gfortran-4.5
-include /usr/share/hardening-includes/hardening.make
+#include /usr/share/hardening-includes/hardening.make
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-CXFLAGS=$(shell dpkg-buildflags --get CXFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-CXXFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
+#CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+#CXFLAGS=$(shell dpkg-buildflags --get CXFLAGS)
+#LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+#CFLAGS+=$(HARDENING_CFLAGS)
+#CXXFLAGS+=$(HARDENING_CFLAGS)
+#LDFLAGS+=$(HARDENING_LDFLAGS)
update-config::
rm -f configure
@@ -41,143 +38,61 @@
cd ff/upstream && automake --add-missing --gnu --force
install/ffcs-dev::
- mkdir -p $(CURDIR)/debian/ffcs-dev/usr/include/freefem++-cs
- install $(CURDIR)/ff/upstream/examples++-load/include/* \
- $(CURDIR)/debian/ffcs-dev/usr/include/freefem++-cs
- mkdir -p $(CURDIR)/debian/ffcs-dev/usr/include/freefem++-cs/libMesh
- install $(CURDIR)/ff/upstream/src/libMesh/* \
- $(CURDIR)/debian/ffcs-dev/usr/include/freefem++-cs/libMesh
- install $(CURDIR)/ff/upstream/src/libMesh/libMesh.a \
- $(CURDIR)/debian/ffcs-dev/usr/include/freefem++-cs/libMesh
-
- mkdir -p $(CURDIR)/debian/ffcs-dev/usr/lib/freefem++-cs/Contents/Linux
- install -m 644 $(CURDIR)/ff/upstream/examples++-load/WHERE_LIBRARY-download \
- $(CURDIR)/debian/ffcs-dev/usr/lib/freefem++-cs/Contents/Linux
- install -m 644 $(CURDIR)/ff/upstream/examples++-load/WHERE_LIBRARY-config \
- $(CURDIR)/debian/ffcs-dev/usr/lib/freefem++-cs/Contents/Linux
-
-
# Build ffcs-c++ and ffcs-get-dep
make -C $(CURDIR)/ff/upstream/examples++-load ffcs-c++
make -C $(CURDIR)/ff/upstream/examples++-load ffcs-get-dep
- # Install ffcs-c++ and ffcs-get-dep
- mkdir -p $(CURDIR)/debian/ffcs-dev/usr/bin
- install $(CURDIR)/ff/upstream/examples++-load/ffcs-c++ \
- $(CURDIR)/debian/ffcs-dev/usr/bin
- install $(CURDIR)/ff/upstream/examples++-load/ffcs-get-dep \
- $(CURDIR)/debian/ffcs-dev/usr/bin
-
- mkdir -p $(CURDIR)/debian/ffcs-dev/usr/share/man/man1
- install -m 644 $(CURDIR)/debian/ffcs-*.1 $(CURDIR)/debian/ffcs-dev/usr/share/man/man1
-
install/ffcs-client::
- mkdir -p $(CURDIR)/debian/ffcs-client/usr/share/ffcs/doc
- mv $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/doc/* $(CURDIR)/debian/ffcs-client/usr/share/ffcs/doc
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/ffcs/doc
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/ffcs/ref
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/ffcs/examples
+
+ mv $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/doc/* $(CURDIR)/debian/tmp/usr/share/ffcs/doc
+ mv $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/ref/* $(CURDIR)/debian/tmp/usr/share/ffcs/ref
+ mv $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/examples/* $(CURDIR)/debian/tmp/usr/share/ffcs/examples
+ mv $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/logo.xpm $(CURDIR)/debian/tmp/usr/share/ffcs
+
rm -rf $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/doc
-
- mkdir -p $(CURDIR)/debian/ffcs-client/usr/share/ffcs/ref
- mv $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/ref/* $(CURDIR)/debian/ffcs-client/usr/share/ffcs/ref
rm -rf $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/ref
-
- mkdir -p $(CURDIR)/debian/ffcs-client/usr/share/ffcs/examples
- mv $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/examples/* $(CURDIR)/debian/ffcs-client/usr/share/ffcs/examples
rm -rf $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/examples
-
- mv $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/logo.xpm $(CURDIR)/debian/ffcs-client/usr/share/ffcs
rm -rf $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources/logo.xpm
# Create links in /usr/lib/freefem++-cs-$(version)/Contents/Resources
mkdir -p $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Resources
- cd $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/logo.xpm .
- cd $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/examples .
- cd $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/ref .
- cd $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/doc .
+ cd $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/logo.xpm .
+ cd $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/examples .
+ cd $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/ref .
+ cd $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Resources && ln -sf ../../../../share/ffcs/doc .
- # Install binaries
- #install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/ffg $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-cs $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-vtk $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs
- mkdir -p $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffmedit \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- #install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffg \
- # $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/ffglut \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/FreeFem++-cs\ $(DEB_UPSTREAM_VERSION) \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/FreeFem++-vtk \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/FreeFem++-client \
- $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/Linux
+ # Strip binaries
+ strip $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-cs
+ strip $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-vtk
+
+ # Client side (?)
+ -rm -f $(CURDIR)/debian/tmp/usr/bin/FreeFem++-cs
+ cd $(CURDIR)/debian/tmp/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-cs .
+
+
+ # 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
+
+ # 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
+
+install/ffcs-server::
+ -rm -f $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/libfakeroot-sysv.so
# Strip binaries
- #strip $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/ffg
- strip $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/FreeFem++-cs
- strip $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/FreeFem++-vtk
-
- # Client side (?)
- mkdir -p $(CURDIR)/debian/ffcs-client/usr/bin
- cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-cs .
- #cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-vtk .
-
- # Make mampages
- mkdir -p $(CURDIR)/debian/ffcs-client/usr/share/man/man1
- # replace orig manpages in doc by manpages in debian - temporary
- install -m 644 debian/FreeFem++-cs.1 $(CURDIR)/debian/ffcs-client/usr/share/man/man1
- #install -m 644 debian/FreeFem++-vtk.1 $(CURDIR)/debian/ffcs-client/usr/share/man/man1
-
- # Make desktop
- mkdir -p $(CURDIR)/debian/ffcs-client/usr/share/applications/
- cp debian/ffcs-client.desktop $(CURDIR)/debian/ffcs-client/usr/share/applications/
- mkdir -p $(CURDIR)/debian/ffcs-client/usr/share/pixmaps/
- cp debian/freefem++-cs.xpm $(CURDIR)/debian/ffcs-client/usr/share/pixmaps/freefem++-cs.xpm
-
- # fix executable-not-elf-or-script
- chmod ugo-xr $(CURDIR)/debian/ffcs-client/usr/share/ffcs/examples/bamg/square/dotest
- chmod ugo-xr $(CURDIR)/debian/ffcs-client/usr/share/ffcs/examples/bamg/NACA012/data*
- chmod ugo-xr $(CURDIR)/debian/ffcs-client/usr/share/ffcs/examples/bamg/NACA012/*.awk
- chmod ugo-xr $(CURDIR)/debian/ffcs-client/usr/share/ffcs/examples/tutorial/xyf
-
- # Remove uneeded files
- find $(CURDIR)/debian/ffcs-client/usr/share/ffcs -name \*.m4 | xargs -r rm
- find $(CURDIR)/debian/ffcs-client/usr/share/ffcs -name \Makefile.am | xargs -r rm
-
- # Remove uneeded shared lib
- rm -f $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/COPYING
- rm -f $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/INSTALL
- rm -f $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/README
- rm -f $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/AUTHORS
- rm -f $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/install_*
- rm -rf $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/info.plist
- rm -rf $(CURDIR)/debian/ffcs-client/usr/lib/freefem++-cs/Contents/PkgInfo
-
-install/ffcs-server::
- # Install libraries (?)
- mkdir -p $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs/Contents/Linux
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/*.so $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs/Contents/Linux
- -rm -f $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs/Contents/Linux/libfakeroot-sysv.so
-
- # Install binaries (?)
- mkdir -p $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-server $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-mpiserver $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/uninstall $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs
- install $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/Contents/Linux/FreeFem++-*server \
- $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs/Contents/Linux
-
- # Strip binaries
- strip $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs/FreeFem++-*server
+ strip $(CURDIR)/debian/tmp/usr/lib/freefem++-cs/FreeFem++-*server
# Server (?)
- mkdir -p $(CURDIR)/debian/ffcs-server/usr/bin
- cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-server
- cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/FreeFem++-mpiserver
- cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/uninstall FreeFem++-cs-$(version)-uninstall
-
- # Remove path from bindir
- perl -pi -e "s|$(CURDIR)/debian/tmp||g" $(CURDIR)/debian/ffcs-server/usr/lib/freefem++-cs/uninstall
+ -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
clean::
-rm -rf autom4te.cache INSTALL missing install-sh compile depcomp
More information about the debian-science-commits
mailing list