r45556 - in /packages/gmsh-tetgen/trunk/debian: patches/change_shared_library_name.patch rules

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

Author: trophime-guest
Date: Mon Feb  4 09:13:27 2013
New Revision: 45556

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45556
Log:
update patches for rev >= 14674

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=45556&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 Mon Feb  4 09:13:27 2013
@@ -1,33 +1,27 @@
 Description: Change name of shared library
 Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-06-20
+Last-Update: 2013-02-04
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1029,7 +1029,10 @@
+@@ -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
-+   SOVERSION "${GMSH_MAJOR_VERSION}"
-+  )
++  set_target_properties(lib PROPERTIES OUTPUT_NAME gmsh)
    if(MSVC)
      set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
      if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1041,7 +1044,10 @@
+@@ -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
-+    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)
++  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 @@
@@ -38,8 +32,8 @@
 +  set_target_properties(WrapGmsh PROPERTIES 
 +    PREFIX "lib"
 +    OUTPUT_NAME java-gmsh
-+    SOVERSION "${GMSH_MAJOR_VERSION}"
-+  )
++    VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
++    SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
  endif(UNIX)		
  add_custom_command(TARGET WrapGmsh 
  POST_BUILD # do the rest of the command after the build period

Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=45556&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Mon Feb  4 09:13:27 2013
@@ -4,10 +4,11 @@
 
 DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 
+export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
 # Add --with javahelper for java-wrappers
 
-#%:
-#	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --with javahelper --parallel
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --with javahelper --parallel
 
@@ -16,20 +17,22 @@
 disable_mpi_archs = armel armhf kfreebsd-amd64 kfreebsd-i386 mips mipsel
 export LD_LIBRARY_PATH :=  $(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH); 
 
+#extra_flags += \
+#-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
+#                  -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
+#-DCMAKE_C_FLAGS="-fPIC -Wall $(shell dpkg-buildflags --get CFLAGS)" \
+#-DCMAKE_LD_FLAGS="-Wl,--no-as-needed -fPIC -Wall $(shell dpkg-buildflags --get LDFLAGS)" \
+
 extra_flags += \
--DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
-                  -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
--DCMAKE_C_FLAGS="-fPIC -Wall $(shell dpkg-buildflags --get CFLAGS)" \
--DCMAKE_LD_FLAGS="-Wl,--no-as-needed -fPIC -Wall $(shell dpkg-buildflags --get LDFLAGS)" \
 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
 -DPYTHON_LIBRARY:FILEPATH=/usr/lib/libpython2.7.so \
 -DENABLE_KBIPACK:BOOL=ON \
 -DENABLE_METIS:BOOL=ON \
--DENABLE_TAUCS:BOOL=ON \
+-DENABLE_TAUCS:BOOL=OFF \
 -DENABLE_MPI:BOOL=ON \
 -DENABLE_OSMESA:BOOL=OFF \
 -DENABLE_POPPLER:BOOL=OFF \
--DENABLE_CGNS:BOOL=OFF \
+-DENABLE_CGNS:BOOL=ON \
 -DENABLE_WRAP_PYTHON:BOOL=ON \
 -DENABLE_WRAP_JAVA:BOOL=ON \
 -DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \