[freefempp] 01/01: Restore two patches

[Dimitrios Eftaxiopoulos]

This is an automated email from the git hooks/post-receive script.

eftaxiop-guest pushed a commit to branch master
in repository freefempp.

commit 1ba2176514994a72333977c96029c16ae543e04d
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sat Feb 27 15:51:45 2016 +0200

    Restore two patches
---
 debian/patches/examples++-load.patch | 24 ++++++++++++++++++++++++
 debian/patches/examples-bamg.patch   |  8 ++++++++
 debian/patches/series                |  2 ++
 examples++-load/Makefile.am          |  4 ++--
 examples++-load/load.link.in         |  2 +-
 examples-bamg/test/dotest.pl         |  2 +-
 src/fflib/strversionnumber.cpp       |  4 ++--
 7 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/debian/patches/examples++-load.patch b/debian/patches/examples++-load.patch
new file mode 100644
index 0000000..b535a4a
--- /dev/null
+++ b/debian/patches/examples++-load.patch
@@ -0,0 +1,24 @@
+--- a/examples++-load/Makefile.am
++++ b/examples++-load/Makefile.am
+@@ -220,8 +220,8 @@
+ 	  sed <$$i >$(DESTDIR)$(ff_prefix_dir)/lib/$$i 's#$(abs_top_builddir)/download#$(ff_prefix_dir)#' ;\
+ 	 done
+ 	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
++	echo includepath += \"$(prefix)/include/freefem++/idp\"  >>$(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/load.link.in
++++ b/examples++-load/load.link.in
+@@ -227,7 +227,7 @@
+         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/examples-bamg.patch b/debian/patches/examples-bamg.patch
new file mode 100644
index 0000000..499f795
--- /dev/null
+++ b/debian/patches/examples-bamg.patch
@@ -0,0 +1,8 @@
+--- 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/debian/patches/series b/debian/patches/series
index 5b1c0a4..7a2a57b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+examples++-load.patch
+examples-bamg.patch
 Makefile.patch
diff --git a/examples++-load/Makefile.am b/examples++-load/Makefile.am
index 4f0da0f..2496c0f 100644
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
@@ -220,8 +220,8 @@ install-exec-local:: load_compile WHERE_LIBRARY
 	  sed <$$i >$(DESTDIR)$(ff_prefix_dir)/lib/$$i 's#$(abs_top_builddir)/download#$(ff_prefix_dir)#' ;\
 	 done
 	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
+	echo includepath += \"$(prefix)/include/freefem++/idp\"  >>$(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/load.link.in b/examples++-load/load.link.in
index b680273..4b901a2 100755
--- a/examples++-load/load.link.in
+++ b/examples++-load/load.link.in
@@ -227,7 +227,7 @@ case "$WIN32$uu" in
         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/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/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 677d90e..e6e2964 100644
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@ -18,6 +18,6 @@ string StrVersionNumber(){
 //  buffer.precision(8);
 //  buffer<<VersionNumber();
   static char buffer[100];
-  sprintf(buffer," %9f (date Σαβ 27 Φεβ 2016 10:32:45 πμ EET)",VersionNumber());
-  return buffer; //.str()+" (date Σαβ 27 Φεβ 2016 10:32:45 πμ EET)" ;
+  sprintf(buffer," %9f (date Σαβ 27 Φεβ 2016 03:39:25 μμ EET)",VersionNumber());
+  return buffer; //.str()+" (date Σαβ 27 Φεβ 2016 03:39:25 μμ EET)" ;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git