r44038 - in /packages/ffcs/trunk/debian: FreeFem++-cs.1 FreeFem++-vtk.1 control rules
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Mon Nov 21 09:53:42 UTC 2011
Author: trophime-guest
Date: Mon Nov 21 09:53:39 2011
New Revision: 44038
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44038
Log:
now provides a working ffcs
Added:
packages/ffcs/trunk/debian/FreeFem++-cs.1
packages/ffcs/trunk/debian/FreeFem++-vtk.1
Modified:
packages/ffcs/trunk/debian/control
packages/ffcs/trunk/debian/rules
Added: packages/ffcs/trunk/debian/FreeFem++-cs.1
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/FreeFem%2B%2B-cs.1?rev=44038&op=file
==============================================================================
--- packages/ffcs/trunk/debian/FreeFem++-cs.1 (added)
+++ packages/ffcs/trunk/debian/FreeFem++-cs.1 Mon Nov 21 09:53:39 2011
@@ -1,0 +1,56 @@
+.TH FreeFem++-cs 1 LOCAL
+.SH NAME
+.B FreeFem++-cs
+- an integrated environment for
+.B FreeFem++
+.SH SYNOPSYS
+.B FreeFem++-cs
+.I "[file.edp]"
+.SH DESCRIPTION
+.P
+The goal of
+.B FreeFem++-cs
+is to give to
+.B FreeFem++
+a user-friendly interface which resembles other popular windowed applications. It follows a client/server design (hence its name:
+.I cs
+as in Client and Server).
+.P
+The
+.I "Help"
+menu contains the full
+.B FreeFem++
+documentation, as well as a reference card for all the language keywords.
+.P
+.B FreeFem++-cs
+calls the commands
+.B FreeFem++-client,
+.B FreeFem++-server
+and
+.B FreeFem++-mpiserver
+to run sequential and parallel computations.
+.B FreeFem++-client,
+.B FreeFem++-server
+and
+.B FreeFem++-mpiserver
+are not designed be used separately.
+.SH EXAMPLES
+Check
+.I "File/Open Examples..."
+for a list of standard
+.B FreeFem++
+examples.
+.SH BUGS
+Please submit any bug to
+.br
+http://www.ljll.math.upmc.fr/lehyaric/ffcs/testing.php
+.SH SEE ALSO
+FreeFem++-vtk(1), FreeFem++(1)
+.P
+.B FreeFem++-cs website
+.br
+http://www.ljll.math.upmc.fr/lehyaric
+.P
+.B FreeFem++ website
+.br
+http://www.freefem.org/ff++
Added: packages/ffcs/trunk/debian/FreeFem++-vtk.1
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/FreeFem%2B%2B-vtk.1?rev=44038&op=file
==============================================================================
--- packages/ffcs/trunk/debian/FreeFem++-vtk.1 (added)
+++ packages/ffcs/trunk/debian/FreeFem++-vtk.1 Mon Nov 21 09:53:39 2011
@@ -1,0 +1,41 @@
+.TH ffg 1 LOCAL
+.SH NAME
+.B FreeFem++-vtk
+- a VTK-based graphical window for
+.B FreeFem++
+.SH SYNOPSYS
+.B FreeFem++
+-glut
+.B FreeFem++-vtk
+.I "[other FreeFem++ options]"
+.I "[file.edp]"
+.SH DESCRIPTION
+.P
+.B FreeFem++-vtk
+contains the same graphical primitives as
+.B FreeFem++-cs.
+It replaces the default FreeFem++
+.B ffglut
+command to display
+graphics in the same way as
+.B FreeFem++-cs.
+.P
+.B FreeFem++-vtk
+can only be used as a parameter to the
+.B FreeFem++
+.I -glut
+option.
+.SH BUGS
+Please submit any bug to
+.br
+http://www.ljll.math.upmc.fr/lehyaric/ffcs/testing.php
+.SH SEE ALSO
+FreeFem++(1), FreeFem++-cs(1)
+.P
+.B FreeFem++-cs website
+.br
+http://www.ljll.math.upmc.fr/lehyaric
+.P
+.B FreeFem++ website
+.br
+http://www.freefem.org/ff++
Modified: packages/ffcs/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/control?rev=44038&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/control (original)
+++ packages/ffcs/trunk/debian/control Mon Nov 21 09:53:39 2011
@@ -14,7 +14,8 @@
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
+ rsync,
+ hardening-includes,hardening-wrapper
#
# quilt, cdbs, debhelper (>= 7.0.50~), autotools-dev,
# autoconf, automake,
Modified: packages/ffcs/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/rules?rev=44038&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/rules (original)
+++ packages/ffcs/trunk/debian/rules Mon Nov 21 09:53:39 2011
@@ -22,12 +22,14 @@
#export CC=gcc-4.5
#export FC=gfortran-4.5
-#include /usr/share/hardening-includes/hardening.make
-#
-#CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-#LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-#CFLAGS+=$(HARDENING_CFLAGS)
-#LDFLAGS+=$(HARDENING_LDFLAGS)
+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)
update-config::
rm -f configure
@@ -107,6 +109,8 @@
$(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/ffcs-client/usr/lib/freefem++-cs/ffg
@@ -115,18 +119,14 @@
# Client side (?)
mkdir -p $(CURDIR)/debian/ffcs-client/usr/bin
- install $(CURDIR)/debian/tmp/usr/bin/FreeFem++-client $(CURDIR)/debian/ffcs-client/usr/bin
- install $(CURDIR)/debian/tmp/usr/bin/FreeFem++-vtk $(CURDIR)/debian/ffcs-client/usr/bin
- #cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/ffg .
- #cd $(CURDIR)/debian/ffcs-client/usr/bin && ln -s ../lib/freefem++-cs/ffg ffg-$(version)
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++-cs FreeFem++-cs-$(version)
+ #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
- install -m 644 doc/FreeFem++-cs.1 $(CURDIR)/debian/ffcs-client/usr/share/man/man1
- install -m 644 doc/ffg.1 $(CURDIR)/debian/ffcs-client/usr/share/man/man1
- rm -f $(CURDIR)/debian/ffcs-client/usr/share/ffcs/doc/*.1
+ # 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/
@@ -172,10 +172,8 @@
# Server (?)
mkdir -p $(CURDIR)/debian/ffcs-server/usr/bin
- install $(CURDIR)/debian/tmp/usr/bin/FreeFem++*server $(CURDIR)/debian/ffcs-server/usr/bin
- #cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffs ffs-$(version)
- #cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffsmpi .
- #cd $(CURDIR)/debian/ffcs-server/usr/bin && ln -s ../lib/freefem++-cs/ffsmpi ffsmpi-$(version)
+ 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
More information about the debian-science-commits
mailing list