[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. upstream/2.5.1_beta1_svn9559_dfsg-43-gcbede0f

[Anton Gladky]

The following commit has been merged in the master branch:
commit 6215c99dc7bf54182c254a2ed061a9bf71687b8f
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Jul 10 20:09:31 2011 +0200

    Update FTBFS with ld --as-needed. Thanks to Julian Taylor <jtaylor.debian at googlemail.com>

diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index 530b6f9..9965392 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -1,6 +1,6 @@
 Description: delete gl2ps and use packaged version.
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-07-06
+Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
+Last-Update: 2011-07-10
 
 --- a/Graphics/CMakeLists.txt
 +++ b/Graphics/CMakeLists.txt
@@ -12,3 +12,14 @@ Last-Update: 2011-07-06
    gl2gif.cpp
    gl2jpeg.cpp
    gl2png.cpp
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -925,7 +925,7 @@
+ else(HAVE_FLTK)
+   add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
+ endif(HAVE_FLTK)
+-target_link_libraries(gmsh ${LINK_LIBRARIES})
++target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
+ 
+ # increase stack to 16Mb on Windows to avoid overflows in recursive
+ # tet classification for large 3D Delaunay grids + force static
diff --git a/debian/rules b/debian/rules
index 867c56f..b61f187 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ BUILDDIR = $(CURDIR)/debian/build
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)
 
-extra_flags += -DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lgl2ps -lGL -lglut" -DCMAKE_INCLUDE_PATH:="/usr/include/mpi"
+extra_flags += -DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp" -DCMAKE_INCLUDE_PATH:="/usr/include/mpi"
 
 override_dh_auto_clean:
 	rm -rf $(BUILDDIR)

-- 
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.