r45680 - in /packages/gmsh-tetgen/trunk/debian: ./ patches/

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Tue Mar 26 10:23:00 2013
New Revision: 45680

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45680
Log:
cleanup

Removed:
    packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_gcc_4.7_bamg.patch
    packages/gmsh-tetgen/trunk/debian/patches/java-wrappers.patch
    packages/gmsh-tetgen/trunk/debian/patches/onelab-version.patch
    packages/gmsh-tetgen/trunk/debian/patches/pedantic.patch
    packages/gmsh-tetgen/trunk/debian/patches/precise.patch
    packages/gmsh-tetgen/trunk/debian/patches/tetgen-1.4.3.patch
Modified:
    packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
    packages/gmsh-tetgen/trunk/debian/rules

Modified: packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch?rev=45680&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch Tue Mar 26 10:23:00 2013
@@ -1,27 +1,7 @@
 Description: Change name of shared library
 Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2013-02-04
+Last-Update: 2012-11-28
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1044,7 +1044,7 @@
- # static library target
- if(ENABLE_BUILD_LIB)
-   add_library(lib STATIC ${GMSH_SRC})
--  set_target_properties(lib PROPERTIES OUTPUT_NAME Gmsh)
-+  set_target_properties(lib PROPERTIES OUTPUT_NAME gmsh)
-   if(MSVC)
-     set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
-     if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1056,7 +1056,7 @@
- # shared library target
- if(ENABLE_BUILD_SHARED OR ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
-   add_library(shared SHARED ${GMSH_SRC})
--  set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
-+  set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh)
-   set_target_properties(shared PROPERTIES 
-                         VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
-                         SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
 --- a/wrappers/java/CMakeLists.txt
 +++ b/wrappers/java/CMakeLists.txt
 @@ -34,7 +34,11 @@
@@ -32,8 +12,32 @@
 +  set_target_properties(WrapGmsh PROPERTIES 
 +    PREFIX "lib"
 +    OUTPUT_NAME java-gmsh
-+    VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
-+    SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
++    SOVERSION "${GMSH_MAJOR_VERSION}"
++  )
  endif(UNIX)		
  add_custom_command(TARGET WrapGmsh 
  POST_BUILD # do the rest of the command after the build period
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1048,7 +1048,7 @@
+ # static library target
+ if(ENABLE_BUILD_LIB)
+   add_library(lib STATIC ${GMSH_SRC})
+-  set_target_properties(lib PROPERTIES OUTPUT_NAME Gmsh)
++  set_target_properties(lib PROPERTIES OUTPUT_NAME gmsh)
+   if(MSVC)
+     set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
+     if(ENABLE_MSVC_STATIC_RUNTIME)
+@@ -1060,10 +1060,10 @@
+ # shared library target
+ if(ENABLE_BUILD_SHARED OR ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
+   add_library(shared SHARED ${GMSH_SRC})
+-  set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
++  set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh)
+   set_target_properties(shared PROPERTIES 
+                         VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
+-                        SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
++                        SOVERSION ${GMSH_MAJOR_VERSION})
+   if(HAVE_LAPACK AND LAPACK_FLAGS)
+     set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
+   endif(HAVE_LAPACK AND LAPACK_FLAGS)

Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=45680&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Tue Mar 26 10:23:00 2013
@@ -35,6 +35,7 @@
 -DENABLE_CGNS:BOOL=ON \
 -DENABLE_WRAP_PYTHON:BOOL=ON \
 -DENABLE_WRAP_JAVA:BOOL=ON \
+-DENABLE_ONELAB:BOOL=ON \
 -DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
 -DCMAKE_INSTALL_PREFIX:STRING="/usr" \
 -DINSTALL_LIB_DIR:STRING="/usr/lib/$(DEB_HOST_MULTIARCH)" \