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

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit d7d5ff21b4a46cafcec5b1159e63684e1c907edd
Merge: b8b8467af649a70b3ca5da9913fbc8403e785827 cb5ec1d79e95750f94f90f5ea1f482adc1fada00
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sun Jun 3 21:23:01 2012 +0300

    Merge tag 'upstream/3.19.1'
    
    Upstream version 3.19.1
    
    Conflicts:
    	DOC/freefem++doc.pdf

diff --combined examples++-load/Makefile.in
index 298d92d,7a27bd2..3c14420
--- a/examples++-load/Makefile.in
+++ b/examples++-load/Makefile.in
@@@ -225,7 -225,6 +225,6 @@@ docdir = @docdir
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  ff_bison = @ff_bison@
- ff_cmake = @ff_cmake@
  ff_convert = @ff_convert@
  ff_curl = @ff_curl@
  ff_dvips = @ff_dvips@
@@@ -319,10 -318,9 +318,9 @@@ MetricPk.cpp GeometryQA.cpp  FreeFemQA.
  cube.msh  \
  LapMUMPS_seq.edp MUMPS_seq.cpp \
  ff-Ipopt.cpp \
- IpoptLap.edp IpoptVI.edp IpoptVI2.edp IpoptMinSurfVol.edp \
+ IpoptLap.edp IpoptVI.edp IpoptVI2.edp IpoptMinSurfVol.edp  \
  scotch.cpp scotch.edp 
  
- 
  LIST_COMPILE = myfunction.$(DYLIB_SUFFIX)  BernadiRaugel.$(DYLIB_SUFFIX) \
           Morley.$(DYLIB_SUFFIX) funcTemplate.$(DYLIB_SUFFIX) addNewType.$(DYLIB_SUFFIX) \
           qf11to25.$(DYLIB_SUFFIX)  Element_P3.$(DYLIB_SUFFIX)    Element_P4.$(DYLIB_SUFFIX)  \
@@@ -347,7 -345,7 +345,7 @@@ LIST_COMPILE_PKG = tetgen.$(DYLIB_SUFFI
  	lapack.$(DYLIB_SUFFIX)  fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
  	freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
  	gsl.$(DYLIB_SUFFIX) MUMPS_seq.$(DYLIB_SUFFIX) 	 ff-Ipopt.$(DYLIB_SUFFIX) \
- 	ff-NLopt.$(DYLIB_SUFFIX)  ff-cmaes.$(DYLIB_SUFFIX) scotch.$(DYLIB_SUFFIX)
+ 	ff-NLopt.$(DYLIB_SUFFIX)  ff-cmaes.$(DYLIB_SUFFIX) scotch.$(DYLIB_SUFFIX)	
  
  all: all-am
  
@@@ -735,7 -733,8 +733,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}
diff --combined src/Graphics/sansrgraph.cpp
index f2305df,a48c7d8..980d0ad
--- a/src/Graphics/sansrgraph.cpp
+++ b/src/Graphics/sansrgraph.cpp
@@@ -34,7 -34,6 +34,7 @@@ using namespace std
  #include <iostream>
  #include <cassert>
  #include "rgraph.hpp"
 +#include <unistd.h>
  
  #include "error.hpp"
  #ifdef macintoshxx
@@@ -368,8 -367,8 +368,8 @@@ void initgraphique(
    fcolor=1;  /* des couleurs */
    SetColorTable(8);
    INITGRAPH = 1;
-   width = 1500;
-   height =  1060; // aspect ratio  \sqrt(2)
+   width = 10000;// change FH mai 2012 to have more precis graphic for F.  Ortegon 
+   height =  7071; // aspect ratio  \sqrt(2)
  }
  
  void closegraphique()
@@@ -501,7 -500,7 +501,7 @@@ void x11draw3(int * ptype
  
  void penthickness(int pepais)
  {
-   if (psfile) fprintf(psfile,"%d setlinewidth\n",pepais);
+   if (psfile) fprintf(psfile,"%d setlinewidth\n",pepais*2);
  }
  
  void x11linsrn(int * ,int * ,int * ,int * );
@@@ -620,7 -619,7 +620,7 @@@ void openPS(const char *filename 
      fprintf(psfile," /bF  { mark} def \n");
      fprintf(psfile," /eF {newpath moveto counttomark 2 idiv {lineto} repeat closepath fill cleartomark} def\n");
      fprintf(psfile," /P { /yy exch def /xx exch def   xx xx 1 add yy yy 1 add  rec  fill } def\n");
-     fprintf(psfile," 0.5 setlinewidth\n");
+     fprintf(psfile," 2 setlinewidth\n");
    }
    else 
      cerr << " Err openning postscript file " << fps << endl;

-- 
FreeFem++ packaging