[SCM] FreeFem++ packaging branch, master, updated. debian/3.13.3-1-5-g2255ebf

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit 922c1f7561741124c099d770da47c1fbb306fbd1
Merge: 04956b4662991141924584132c2f883b9c59b986 71449f641b07a2986880d44166d3345e7bc45f6a
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Wed Sep 14 20:16:11 2011 +0300

    Merge commit 'upstream/3.14'
    
    Conflicts:
    	DOC/freefem++doc.pdf
    	download/gmm/cxxflags

diff --combined examples++-load/Makefile.in
index 664221a,44d4c23..452cd64
--- a/examples++-load/Makefile.in
+++ b/examples++-load/Makefile.in
@@@ -236,6 -236,7 +236,7 @@@ ff_latex = @ff_latex
  ff_libtool = @ff_libtool@
  ff_m4 = @ff_m4@
  ff_makeindex = @ff_makeindex@
+ ff_patch = @ff_patch@
  ff_pdf2ps = @ff_pdf2ps@
  ff_pdflatex = @ff_pdflatex@
  ff_prefix_dir = @ff_prefix_dir@
@@@ -716,7 -717,8 +717,7 @@@ install-exec-local:: load_compil
  	$(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