[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. upstream/2.5.1_beta2_svn11604_dfsg-151-gf970251

[Anton Gladky]

The following commit has been merged in the master branch:
commit b21e5981bb56f460c75c8095136ac1961e7bfc30
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Apr 6 18:15:09 2012 +0200

    Fix FTBFS due to wrong linking. (Closes: #664948)

diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index 3cd48dc..cec3ed0 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -14,15 +14,6 @@ Last-Update: 2011-12-09
    gl2png.cpp
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1017,7 +1017,7 @@
-   message("WARNING: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library wont link. "
-           "Change in msvc /MT flag to /MD in the shared project properties")
- endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)		  
--target_link_libraries(shared ${LINK_LIBRARIES})
-+target_link_libraries(shared ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
- 
- # binary targets
- if(HAVE_FLTK)
 @@ -1032,7 +1032,7 @@
    add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
    target_link_libraries(gmsh_dynamic shared)
diff --git a/debian/patches/fix_FTBFS_linking.patch b/debian/patches/fix_FTBFS_linking.patch
new file mode 100644
index 0000000..a45a63b
--- /dev/null
+++ b/debian/patches/fix_FTBFS_linking.patch
@@ -0,0 +1,15 @@
+Description: this linking causes a FTBFS 
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-04-06
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1033,7 +1033,7 @@
+   message("WARNING: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library wont link. "
+           "Change in msvc /MT flag to /MD in the shared project properties")
+ endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)		  
+-target_link_libraries(shared ${LINK_LIBRARIES})
++
+ 
+ # binary targets
+ if(HAVE_FLTK)
diff --git a/debian/patches/series b/debian/patches/series
index a7c3d72..503f7c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix_spelling_errors.patch
 delete_gl2ps_from_source.patch
 switch_from_opencascade_to_oce.patch
 api_demos.patch
+fix_FTBFS_linking.patch
diff --git a/debian/patches/switch_from_opencascade_to_oce.patch b/debian/patches/switch_from_opencascade_to_oce.patch
index 7ee85c3..8f5c891 100644
--- a/debian/patches/switch_from_opencascade_to_oce.patch
+++ b/debian/patches/switch_from_opencascade_to_oce.patch
@@ -1,4 +1,4 @@
-Desctiption: switch from opencascade to oce
+Description: switch from opencascade to oce
 Origin: http://www.geuz.org/pipermail/gmsh/2011/006731.html
 Author: D. Barbier <bouzim at gmail.com>
 Reviewed-by: Anton Gladky <gladky.anton at gmail.com>

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