[SCM] FreeFem++ packaging branch, master, updated. debian/3.13-2-2-gaae32c3

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit ee1775cc74bf67f1d069a241011e438685065907
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Tue Jun 21 00:55:41 2011 +0300

    Try to fix build failure on several arches

diff --git a/debian/README.Debian b/debian/README.Debian
index 2709047..78cd7b4 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,3 +1,9 @@
+Note that the executable file /usr/bin/bamg has been renamed /user/bin/ffbamg
+to avoid double occurence of the former, in both freefem++ and rheolef 
+packages.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otent.gr>  Mon, 20 Jun 2011 22:49:00 +0200
+
 Please note that gcc 4.5.3 instead of gcc 4.6 is forced because of the bug:
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49264
 We will update the dependency once gcc 4.6.1 is released and uploaded to
diff --git a/debian/control b/debian/control
index d47fe48..00d9404 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>,
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.2.3~), autotools-dev, gawk, 
  flex, bison, libxt-dev, libxext-dev, libxxf86vm-dev,
- libxpm-dev, openmpi-bin, libfftw3-dev, libblas-dev, libgsl0-dev,
+ libxpm-dev, mpich2, libfftw3-dev, libblas-dev, libgsl0-dev,
  libarpack2-dev, libsuitesparse-dev, libsuperlu3-dev, imagemagick, 
  libfltk1.1-dev, freeglut3-dev, texlive, texlive-extra-utils, 
  texlive-latex-extra, texlive-font-utils,
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
new file mode 100644
index 0000000..d86a796
--- /dev/null
+++ b/debian/patches/kfreebsd.patch
@@ -0,0 +1,12 @@
+Recognition of GNU/kFreeBSD architecture
+--- a/examples++-load/load.link.in
++++ b/examples++-load/load.link.in
+@@ -196,7 +196,7 @@
+         FLAGS=' '
+         LIBS="'$b/libff.dll' $LIBS $DLL"
+         SUF=dll;;
+-    FreeBSD|NetBSD)
++    FreeBSD|NetBSD|GNU/kFreeBSD)
+ 	SHARED="-shared" 
+ 	FLAGS='-fPIC';;
+ 	# 64 bit Linux needs -fPIC (ALH)
diff --git a/debian/patches/series b/debian/patches/series
index 467e73a..33be077 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+kfreebsd.patch
 examples-bamg-test-dotest-pl.patch
 examples-load-WHERE-LIBRARY.patch
diff --git a/examples++-load/load.link.in b/examples++-load/load.link.in
index fd09c26..3dd56af 100755
--- a/examples++-load/load.link.in
+++ b/examples++-load/load.link.in
@@ -196,7 +196,7 @@ case "$WIN32$uu" in
         FLAGS=' '
         LIBS="'$b/libff.dll' $LIBS $DLL"
         SUF=dll;;
-    FreeBSD|NetBSD)
+    FreeBSD|NetBSD|GNU/kFreeBSD)
 	SHARED="-shared" 
 	FLAGS='-fPIC';;
 	# 64 bit Linux needs -fPIC (ALH)

-- 
FreeFem++ packaging