r47333 - in /packages/gmsh-tetgen/trunk/debian: changelog patches/fix_libdir.patch patches/med.patch patches/skip_license_file.patch rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Thu Aug 18 11:11:28 UTC 2016 

Author: trophime-guest
Date: Thu Aug 18 11:11:27 2016
New Revision: 47333

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47333
Log:
update for 2.13.1

Modified:
    packages/gmsh-tetgen/trunk/debian/changelog
    packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
    packages/gmsh-tetgen/trunk/debian/patches/med.patch
    packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
    packages/gmsh-tetgen/trunk/debian/rules

Modified: packages/gmsh-tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/changelog?rev=47333&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/changelog	(original)
+++ packages/gmsh-tetgen/trunk/debian/changelog	Thu Aug 18 11:11:27 2016
@@ -1,3 +1,15 @@
+gmsh-tetgen (2.13.1-2) unstable; urgency=medium
+
+  * d/rules: fix PETSC_DIR and SLEPC_DIR
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Wed, 17 Aug 2016 09:06:22 +0200
+
+gmsh-tetgen (2.13.1-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Tue, 09 Aug 2016 14:03:23 +0200
+
 gmsh-tetgen (2.12.2~svn23298-1) unstable; urgency=medium
 
   * Update to latest svn

Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch?rev=47333&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch	Thu Aug 18 11:11:27 2016
@@ -2,10 +2,10 @@
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-03-15
 
-Index: gmsh-tetgen-2.12.2~svn23298/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.13.1/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.12.2~svn23298.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23298/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.13.1.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.13.1/wrappers/java/CMakeLists.txt
 @@ -73,6 +73,6 @@ POST_BUILD # do the rest of the command
    COMMAND ${CMAKE_COMMAND} -E copy 
      ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml 
@@ -15,11 +15,11 @@
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar 
 -        DESTINATION lib)
 +  DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+Index: gmsh-tetgen-2.13.1/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
-@@ -1648,7 +1648,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-tetgen-2.13.1.orig/CMakeLists.txt
++++ gmsh-tetgen-2.13.1/CMakeLists.txt
+@@ -1641,7 +1641,7 @@ endif(WIN32 OR CYGWIN)
  # (e.g. "make lib" or "make shared" followed by "make install/fast")
  install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
  if(ENABLE_BUILD_LIB)
@@ -28,7 +28,7 @@
  endif(ENABLE_BUILD_LIB)
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
    if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1684,7 +1684,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1677,7 +1677,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
        install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
      endif(GCC_DLL AND STDC_DLL)
    else(WIN32 AND NOT MSVC OR CYGWIN)

Modified: packages/gmsh-tetgen/trunk/debian/patches/med.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/med.patch?rev=47333&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/med.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/med.patch	Thu Aug 18 11:11:27 2016
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+Index: gmsh-tetgen-2.13.1/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+--- gmsh-tetgen-2.13.1.orig/CMakeLists.txt
++++ gmsh-tetgen-2.13.1/CMakeLists.txt
 @@ -841,6 +841,10 @@ if(ENABLE_MED OR ENABLE_CGNS)
          set_config_option(HAVE_MED "Med")
          list(APPEND EXTERNAL_LIBRARIES ${MED_LIB})
@@ -13,7 +13,7 @@
      endif(ENABLE_MED)
      if(ENABLE_CGNS)
        find_library(CGNS_LIB cgns PATHS ENV CGNS_ROOT PATH_SUFFIXES lib)
-@@ -1888,7 +1892,7 @@ message(STATUS "")
+@@ -1890,7 +1894,7 @@ message(STATUS "")
  mark_as_advanced(GMSH_EXTRA_VERSION
                   ACIS_LIB ANN_INC ANN_LIB CAIRO_LIB CAIRO_INC CGNS_INC GMM_INC
                   GMP_INC GMP_LIB MMG3D_INC MMG3D_LIB HDF5_LIB

Modified: packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch?rev=47333&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch	Thu Aug 18 11:11:27 2016
@@ -2,11 +2,11 @@
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2011-12-09
 
-Index: gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
+Index: gmsh-tetgen-2.13.1/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.12.2~svn23298.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.2~svn23298/CMakeLists.txt
-@@ -1579,7 +1579,7 @@ if(UNIX)
+--- gmsh-tetgen-2.13.1.orig/CMakeLists.txt
++++ gmsh-tetgen-2.13.1/CMakeLists.txt
+@@ -1572,7 +1572,7 @@ if(UNIX)
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@
  set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
  set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
  file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
-@@ -1746,7 +1746,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1739,7 +1739,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
  if(MAKEINFO AND TEXI2PDF)
    add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz

Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=47333&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules	(original)
+++ packages/gmsh-tetgen/trunk/debian/rules	Thu Aug 18 11:11:27 2016
@@ -52,9 +52,9 @@
 endif
 
 # PETSC_DIR is the location of PETSc.
-export PETSC_DIR=/usr/lib/petscdir/3.6.4
-export PETSC_ARCH=linux-gnu-c-opt
-export SLEPC_DIR=/usr/lib/slepcdir/3.6.3
+export PETSC_DIR=/usr/lib/petscdir/3.6.4/x86_64-linux-gnu-real
+#export PETSC_ARCH=linux-gnu-c-opt
+export SLEPC_DIR=/usr/lib/slepcdir/3.6.3/x86_64-linux-gnu-real
 
 override_dh_auto_clean:
 	rm -rf $(BUILDDIR)

More information about the debian-science-commits mailing list