[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.6.0.dfsg-2-11-g7d7eb90

Anton Gladky gladky.anton at gmail.com
Tue Jul 10 18:22:46 UTC 2012


The following commit has been merged in the master branch:
commit 0102dc5b5c12fa2a17f7d3acae1aa180d6e2f514
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Jul 10 19:45:32 2012 +0200

    Rename java-gmsh to libjava-gmsh2.

diff --git a/debian/control b/debian/control
index ed90b7b..6b44fcc 100644
--- a/debian/control
+++ b/debian/control
@@ -128,7 +128,7 @@ Description: Three-dimensional finite element mesh generator. Documentation
  .
  This package contains the python wrappers for gmsh
  
-Package: java-gmsh
+Package: libjava-gmsh2
 Section: java
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
diff --git a/debian/java-gmsh.install b/debian/java-gmsh.install
deleted file mode 100644
index 8ae3f5d..0000000
--- a/debian/java-gmsh.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libWrap*.* usr/lib
diff --git a/debian/libjava-gmsh2.install b/debian/libjava-gmsh2.install
new file mode 100644
index 0000000..b058934
--- /dev/null
+++ b/debian/libjava-gmsh2.install
@@ -0,0 +1 @@
+usr/lib/libjava*.* usr/lib
diff --git a/debian/java-gmsh.jlibs b/debian/libjava-gmsh2.jlibs
similarity index 100%
rename from debian/java-gmsh.jlibs
rename to debian/libjava-gmsh2.jlibs
diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index 6278d2f..31fe12f 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -30,3 +30,18 @@ Last-Update: 2012-06-20
  if(HAVE_LAPACK AND LAPACK_FLAGS)
    set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
  endif(HAVE_LAPACK AND LAPACK_FLAGS)
+--- a/wrappers/java/CMakeLists.txt
++++ b/wrappers/java/CMakeLists.txt
+@@ -34,7 +34,11 @@
+   set_target_properties(WrapGmsh PROPERTIES PREFIX "")
+ endif(WIN32)
+ if(UNIX)
+-  set_target_properties(WrapGmsh PROPERTIES PREFIX "lib")
++  set_target_properties(WrapGmsh PROPERTIES 
++    PREFIX "lib"
++    OUTPUT_NAME java-gmsh
++    SOVERSION "${GMSH_MAJOR_VERSION}"
++  )
+ endif(UNIX)		
+ add_custom_command(TARGET WrapGmsh 
+ POST_BUILD # do the rest of the command after the build period
diff --git a/debian/rules b/debian/rules
index d4005fe..ab6f085 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,8 +80,3 @@ override_dh_auto_test:
 	cd test-dir; $(BUILDDIR)/gmsh transfinite.geo -3 -o transfinite3d.stl
 	cd test-dir; ls -ln;
 	rm -rf test-dir
-
-override_dh_auto_install:
-	dh_auto_install
-	jh_installlibs -pjava-gmsh -v
-	jh_depends -pjava-gmsh -v

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



More information about the debian-science-commits mailing list