[SCM] FreeFem++ packaging branch, master, updated. debian/3.18-1-4-g5e32d81

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Sat Feb 18 13:55:46 UTC 2012 

The following commit has been merged in the master branch:
commit 5e32d81e97b6de5ae9d79cd594c073fbdbd78708
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sat Feb 18 15:52:40 2012 +0200

    New upstream release

diff --git a/DOC/freefem++doc.pdf b/DOC/freefem++doc.pdf
deleted file mode 100644
index 5ba24e0..0000000
Binary files a/DOC/freefem++doc.pdf and /dev/null differ
diff --git a/DOC/freefem++doc.tex b/DOC/freefem++doc.tex
index 7d4b331..0396d48 100644
--- a/DOC/freefem++doc.tex
+++ b/DOC/freefem++doc.tex
@@ -2771,8 +2771,8 @@ while(1)  //  Loop on viscosity
 
 \begin{figure}[htbp]
 \begin{center}
-\includegraphics[width=8cm]{NSnewtonTh}
-\includegraphics[width=8cm]{NSnewtonUP}
+\includegraphics[width=8cm]{NSNewtonTh}
+\includegraphics[width=8cm]{NSNewtonUP}
 \caption{\label{NSnewton} Mesh and the velocity and pressure at Reynolds  $ 200$ }
 \end{center}
 \end{figure}
diff --git a/debian/changelog b/debian/changelog
index bee77c5..5de0022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freefem++ (3.18.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Create new patch for documentation build.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Fri, 17 Feb 2012 21:29:00 +0200
+
 freefem++ (3.18-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/DOC-freefem++-doc.patch b/debian/patches/DOC-freefem++-doc.patch
new file mode 100644
index 0000000..29164af
--- /dev/null
+++ b/debian/patches/DOC-freefem++-doc.patch
@@ -0,0 +1,14 @@
+Correct figure names NSNewtonTh.jpg and NSNewtonUP.jpg
+--- a/DOC/freefem++doc.tex
++++ b/DOC/freefem++doc.tex
+@@ -2771,8 +2771,8 @@
+ 
+ \begin{figure}[htbp]
+ \begin{center}
+-\includegraphics[width=8cm]{NSnewtonTh}
+-\includegraphics[width=8cm]{NSnewtonUP}
++\includegraphics[width=8cm]{NSNewtonTh}
++\includegraphics[width=8cm]{NSNewtonUP}
+ \caption{\label{NSnewton} Mesh and the velocity and pressure at Reynolds  $ 200$ }
+ \end{center}
+ \end{figure}
diff --git a/debian/patches/examples++-load-Makefile.patch b/debian/patches/examples++-load-Makefile.patch
index 537a540..51622b2 100644
--- a/debian/patches/examples++-load-Makefile.patch
+++ b/debian/patches/examples++-load-Makefile.patch
@@ -1,19 +1,21 @@
-Locate freefem++.pref and ignore nlopt from building
+Exclude nlopt from build and locate freefem++.pref
 --- a/examples++-load/Makefile.am
 +++ b/examples++-load/Makefile.am
-@@ -65,9 +65,9 @@
+@@ -68,11 +68,11 @@
          isolineP1.$(DYLIB_SUFFIX) isoline.$(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)
+-	myfunction2.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX)  ff-cmaes.$(DYLIB_SUFFIX) \
++	myfunction2.$(DYLIB_SUFFIX)  ff-cmaes.$(DYLIB_SUFFIX) \
+ 	MetricPk.$(DYLIB_SUFFIX) FreeFemQA.$(DYLIB_SUFFIX)
+ 
  
 -LIST_COMPILE_PKG= 	tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
-+LIST_COMPILE_PKG= 	tetgen.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(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) \
  	lapack.$(DYLIB_SUFFIX)  fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
  	freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
-@@ -147,8 +147,7 @@
+@@ -152,8 +152,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
@@ -25,19 +27,20 @@ Locate freefem++.pref and ignore nlopt from building
  	$(INSTALL_SCRIPT) ff-get-dep  $(DESTDIR)${bindir}
 --- a/examples++-load/Makefile.in
 +++ b/examples++-load/Makefile.in
-@@ -330,9 +330,9 @@
+@@ -333,10 +333,10 @@
          isolineP1.$(DYLIB_SUFFIX) isoline.$(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)
+-	myfunction2.$(DYLIB_SUFFIX) ff-NLopt.$(DYLIB_SUFFIX)  ff-cmaes.$(DYLIB_SUFFIX) \
++	myfunction2.$(DYLIB_SUFFIX)  ff-cmaes.$(DYLIB_SUFFIX) \
+ 	MetricPk.$(DYLIB_SUFFIX) FreeFemQA.$(DYLIB_SUFFIX)
  
 -LIST_COMPILE_PKG = tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(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) \
  	lapack.$(DYLIB_SUFFIX)  fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
  	freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
-@@ -724,8 +724,7 @@
+@@ -728,8 +728,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
diff --git a/debian/patches/series b/debian/patches/series
index 953ede5..1526288 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
+DOC-freefem++-doc.patch
+examples++-load-Makefile.patch
 examples++-load-load-link-in.patch
 examples-bamg-test-dotest-pl.patch
 examples-load-WHERE-LIBRARY.patch
-examples++-load-Makefile.patch
diff --git a/debian/repack.sh~ b/debian/repack.sh~
deleted file mode 100644
index 7f33224..0000000
--- a/debian/repack.sh~
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-#clean up the upstream tarball
-
-PACKAGE=freefem++
-VERSION=3.18
-VERSION1=3.18
-
-cd ../..
-mkdir tmp
-mv $PACKAGE-$VERSION.tar.gz tmp
-cd tmp
-tar zxf $PACKAGE-$VERSION.tar.gz
-rm $(find $PACKAGE-$VERSION -iname '._*')
-tar -czf $PACKAGE-$VERSION1.tar.gz $PACKAGE-$VERSION
-mv $PACKAGE-$VERSION1.tar.gz ..
-cd ..
-rm -rf tmp 
-
-exit 0
\ No newline at end of file
diff --git a/debian/source/options b/debian/source/options
index e934ae7..c882acd 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
- extend-diff-ignore = "(^|/)(INSTALL|configure|depcomp|install-sh|missing|mkinstalldirs|src/fflib/strversionnumber\.cpp|examples\+\+-load/all\.edp|src/lglib/lg\.output|src/lglib/lg\.tab\.cpp|src/lglib/lg\.tab\.hpp|examples\+\+-mpi/cmaes\.o|download/nlopt/config\.log|examples\+\+-load/load\.link\.in)$"
\ No newline at end of file
+ extend-diff-ignore = "(^|/)(INSTALL|configure|depcomp|install-sh|missing|mkinstalldirs|src/fflib/strversionnumber\.cpp|examples\+\+-load/all\.edp|src/lglib/lg\.output|src/lglib/lg\.tab\.cpp|src/lglib/lg\.tab\.hpp|examples\+\+-mpi/cmaes\.o|examples\+\+-mpi/mpi-cmaes\.o|examples\+\+-mpi/mpi-cmaes\.so|download/nlopt/config\.log|examples\+\+-load/load\.link\.in)$"
\ No newline at end of file
diff --git a/download/nlopt/config.log b/download/nlopt/config.log
index 1c41166..983d289 100644
--- a/download/nlopt/config.log
+++ b/download/nlopt/config.log
@@ -32,3 +32,54 @@ generated by GNU Autoconf 2.68.  Invocation command line was
 on filippos
 
 config.status:1059: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.18-1, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.18-1, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.18-1, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1059: creating Make.defs
diff --git a/examples++-load/Makefile.am b/examples++-load/Makefile.am
index e918361..891ec3a 100644
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
@@ -68,11 +68,11 @@ LIST_COMPILE=myfunction.$(DYLIB_SUFFIX)  BernadiRaugel.$(DYLIB_SUFFIX) \
         isolineP1.$(DYLIB_SUFFIX) isoline.$(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) \
 	MetricPk.$(DYLIB_SUFFIX) FreeFemQA.$(DYLIB_SUFFIX)
 
 
-LIST_COMPILE_PKG= 	tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(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) \
 	lapack.$(DYLIB_SUFFIX)  fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
 	freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
@@ -152,8 +152,7 @@ install-exec-local:: load_compile
 	$(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}
diff --git a/examples++-load/Makefile.in b/examples++-load/Makefile.in
index 0d9376f..65fc354 100644
--- a/examples++-load/Makefile.in
+++ b/examples++-load/Makefile.in
@@ -333,10 +333,10 @@ LIST_COMPILE = myfunction.$(DYLIB_SUFFIX)  BernadiRaugel.$(DYLIB_SUFFIX) \
         isolineP1.$(DYLIB_SUFFIX) isoline.$(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) \
 	MetricPk.$(DYLIB_SUFFIX) FreeFemQA.$(DYLIB_SUFFIX)
 
-LIST_COMPILE_PKG = tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(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) \
 	lapack.$(DYLIB_SUFFIX)  fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
 	freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
@@ -728,8 +728,7 @@ install-exec-local:: load_compile
 	$(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}
diff --git a/examples++-load/WHERE_LIBRARY b/examples++-load/WHERE_LIBRARY
new file mode 100644
index 0000000..a6d86a7
--- /dev/null
+++ b/examples++-load/WHERE_LIBRARY
@@ -0,0 +1 @@
+# Empty file to be used during build time 
diff --git a/examples++-load/load.link.in b/examples++-load/load.link.in
index 8224bba..4eb1402 100755
--- a/examples++-load/load.link.in
+++ b/examples++-load/load.link.in
@@ -197,7 +197,7 @@ case "$WIN32$uu" in
         FLAGS=' '
         LIBS="'$b/libff.dll' $LIBS $DLL"
         SUF=dll;;
-    FreeBSD|NetBSD)
+    FreeBSD|NetBSD|GNU/kFreeBSD|GNU)
 	SHARED="-shared" 
 	FLAGS='-fPIC';;
 	# 64 bit Linux needs -fPIC (ALH)
diff --git a/examples++-mpi/cmaes.o b/examples++-mpi/cmaes.o
index c3413d0..6f81699 100644
Binary files a/examples++-mpi/cmaes.o and b/examples++-mpi/cmaes.o differ
diff --git a/examples++-mpi/mpi-cmaes.o b/examples++-mpi/mpi-cmaes.o
new file mode 100644
index 0000000..7a23f7a
Binary files /dev/null and b/examples++-mpi/mpi-cmaes.o differ
diff --git a/examples++-mpi/mpi-cmaes.so b/examples++-mpi/mpi-cmaes.so
new file mode 100755
index 0000000..a83cfb3
Binary files /dev/null and b/examples++-mpi/mpi-cmaes.so differ
diff --git a/examples-bamg/test/dotest.pl b/examples-bamg/test/dotest.pl
index 3c307b0..115c0cb 100755
--- a/examples-bamg/test/dotest.pl
+++ b/examples-bamg/test/dotest.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 # -----  clean ---
 unlink <*.mesh>;
 unlink <*.am_fmt>;

-- 
FreeFem++ packaging

More information about the debian-science-commits mailing list