[SCM] FreeFem++ packaging branch, master, updated. debian/3.13.2-1-11-g0b90137

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit c7fbcf585b6ad379f9403de111b08706c5b8ffac
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Wed Aug 10 15:59:20 2011 +0300

    Fix locating file freefem++.pref

diff --git a/debian/changelog b/debian/changelog
index 1d14d3b..8981577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-freefem++ (3.13.2-1) unstable; urgency=low
+freefem++ (3.13.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Tue, 9 Aug 2011 15:31:00 +0300
+
+freefem++ (3.13.2-1) unreleased; urgency=low
 
   * Revert to gcc-4.6 for building.
   * New upstream release.
diff --git a/debian/patches/examples++-load-Makefile.patch b/debian/patches/examples++-load-Makefile.patch
new file mode 100644
index 0000000..c15d671
--- /dev/null
+++ b/debian/patches/examples++-load-Makefile.patch
@@ -0,0 +1,25 @@
+Fix finding of file freefem++.pref
+--- a/examples++-load/Makefile.am
++++ b/examples++-load/Makefile.am
+@@ -140,8 +140,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
+ 	$(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
+@@ -716,8 +716,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
+ 	$(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/series b/debian/patches/series
index 33be077..a3282ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+examples++-load-Makefile.patch
 kfreebsd.patch
 examples-bamg-test-dotest-pl.patch
 examples-load-WHERE-LIBRARY.patch
diff --git a/examples++-load/Makefile.am b/examples++-load/Makefile.am
index bd37163..f7fde73 100644
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
@@ -140,8 +140,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 += \"$(libdir)/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 09058a6..664221a 100644
--- a/examples++-load/Makefile.in
+++ b/examples++-load/Makefile.in
@@ -716,8 +716,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 += \"$(libdir)/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}

-- 
FreeFem++ packaging