[med-svn] r20609 - trunk/packages/vtk-dicom/trunk/debian

[Gert Wollny]

Author: gert-guest
Date: 2015-12-02 15:42:46 +0000 (Wed, 02 Dec 2015)
New Revision: 20609

Modified:
   trunk/packages/vtk-dicom/trunk/debian/changelog
   trunk/packages/vtk-dicom/trunk/debian/control
   trunk/packages/vtk-dicom/trunk/debian/rules
Log:
Disable java bindings

Modified: trunk/packages/vtk-dicom/trunk/debian/changelog
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/changelog	2015-12-02 15:39:49 UTC (rev 20608)
+++ trunk/packages/vtk-dicom/trunk/debian/changelog	2015-12-02 15:42:46 UTC (rev 20609)
@@ -2,6 +2,7 @@
 
   * New upstream version 
   * build by using vtk6 Closes: #803595 
+  * Disable java bindings since these would require vtk java bindings 
   * Add patch 01_ to properly link required vtkIO*SQL libraries  
 
  -- Gert Wollny <gw.fossdev at gmail.com>  Wed, 02 Dec 2015 16:37:36 +0100

Modified: trunk/packages/vtk-dicom/trunk/debian/control
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/control	2015-12-02 15:39:49 UTC (rev 20608)
+++ trunk/packages/vtk-dicom/trunk/debian/control	2015-12-02 15:42:46 UTC (rev 20609)
@@ -6,12 +6,9 @@
            Gert Wollny <gw.fossdev at gmail.com> 
 Build-Depends: cmake (>= 2.6.3),
                debhelper (>= 9),
-               default-jdk,
                help2man,
-               javahelper,
                libgdcm2-dev,
-               libvtk-java,
-               libvtk5-dev (>= 5.8),
+               libvtk6-dev,
                python-all-dev,
                python-vtk
 Homepage: http://github.com/dgobbi/vtk-dicom/
@@ -59,17 +56,17 @@
  .
  Command line tools
 
-Package: libvtk-dicom-java
-Section: java
-Architecture: any
-Depends: ${java:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Suggests: java-virtual-machine
-Description: DICOM for VTK - java
- This package contains a set of classes for managing DICOM
- files and metadata from within VTK, and some utility programs
- for interrogating and converting DICOM files.
- .
- Java 1.5 bindings
+#Package: libvtk-dicom-java
+#Section: java
+#Architecture: any
+#Depends: ${java:Depends}, ${misc:Depends}, ${shlibs:Depends}
+#Suggests: java-virtual-machine
+#Description: DICOM for VTK - java
+# This package contains a set of classes for managing DICOM
+# files and metadata from within VTK, and some utility programs
+# for interrogating and converting DICOM files.
+# .
+# Java 1.5 bindings
 
 Package: python-vtk-dicom
 Section: python

Modified: trunk/packages/vtk-dicom/trunk/debian/rules
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/rules	2015-12-02 15:39:49 UTC (rev 20608)
+++ trunk/packages/vtk-dicom/trunk/debian/rules	2015-12-02 15:42:46 UTC (rev 20609)
@@ -25,7 +25,7 @@
 	-DDICOM_LIB_DIR:STRING=/lib/$(DEB_HOST_MULTIARCH) \
 	-DCMAKE_BUILD_TYPE:STRING=None \
 	-DBUILD_PYTHON_WRAPPERS:BOOL=ON \
-	-DBUILD_JAVA_WRAPPERS:BOOL=ON \
+	-DBUILD_JAVA_WRAPPERS:BOOL=OFF \
 	-DUSE_DCMTK:BOOL=OFF \
 	-DUSE_GDCM:BOOL=ON \
 	-DBUILD_SHARED_LIBS:BOOL=ON
@@ -38,7 +38,7 @@
 pkg_dev = libvtk-dicom$(SOVERSION)-dev
 pkg_bin = vtk-dicom-tools
 pkg_py2 = python-vtk-dicom
-pkg_java = libvtk-dicom-java
+#pkg_java = libvtk-dicom-java
 
 PYVER    := $(shell pyversions -dv)
 
@@ -55,8 +55,8 @@
 	dh_install -p$(pkg_py2) --autodest usr/lib/$(DEB_HOST_MULTIARCH)/libvtkDICOMPythonD.so*
 	dh_install -p$(pkg_py2) usr/lib/$(DEB_HOST_MULTIARCH)/vtkDICOMPython.so usr/lib/python$(PYVER)/dist-packages
 	# java
-	dh_install -p$(pkg_java) usr/lib/$(DEB_HOST_MULTIARCH)/libvtkDICOMJava.so usr/lib/$(DEB_HOST_MULTIARCH)/jni
-	dh_install -p$(pkg_java) --autodest usr/share/java/vtkdicom.jar
+#	dh_install -p$(pkg_java) usr/lib/$(DEB_HOST_MULTIARCH)/libvtkDICOMJava.so usr/lib/$(DEB_HOST_MULTIARCH)/jni
+#	dh_install -p$(pkg_java) --autodest usr/share/java/vtkdicom.jar
 	dh_install --list-missing
 
 debian/%.1: debian/common.1.in