[SCM] FreeFem++ packaging branch, master, updated. debian/3.12-1-14-ga357f2d

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit a357f2d833c2692028955b61358d8402a7c2fdc0
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Fri Feb 25 11:39:09 2011 +0200

    Fix ff-c++ failure during compilation

diff --git a/.pc/applied-patches b/.pc/applied-patches
index b3414ee..99bc3b9 100644
--- a/.pc/applied-patches
+++ b/.pc/applied-patches
@@ -8,3 +8,4 @@ examples-load-WHERE-LIBRARY.patch
 examples-load-ff-pkg-download.patch
 examples-bamg-test-dotestpl.patch
 download-mumps-Makefile.patch
+examples++-load-Makefile.patch
diff --git a/.pc/download-mumps-Makefile.patch/.timestamp b/.pc/examples++-load-Makefile.patch/.timestamp
similarity index 100%
copy from .pc/download-mumps-Makefile.patch/.timestamp
copy to .pc/examples++-load-Makefile.patch/.timestamp
diff --git a/examples++-load/Makefile.am b/.pc/examples++-load-Makefile.patch/examples++-load/Makefile.am
similarity index 100%
copy from examples++-load/Makefile.am
copy to .pc/examples++-load-Makefile.patch/examples++-load/Makefile.am
diff --git a/examples++-load/Makefile.in b/.pc/examples++-load-Makefile.patch/examples++-load/Makefile.in
similarity index 100%
copy from examples++-load/Makefile.in
copy to .pc/examples++-load-Makefile.patch/examples++-load/Makefile.in
diff --git a/debian/patches/examples++-load-Makefile.patch b/debian/patches/examples++-load-Makefile.patch
new file mode 100644
index 0000000..0adf8f9
--- /dev/null
+++ b/debian/patches/examples++-load-Makefile.patch
@@ -0,0 +1,23 @@
+Fix ff-c++ compile error
+--- a/examples++-load/Makefile.am
++++ b/examples++-load/Makefile.am
+@@ -102,7 +102,7 @@
+ regtests.edp: regtests.m4 ../regtests.m4
+ 	m4 -DASSERT regtests.m4 > regtests.edp
+ 
+-$(LIST_COMPILE):ff-c++ include Makefile 
++$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile
+ 
+ clean-local:
+ 	-rm *.o  load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
+--- a/examples++-load/Makefile.in
++++ b/examples++-load/Makefile.in
+@@ -674,7 +674,7 @@
+ regtests.edp: regtests.m4 ../regtests.m4
+ 	m4 -DASSERT regtests.m4 > regtests.edp
+ 
+-$(LIST_COMPILE):ff-c++ include Makefile 
++$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile
+ 
+ clean-local:
+ 	-rm *.o  load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
diff --git a/debian/patches/series b/debian/patches/series
index b3414ee..99bc3b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ examples-load-WHERE-LIBRARY.patch
 examples-load-ff-pkg-download.patch
 examples-bamg-test-dotestpl.patch
 download-mumps-Makefile.patch
+examples++-load-Makefile.patch
diff --git a/debian/rules b/debian/rules
index de15311..21ce16c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ clean:
 build:
 	dh_testdir
 	dh_auto_configure -- CFLAGS=-lm CNOFLAGS=-lm --without-cadna
-	dh_auto_build -- -j4 --ignore-errors
+	dh_auto_build -- -j4
 #	dh_auto_test
 
 binary-indep:
diff --git a/examples++-load/Makefile.am b/examples++-load/Makefile.am
index 2fc3868..4633563 100644
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
@@ -102,7 +102,7 @@ all.edp:
 regtests.edp: regtests.m4 ../regtests.m4
 	m4 -DASSERT regtests.m4 > regtests.edp
 
-$(LIST_COMPILE):ff-c++ include Makefile 
+$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile
 
 clean-local:
 	-rm *.o  load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
diff --git a/examples++-load/Makefile.in b/examples++-load/Makefile.in
index 6eca1d2..9cd3a6a 100644
--- a/examples++-load/Makefile.in
+++ b/examples++-load/Makefile.in
@@ -674,7 +674,7 @@ all.edp:
 regtests.edp: regtests.m4 ../regtests.m4
 	m4 -DASSERT regtests.m4 > regtests.edp
 
-$(LIST_COMPILE):ff-c++ include Makefile 
+$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile
 
 clean-local:
 	-rm *.o  load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \

-- 
FreeFem++ packaging