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

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Thu Jul 19 07:58:24 UTC 2012 

Author: trophime-guest
Date: Thu Jul 19 07:58:24 2012
New Revision: 45260

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45260
Log:
rename java packages like in gmsh

Added:
    packages/gmsh-tetgen/trunk/debian/libjava-gmsh2-tetgen.install
      - copied, changed from r45258, packages/gmsh-tetgen/trunk/debian/java-gmsh-tetgen.install
    packages/gmsh-tetgen/trunk/debian/libjava-gmsh2-tetgen.jlibs
      - copied, changed from r45258, packages/gmsh-tetgen/trunk/debian/java-gmsh-tetgen.libs
    packages/gmsh-tetgen/trunk/debian/patches/precise.patch
Removed:
    packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.links
    packages/gmsh-tetgen/trunk/debian/gmsh-tetgen.pyinstall
    packages/gmsh-tetgen/trunk/debian/java-gmsh-tetgen.install
    packages/gmsh-tetgen/trunk/debian/java-gmsh-tetgen.libs
Modified:
    packages/gmsh-tetgen/trunk/debian/changelog
    packages/gmsh-tetgen/trunk/debian/control
    packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.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=45260&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/changelog (original)
+++ packages/gmsh-tetgen/trunk/debian/changelog Thu Jul 19 07:58:24 2012
@@ -1,3 +1,10 @@
+gmsh-tetgen (2.6.1-1ubuntu1) precise; urgency=low
+
+  * Rename java packages following libjava-gmsh2
+  * Remove links file in debian directory
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Thu, 19 Jul 2012 09:50:31 +0200
+
 gmsh-tetgen (2.6.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/gmsh-tetgen/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/control?rev=45260&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/control (original)
+++ packages/gmsh-tetgen/trunk/debian/control Thu Jul 19 07:58:24 2012
@@ -11,14 +11,14 @@
  mpi-default-dev,
  libgmm++-dev [!hurd-i386 !s390x],
  liboce-modeling-dev, liboce-visualization-dev, liboce-ocaf-dev, oce-draw,
- libcgns-dev (>= 3.1.3.4),
+ libcgns-dev (>= 2.5.5),
  libmed-dev (>= 2.3.6), libmedc-dev (>= 2.3.6), 
- libhdf5-mpi-dev (>= 1.8.8) [alpha amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc],
+ libhdf5-mpi-dev (>= 1.8.4) [alpha amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc],
  libblas-dev, liblapack-dev, libgl2ps-dev, freeglut3-dev,
  python-dev (>= 2.6.6-3~), swig2.0,
  chrpath, libann-dev,
- libpetsc3.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
- libslepc3.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
+ libpetsc3.1-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
+ libslepc3.1-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
  javahelper, default-jdk
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
@@ -134,11 +134,11 @@
  .
  This package contains the python wrappers for gmsh
  
-Package: java-gmsh-tetgen
+Package: libjava-gmsh2-tetgen
 Section: java
 Architecture: any
-Replaces: java-gmsh
-Provides: java-gmsh
+Replaces: libjava-gmsh2
+Provides: libjava-gmsh2
 Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre,
  libgmsh2-tetgen
 Description: Three-dimensional finite element mesh generator. Java-wrappwe

Copied: packages/gmsh-tetgen/trunk/debian/libjava-gmsh2-tetgen.install (from r45258, packages/gmsh-tetgen/trunk/debian/java-gmsh-tetgen.install)
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/libjava-gmsh2-tetgen.install?rev=45260&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/java-gmsh-tetgen.install (original)
+++ packages/gmsh-tetgen/trunk/debian/libjava-gmsh2-tetgen.install Thu Jul 19 07:58:24 2012
@@ -1,1 +1,1 @@
-debian/build/wrappers/java/libWrapGmsh.so usr/lib
+usr/lib/libjava*.* usr/lib

Copied: packages/gmsh-tetgen/trunk/debian/libjava-gmsh2-tetgen.jlibs (from r45258, packages/gmsh-tetgen/trunk/debian/java-gmsh-tetgen.libs)
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/libjava-gmsh2-tetgen.jlibs?rev=45260&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/java-gmsh-tetgen.libs (original)
+++ packages/gmsh-tetgen/trunk/debian/libjava-gmsh2-tetgen.jlibs Thu Jul 19 07:58:24 2012
@@ -1,1 +1,1 @@
-debian/build/wrappers/java/WrappingJava/WrapGmsh.jar
+usr/lib/*.jar

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=45260&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 Thu Jul 19 07:58:24 2012
@@ -30,3 +30,18 @@
  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

Added: packages/gmsh-tetgen/trunk/debian/patches/precise.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/precise.patch?rev=45260&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/precise.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/precise.patch Thu Jul 19 07:58:24 2012
@@ -1,0 +1,46 @@
+Index: debian/rules
+===================================================================
+--- debian/rules	(révision 45255)
++++ debian/rules	(copie de travail)
+@@ -40,9 +40,9 @@
+ endif
+ 
+ # PETSC_DIR is the location of PETSc.
+-export PETSC_DIR=/usr/lib/petscdir/3.2
++export PETSC_DIR=/usr/lib/petscdir/3.1
+ export PETSC_ARCH=linux-gnu-c-opt
+-export SLEPC_DIR=/usr/lib/slepcdir/3.2
++export SLEPC_DIR=/usr/lib/slepcdir/3.1
+ 
+ override_dh_auto_clean:
+ 	rm -rf $(BUILDDIR)
+Index: debian/control
+===================================================================
+--- debian/control	(révision 45255)
++++ debian/control	(copie de travail)
+@@ -11,14 +11,14 @@
+  mpi-default-dev,
+  libgmm++-dev [!hurd-i386 !s390x],
+  liboce-modeling-dev, liboce-visualization-dev, liboce-ocaf-dev, oce-draw,
+- libcgns-dev (>= 3.1.3.4),
++ libcgns-dev (>= 2.5.5),
+  libmed-dev (>= 2.3.6), libmedc-dev (>= 2.3.6), 
+- libhdf5-mpi-dev (>= 1.8.8) [alpha amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc],
++ libhdf5-mpi-dev (>= 1.8.4) [alpha amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc sparc],
+  libblas-dev, liblapack-dev, libgl2ps-dev, freeglut3-dev,
+  python-dev (>= 2.6.6-3~), swig2.0,
+  chrpath, libann-dev,
+- libpetsc3.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
+- libslepc3.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
++ libpetsc3.1-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
++ libslepc3.1-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x],
+  javahelper, default-jdk
+ Standards-Version: 3.9.3
+ DM-Upload-Allowed: yes
+Index: debian/gmsh-tetgen.pyinstall
+===================================================================
+--- debian/gmsh-tetgen.pyinstall	(révision 45255)
++++ debian/gmsh-tetgen.pyinstall	(copie de travail)
+@@ -1,2 +0,0 @@
+-debian/build/wrappers/gmshpy/*.so gmshpy
+-debian/build/wrappers/gmshpy/*.py gmshpy

Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=45260&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Thu Jul 19 07:58:24 2012
@@ -40,9 +40,9 @@
 endif
 
 # PETSC_DIR is the location of PETSc.
-export PETSC_DIR=/usr/lib/petscdir/3.2
+export PETSC_DIR=/usr/lib/petscdir/3.1
 export PETSC_ARCH=linux-gnu-c-opt
-export SLEPC_DIR=/usr/lib/slepcdir/3.2
+export SLEPC_DIR=/usr/lib/slepcdir/3.1
 
 override_dh_auto_clean:
 	rm -rf $(BUILDDIR)

More information about the debian-science-commits mailing list