[SCM] FreeFem++ packaging branch, master, updated. debian/3.17-2-2-g422f15f

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit 422f15fb90c3a7e29d964e0aa2d455c7bc3ec48f
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Thu Dec 29 19:28:51 2011 +0200

    Fix identification of hurd-i386 architecture

diff --git a/debian/changelog b/debian/changelog
index 9b9adde..b7ee40b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freefem++ (3.17-2) unstable; urgency=low
+
+  * Fix build failure on hurd-i386 architecture.
+  * Rename kfreebsd.patch to examples++-load-load-link-in.patch and ammend it.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Thu, 29 Dec 2011 16:31:00 +0200
+
 freefem++ (3.17-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/examples++-load-load-link-in.patch
similarity index 67%
rename from debian/patches/kfreebsd.patch
rename to debian/patches/examples++-load-load-link-in.patch
index d86a796..14981e3 100644
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/examples++-load-load-link-in.patch
@@ -1,12 +1,12 @@
-Recognition of GNU/kFreeBSD architecture
+Fix identification of GNU/kFreeBSD and GNU/Hurd architectures
 --- a/examples++-load/load.link.in
 +++ b/examples++-load/load.link.in
-@@ -196,7 +196,7 @@
+@@ -197,7 +197,7 @@
          FLAGS=' '
          LIBS="'$b/libff.dll' $LIBS $DLL"
          SUF=dll;;
 -    FreeBSD|NetBSD)
-+    FreeBSD|NetBSD|GNU/kFreeBSD)
++    FreeBSD|NetBSD|GNU/kFreeBSD|GNU)
  	SHARED="-shared" 
  	FLAGS='-fPIC';;
  	# 64 bit Linux needs -fPIC (ALH)
diff --git a/debian/patches/series b/debian/patches/series
index a3282ac..f3d100e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
+examples++-load-load-link-in.patch
 examples++-load-Makefile.patch
-kfreebsd.patch
 examples-bamg-test-dotest-pl.patch
 examples-load-WHERE-LIBRARY.patch
diff --git a/download/nlopt/config.log b/download/nlopt/config.log
index ca85358..711f430 100644
--- a/download/nlopt/config.log
+++ b/download/nlopt/config.log
@@ -32,3 +32,37 @@ 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.17, 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.17, 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/load.link.in b/examples++-load/load.link.in
index 8704c62..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|GNU/kFreeBSD)
+    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 191caf7..f5b4433 100644
Binary files a/examples++-mpi/cmaes.o and b/examples++-mpi/cmaes.o differ

-- 
FreeFem++ packaging