[SCM] FreeFem++ packaging branch, master, updated. debian/3.19.1-1-6-g12eb44c

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Thu Oct 18 18:11:55 UTC 2012 

The following commit has been merged in the master branch:
commit 12eb44c3fc37d8ed38ecb428d3f6d02fb6d81e5a
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Thu Oct 18 21:05:03 2012 +0300

    Update examples++-load-Makefile.patch, remove examples-load-WHERE-LIBRARY.patch

diff --git a/debian/changelog b/debian/changelog
index 3475ea4..b73106a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ freefem++ (3.20-1) unstable; urgency=low
 
   * New upstream release.
   * Add libnlopt-dev and coinor-libipopt-dev to build-deps.
+  * Update patch examples++-load-Makefile.patch.
+  * Remove patch examples-load-WHERE-LIBRARY.patch.
 
  -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Thu, 18 Oct 2012 14:14:12 +0300
 
diff --git a/debian/patches/examples++-load-Makefile.patch b/debian/patches/examples++-load-Makefile.patch
index 88a00b3..6aeec1a 100644
--- a/debian/patches/examples++-load-Makefile.patch
+++ b/debian/patches/examples++-load-Makefile.patch
@@ -7,19 +7,19 @@ Fix locating of file freefem++.pref
  	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
++	echo loadpath += \"$(prefix)/lib/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}
 --- a/examples++-load/Makefile.in
 +++ b/examples++-load/Makefile.in
-@@ -735,8 +735,7 @@
+@@ -778,8 +778,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
 -	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
++	echo loadpath += \"$(prefix)/lib/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/debian/patches/examples-bamg-test-dotest-pl.patch b/debian/patches/examples-bamg-test-dotest-pl.patch
index e0fda07..af60b3c 100644
--- a/debian/patches/examples-bamg-test-dotest-pl.patch
+++ b/debian/patches/examples-bamg-test-dotest-pl.patch
@@ -1,8 +1,6 @@
 Fix location of perl executable
-Index: freefem++-3.13.1/examples-bamg/test/dotest.pl
-===================================================================
---- freefem++-3.13.1.orig/examples-bamg/test/dotest.pl	2011-06-13 16:40:47.000000000 +0300
-+++ freefem++-3.13.1/examples-bamg/test/dotest.pl	2011-06-13 16:41:17.000000000 +0300
+--- a/examples-bamg/test/dotest.pl
++++ b/examples-bamg/test/dotest.pl
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
diff --git a/debian/patches/examples-load-WHERE-LIBRARY.patch b/debian/patches/examples-load-WHERE-LIBRARY.patch
deleted file mode 100644
index ce27fba..0000000
--- a/debian/patches/examples-load-WHERE-LIBRARY.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-Create empty file examples++-load/WHERE_LIBRARY
-Index: freefem++-3.13.1/examples++-load/WHERE_LIBRARY
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ freefem++-3.13.1/examples++-load/WHERE_LIBRARY	2011-06-13 17:53:05.000000000 +0300
-@@ -0,0 +1 @@
-+# Empty file to be used during build time 
diff --git a/debian/patches/series b/debian/patches/series
index 93aace4..4995009 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ src-Graphics-xglrgraf-cpp.patch
 examples++-load-Makefile.patch
 examples++-load-load-link-in.patch
 examples-bamg-test-dotest-pl.patch
-examples-load-WHERE-LIBRARY.patch
diff --git a/download/ipopt/config.log b/download/ipopt/config.log
index 86966f9..88f9cba 100644
--- a/download/ipopt/config.log
+++ b/download/ipopt/config.log
@@ -3,8 +3,8 @@
 ## Running config.status. ##
 ## ---------------------- ##
 
-This file was extended by FreeFem++ config.status 3.19-1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by FreeFem++ config.status 3.20, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = 
   CONFIG_HEADERS  = 
@@ -14,4 +14,21 @@ generated by GNU Autoconf 2.68.  Invocation command line was
 
 on filippos
 
-config.status:1059: creating Makefile.inc
+config.status:1055: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.20, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ../../config.status --file=Makefile.inc:Makefile.inc.in
+
+on filippos
+
+config.status:1055: creating Makefile.inc
diff --git a/download/mumps-seq/config.log b/download/mumps-seq/config.log
index 88a5975..3e9db79 100644
--- a/download/mumps-seq/config.log
+++ b/download/mumps-seq/config.log
@@ -3,8 +3,8 @@
 ## Running config.status. ##
 ## ---------------------- ##
 
-This file was extended by FreeFem++ config.status 3.19-1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by FreeFem++ config.status 3.20, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = 
   CONFIG_HEADERS  = 
@@ -14,4 +14,21 @@ generated by GNU Autoconf 2.68.  Invocation command line was
 
 on filippos
 
-config.status:1059: creating Makefile.inc
+config.status:1055: creating Makefile.inc
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.20, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ../../config.status --file=Makefile.inc:Makefile-mumps-4.10.0.inc
+
+on filippos
+
+config.status:1055: creating Makefile.inc
diff --git a/download/nlopt/config.log b/download/nlopt/config.log
index 750c191..80099fc 100644
--- a/download/nlopt/config.log
+++ b/download/nlopt/config.log
@@ -3,8 +3,8 @@
 ## Running config.status. ##
 ## ---------------------- ##
 
-This file was extended by FreeFem++ config.status 3.19-1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by FreeFem++ config.status 3.20, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = 
   CONFIG_HEADERS  = 
@@ -14,4 +14,21 @@ generated by GNU Autoconf 2.68.  Invocation command line was
 
 on filippos
 
-config.status:1059: creating Make.defs
+config.status:1055: creating Make.defs
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by FreeFem++ config.status 3.20, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ../../config.status --file=Make.defs:Make.inc
+
+on filippos
+
+config.status:1055: creating Make.defs
diff --git a/examples++-load/Makefile.am b/examples++-load/Makefile.am
index 62d3c91..488917d 100644
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
@@ -157,8 +157,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 += \"$(prefix)/lib/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 8de9fb0..86db429 100644
--- a/examples++-load/Makefile.in
+++ b/examples++-load/Makefile.in
@@ -778,8 +778,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 += \"$(prefix)/lib/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/NEWS b/examples++-load/WHERE_LIBRARY
similarity index 100%
copy from NEWS
copy to examples++-load/WHERE_LIBRARY
diff --git a/examples++-load/all.edp b/examples++-load/all.edp
index 5f677cd..33b2722 100644
--- a/examples++-load/all.edp
+++ b/examples++-load/all.edp
@@ -15,10 +15,6 @@ verbosity=verbosityy;
 verbosity=verbosityy;
 { include "APk-MetricPk.edp";};
  cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : IpOptMinSurf.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "IpOptMinSurf.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
  cout << "--------- file : IpoptLap.edp --------------------------------------------------------" << endl;
 verbosity=verbosityy;
 { include "IpoptLap.edp";};
@@ -111,10 +107,6 @@ verbosity=verbosityy;
 verbosity=verbosityy;
 { include "funcTemplate.edp";};
  cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : gsl1.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;
-{ include "gsl1.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
  cout << "--------- file : ilut.edp --------------------------------------------------------" << endl;
 verbosity=verbosityy;
 { include "ilut.edp";};
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 fbe3375..2e58f4d 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
index b04ffc4..d35c42e 100644
Binary files a/examples++-mpi/mpi-cmaes.o and b/examples++-mpi/mpi-cmaes.o differ
diff --git a/examples++-mpi/mpi-cmaes.so b/examples++-mpi/mpi-cmaes.so
index 44e7a20..c9b0ebc 100755
Binary files a/examples++-mpi/mpi-cmaes.so 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>;
diff --git a/src/Graphics/sansrgraph.cpp b/src/Graphics/sansrgraph.cpp
index bec15fc..f6399d8 100644
--- a/src/Graphics/sansrgraph.cpp
+++ b/src/Graphics/sansrgraph.cpp
@@ -34,6 +34,7 @@ using namespace std;
 #include <iostream>
 #include <cassert>
 #include "rgraph.hpp"
+#include <unistd.h>
 
 #include "error.hpp"
 #ifdef macintoshxx
diff --git a/src/Graphics/xglrgraf.cpp b/src/Graphics/xglrgraf.cpp
index eb64a34..5ef17c4 100644
--- a/src/Graphics/xglrgraf.cpp
+++ b/src/Graphics/xglrgraf.cpp
@@ -27,4 +27,5 @@
  */
 #define XGL
 #define FF_GRAPH_SET_PTR
+#include <unistd.h>
 #include "glrgraph.hpp"

-- 
FreeFem++ packaging

More information about the debian-science-commits mailing list