[med-svn] r17404 - in trunk/packages/vtk-dicom/trunk/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Fri Jul 4 08:45:52 UTC 2014
Author: malat
Date: 2014-07-04 08:45:52 +0000 (Fri, 04 Jul 2014)
New Revision: 17404
Added:
trunk/packages/vtk-dicom/trunk/debian/patches/current.patch
Removed:
trunk/packages/vtk-dicom/trunk/debian/patches/51c53d2537d4fefec5c3e7b8545609079723e112.patch
trunk/packages/vtk-dicom/trunk/debian/patches/java_target.patch
trunk/packages/vtk-dicom/trunk/debian/patches/manifest.patch
trunk/packages/vtk-dicom/trunk/debian/patches/typo.patch
trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch
Modified:
trunk/packages/vtk-dicom/trunk/debian/changelog
trunk/packages/vtk-dicom/trunk/debian/control
trunk/packages/vtk-dicom/trunk/debian/patches/series
trunk/packages/vtk-dicom/trunk/debian/rules
Log:
new upload
Modified: trunk/packages/vtk-dicom/trunk/debian/changelog
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/changelog 2014-07-03 19:08:29 UTC (rev 17403)
+++ trunk/packages/vtk-dicom/trunk/debian/changelog 2014-07-04 08:45:52 UTC (rev 17404)
@@ -1,3 +1,11 @@
+vtk-dicom (0.5.0-2) unstable; urgency=low
+
+ * Add missing Conflicts/Replaces. Closes: #753467
+ * Add Multi-Arch: same when missing
+ * Remove local patches, applied upstream. Import from upstream.
+
+ -- Mathieu Malaterre <malat at debian.org> Fri, 04 Jul 2014 10:45:41 +0200
+
vtk-dicom (0.5.0-1) unstable; urgency=low
* New upstream
Modified: trunk/packages/vtk-dicom/trunk/debian/control
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/control 2014-07-03 19:08:29 UTC (rev 17403)
+++ trunk/packages/vtk-dicom/trunk/debian/control 2014-07-04 08:45:52 UTC (rev 17404)
@@ -22,8 +22,12 @@
Package: libvtk-dicom0.5-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: libvtk-dicom0.5 (= ${binary:Version}), ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
+Replaces: libvtk-dicom0.4-dev
+Conflicts: libvtk-dicom0.4-dev
+Provides: libvtk-dicom-dev
Description: DICOM for VTK - dev
This package contains a set of classes for managing DICOM
files and metadata from within VTK, and some utility programs
@@ -34,8 +38,9 @@
Package: libvtk-dicom0.5
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: multiarch-support
Description: DICOM for VTK - lib
This package contains a set of classes for managing DICOM
files and metadata from within VTK, and some utility programs
@@ -64,7 +69,7 @@
files and metadata from within VTK, and some utility programs
for interrogating and converting DICOM files.
.
- Java bindings
+ Java 1.5 bindings
Package: python-vtk-dicom
Section: python
Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/51c53d2537d4fefec5c3e7b8545609079723e112.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/51c53d2537d4fefec5c3e7b8545609079723e112.patch 2014-07-03 19:08:29 UTC (rev 17403)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/51c53d2537d4fefec5c3e7b8545609079723e112.patch 2014-07-04 08:45:52 UTC (rev 17404)
@@ -1,80 +0,0 @@
-From 51c53d2537d4fefec5c3e7b8545609079723e112 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi at gmail.com>
-Date: Sat, 28 Jun 2014 10:03:49 -0600
-Subject: [PATCH] Fix library loading in TestDICOMJava.
-
-It was using vtkJavaTesting.Initialize() to load the VTK libraries,
-which doesn't in some installations. Try using Java's own load path
-first, before falling back on vtkJavaTesting.Initialize().
----
- Testing/TestDICOMJava.java.in | 42 +++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 41 insertions(+), 1 deletion(-)
-
-diff --git a/Testing/TestDICOMJava.java.in b/Testing/TestDICOMJava.java.in
-index 6ffd79d..6c73b7e 100644
---- a/Testing/TestDICOMJava.java.in
-+++ b/Testing/TestDICOMJava.java.in
-@@ -4,12 +4,51 @@ import vtk.vtkDICOMMetaData;
- import vtk.vtkObject;
- import vtk.vtkIntArray;
- import vtk.vtkJavaTesting;
-+import vtk.vtkSettings;
-
- import java.io.File;
-
- public class TestDICOMJava {
- public static void main(final String[] args) {
-- vtkJavaTesting.Initialize(args, false);
-+ // try loading the VTK libs from the VTK build directory
-+ try {
-+ String[] kits = vtkSettings.GetKits();
-+ String vtk5libs[] = {
-+ "vtkCommonJava", "vtkFilteringJava", "vtkImagingJava",
-+ "vtkGraphicsJava", "vtkIOJava"
-+ };
-+ String vtk6libs[] = {
-+ "vtkCommonCoreJava", "vtkCommonDataModelJava",
-+ "vtkIOImageJava", "vtkIOMPIImageJava"
-+ };
-+ int cc;
-+ for (cc = 0; cc < kits.length; cc++) {
-+ String libname = "vtk" + kits[cc] + "Java";
-+ boolean found = false;
-+ int i;
-+ for (i = 0; i < vtk5libs.length; i++) {
-+ if (libname.equals(vtk5libs[i])) {
-+ found = true;
-+ break;
-+ }
-+ }
-+ for (i = 0; i < vtk6libs.length; i++) {
-+ if (libname.equals(vtk6libs[i])) {
-+ found = true;
-+ break;
-+ }
-+ }
-+ if (found) {
-+ Runtime.getRuntime().loadLibrary(libname);
-+ }
-+ }
-+ }
-+ catch (UnsatisfiedLinkError ee) {
-+ // try using VTK's own load function instead
-+ vtkJavaTesting.Initialize(args, false);
-+ }
-+
-+ // load the vtkDICOMJava lib
- String sep = System.getProperty("file.separator");
- String lname = System.mapLibraryName("vtkDICOMJava");
- String lpath = "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@";
-@@ -33,6 +72,7 @@ public class TestDICOMJava {
- vtkDICOMReader reader = new vtkDICOMReader();
- vtkDICOMWriter writer = new vtkDICOMWriter();
- vtkDICOMMetaData meta = new vtkDICOMMetaData();
-+ writer.SetInputConnection(reader.GetOutputPort());
- vtkIntArray a = new vtkIntArray();
- vtkObject.JAVA_OBJECT_MANAGER.deleteAll();
- System.out.println("Ran the vtk-dicom Java test.");
---
-1.9.3
-
Added: trunk/packages/vtk-dicom/trunk/debian/patches/current.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/current.patch (rev 0)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/current.patch 2014-07-04 08:45:52 UTC (rev 17404)
@@ -0,0 +1,174 @@
+Description: import diffs from upstream
+Author: David Gobbi <david.gobbi at gmail.com>
+
+--- vtk-dicom-0.5.0.orig/CMakeLists.txt
++++ vtk-dicom-0.5.0/CMakeLists.txt
+@@ -351,7 +366,10 @@ if(BUILD_PYTHON_WRAPPERS)
+ if("${VTK_MAJOR_VERSION}" GREATER 5)
+ set(LIB_PYTHON_OUTPUT_NAME ${LIB_PYTHON_OUTPUT_NAME}${LIB_NAME_SUFFIX})
+ endif()
+- set(LIB_PYTHON_LIBS)
++ set(LIB_PYTHON_LIBS vtkPythonCore)
++ if("${VTK_MAJOR_VERSION}" GREATER 5)
++ set(LIB_PYTHON_LIBS vtkWrappingPythonCore)
++ endif()
+ foreach(TMP_LIB ${VTK_LIBS})
+ set(LIB_PYTHON_LIBS ${LIB_PYTHON_LIBS} ${TMP_LIB}PythonD)
+ endforeach()
+@@ -369,11 +387,8 @@ if(BUILD_PYTHON_WRAPPERS)
+ set_target_properties(${LIB_PYTHON_NAME} PROPERTIES
+ VERSION "${DICOM_VERSION}" SOVERSION "${DICOM_SHORT_VERSION}"
+ OUTPUT_NAME "${LIB_PYTHON_OUTPUT_NAME}")
+- target_link_libraries(${LIB_PYTHON_NAME} ${LIB_NAME} ${LIB_PYTHON_LIBS})
+- # On Win32 and Mac, link python library now, on UNIX, don't
+- if(WIN32 OR APPLE)
+- target_link_libraries(${LIB_PYTHON_NAME} ${VTK_PYTHON_LIBRARIES})
+- endif()
++ target_link_libraries(${LIB_PYTHON_NAME}
++ ${LIB_NAME} ${LIB_PYTHON_LIBS} ${VTK_PYTHON_LIBRARIES})
+ if(USE_DCMTK AND DCMTK_charls_LIBRARY)
+ target_link_libraries(${LIB_PYTHON_NAME} ${DCMTK_charls_LIBRARY})
+ endif()
+@@ -400,9 +415,15 @@ if(BUILD_JAVA_WRAPPERS)
+ find_package(Java REQUIRED)
+ find_package(JNI REQUIRED)
+
++ set(VTK_JAVA_SOURCE_VERSION "1.5" CACHE STRING "javac source version")
++ set(VTK_JAVA_TARGET_VERSION "1.5" CACHE STRING "javac target version")
++ mark_as_advanced(VTK_JAVA_SOURCE_VERSION)
++ mark_as_advanced(VTK_JAVA_TARGET_VERSION)
++
+ set(vtk-module ${LIB_NAME})
+ set(VTK_WRAP_JAVA3_INIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+ set(VTK_JAVA_HOME ${CMAKE_CURRENT_BINARY_DIR}/java/vtk)
++ set(VTK_JAVA_MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/java/manifest.txt)
+ make_directory(${VTK_JAVA_HOME})
+ set(LIB_JAVA_NAME ${LIB_NAME}Java)
+ set(LIB_JAVA_LIBS)
+@@ -455,7 +476,9 @@ if(BUILD_JAVA_WRAPPERS)
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt
+ DEPENDS ${VTK_JAVA_DEPENDENCIES}
+- COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -source 1.5
++ COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS}
++ -source ${VTK_JAVA_SOURCE_VERSION}
++ -target ${VTK_JAVA_TARGET_VERSION}
+ -classpath ${VTK_JAVA_JAR}${_sep}${VTK_DIR}/java
+ -sourcepath ${VTK_DIR}/java/vtk/
+ -d ${CMAKE_CURRENT_BINARY_DIR}/java
+@@ -464,10 +487,13 @@ if(BUILD_JAVA_WRAPPERS)
+ -E touch ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt
+ COMMENT "Compiling Java Classes"
+ )
++ file(WRITE ${VTK_JAVA_MANIFEST} "Class-Path: vtk.jar\n")
+ add_custom_command(
+- COMMAND ${JAVA_ARCHIVE} -cvf "${VTK_JAR_PATH}/vtkdicom.jar"
+- -C ${CMAKE_CURRENT_BINARY_DIR}/java
+- vtk
++ COMMAND ${JAVA_ARCHIVE} -cvfm
++ "${VTK_JAR_PATH}/vtkdicom.jar"
++ ${VTK_JAVA_MANIFEST}
++ -C ${CMAKE_CURRENT_BINARY_DIR}/java
++ vtk
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt ${JAVA_LIBRARIES}
+ OUTPUT ${VTK_JAR_PATH}/vtkdicom.jar
+ COMMENT "Java Archive"
+--- vtk-dicom-0.5.0.orig/Testing/CMakeLists.txt
++++ vtk-dicom-0.5.0/Testing/CMakeLists.txt
+@@ -64,8 +64,10 @@ if(BUILD_JAVA_WRAPPERS)
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/javac_test_stamp.txt
+ COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS}
++ -source ${VTK_JAVA_SOURCE_VERSION}
++ -target ${VTK_JAVA_TARGET_VERSION}
+ -classpath "${VTK_JAR_PATH}/vtkdicom.jar${_sep}${DICOM_BINARY_DIR}/java${_sep}${VTK_JAVA_JAR}"
+- -source 1.5 -sourcepath ${CMAKE_CURRENT_SOURCE_DIR}
++ -sourcepath ${CMAKE_CURRENT_SOURCE_DIR}
+ -d ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/TestDICOMJava.java
+ COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/javac_test_stamp.txt
+--- vtk-dicom-0.5.0.orig/Testing/TestDICOMJava.java.in
++++ vtk-dicom-0.5.0/Testing/TestDICOMJava.java.in
+@@ -4,12 +4,51 @@ import vtk.vtkDICOMMetaData;
+ import vtk.vtkObject;
+ import vtk.vtkIntArray;
+ import vtk.vtkJavaTesting;
++import vtk.vtkSettings;
+
+ import java.io.File;
+
+ public class TestDICOMJava {
+ public static void main(final String[] args) {
+- vtkJavaTesting.Initialize(args, false);
++ // try loading the VTK libs from the VTK build directory
++ try {
++ String[] kits = vtkSettings.GetKits();
++ String vtk5libs[] = {
++ "vtkCommonJava", "vtkFilteringJava", "vtkImagingJava",
++ "vtkGraphicsJava", "vtkIOJava"
++ };
++ String vtk6libs[] = {
++ "vtkCommonCoreJava", "vtkCommonDataModelJava",
++ "vtkIOImageJava", "vtkIOMPIImageJava"
++ };
++ int cc;
++ for (cc = 0; cc < kits.length; cc++) {
++ String libname = "vtk" + kits[cc] + "Java";
++ boolean found = false;
++ int i;
++ for (i = 0; i < vtk5libs.length; i++) {
++ if (libname.equals(vtk5libs[i])) {
++ found = true;
++ break;
++ }
++ }
++ for (i = 0; i < vtk6libs.length; i++) {
++ if (libname.equals(vtk6libs[i])) {
++ found = true;
++ break;
++ }
++ }
++ if (found) {
++ Runtime.getRuntime().loadLibrary(libname);
++ }
++ }
++ }
++ catch (UnsatisfiedLinkError ee) {
++ // try using VTK's own load function instead
++ vtkJavaTesting.Initialize(args, false);
++ }
++
++ // load the vtkDICOMJava lib
+ String sep = System.getProperty("file.separator");
+ String lname = System.mapLibraryName("vtkDICOMJava");
+ String lpath = "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@";
+@@ -33,6 +72,7 @@ public class TestDICOMJava {
+ vtkDICOMReader reader = new vtkDICOMReader();
+ vtkDICOMWriter writer = new vtkDICOMWriter();
+ vtkDICOMMetaData meta = new vtkDICOMMetaData();
++ writer.SetInputConnection(reader.GetOutputPort());
+ vtkIntArray a = new vtkIntArray();
+ vtkObject.JAVA_OBJECT_MANAGER.deleteAll();
+ System.out.println("Ran the vtk-dicom Java test.");
+--- vtk-dicom-0.5.0.orig/vtkDICOMValue.h
++++ vtk-dicom-0.5.0/vtkDICOMValue.h
+@@ -185,7 +185,7 @@ public:
+ * the number of binary values will be returned.
+ * - for UN, the number of bytes will be returned.
+ * - for attribute tags (VR is AT) the number of tags will be returned.
+- * - for sequences (SQ and XQ) the number of items in the sequence,
++ * - for sequences (SQ) the number of items in the sequence,
+ * excluding any delimeters, will be returned.
+ */
+ size_t GetNumberOfValues() const {
+--- vtk-dicom-0.5.0.orig/vtkNIFTIHeader.h
++++ vtk-dicom-0.5.0/vtkNIFTIHeader.h
+@@ -273,7 +273,7 @@ public:
+ const char *GetDescrip() { return this->Descrip; }
+
+ // Description:
+- // Get an auxilliary file, e.g. a color table, that is associated
++ // Get an auxiliary file, e.g. a color table, that is associated
+ // with this data. The length of the filename must be a maximum of
+ // 24 characters, and it will be assumed to be in the same directory
+ // as the NIFTI file.
Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/java_target.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/java_target.patch 2014-07-03 19:08:29 UTC (rev 17403)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/java_target.patch 2014-07-04 08:45:52 UTC (rev 17404)
@@ -1,17 +0,0 @@
-Description: -source is not enough, need -target
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: yes, https://github.com/dgobbi/vtk-dicom/issues/23
-
-Index: vtk-dicom-0.5.0/CMakeLists.txt
-===================================================================
---- vtk-dicom-0.5.0.orig/CMakeLists.txt 2014-06-30 16:32:02.000000000 +0200
-+++ vtk-dicom-0.5.0/CMakeLists.txt 2014-06-30 16:33:36.938871225 +0200
-@@ -458,7 +458,7 @@
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt
- DEPENDS ${VTK_JAVA_DEPENDENCIES}
-- COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -source 1.5
-+ COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -source 1.5 -target 1.5
- -classpath ${VTK_JAVA_JAR}${_sep}${VTK_DIR}/java
- -sourcepath ${VTK_DIR}/java/vtk/
- -d ${CMAKE_CURRENT_BINARY_DIR}/java
Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/manifest.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/manifest.patch 2014-07-03 19:08:29 UTC (rev 17403)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/manifest.patch 2014-07-04 08:45:52 UTC (rev 17404)
@@ -1,23 +0,0 @@
-Description: need to reference vtk.jar to fix a lintian warning
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: yes, https://github.com/dgobbi/vtk-dicom/issues/21
-
-Index: vtk-dicom-0.5.0/CMakeLists.txt
-===================================================================
---- vtk-dicom-0.5.0.orig/CMakeLists.txt 2014-06-30 15:41:26.646312510 +0200
-+++ vtk-dicom-0.5.0/CMakeLists.txt 2014-06-30 15:41:27.954312589 +0200
-@@ -468,7 +468,7 @@
- COMMENT "Compiling Java Classes"
- )
- add_custom_command(
-- COMMAND ${JAVA_ARCHIVE} -cvf "${VTK_JAR_PATH}/vtkdicom.jar"
-+ COMMAND ${JAVA_ARCHIVE} -cvfm "${VTK_JAR_PATH}/vtkdicom.jar" ${CMAKE_CURRENT_SOURCE_DIR}/manifest.txt
- -C ${CMAKE_CURRENT_BINARY_DIR}/java
- vtk
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt ${JAVA_LIBRARIES}
-Index: vtk-dicom-0.5.0/manifest.txt
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vtk-dicom-0.5.0/manifest.txt 2014-06-30 15:41:27.954312589 +0200
-@@ -0,0 +1 @@
-+Class-Path: vtk.jar
Modified: trunk/packages/vtk-dicom/trunk/debian/patches/series
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/series 2014-07-03 19:08:29 UTC (rev 17403)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/series 2014-07-04 08:45:52 UTC (rev 17404)
@@ -1,5 +1 @@
-51c53d2537d4fefec5c3e7b8545609079723e112.patch
-underlink.patch
-typo.patch
-manifest.patch
-java_target.patch
+current.patch
Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/typo.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/typo.patch 2014-07-03 19:08:29 UTC (rev 17403)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/typo.patch 2014-07-04 08:45:52 UTC (rev 17404)
@@ -1,17 +0,0 @@
-Description: fix a typo
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: yes
-
-Index: vtk-dicom-0.5.0/vtkNIFTIHeader.h
-===================================================================
---- vtk-dicom-0.5.0.orig/vtkNIFTIHeader.h 2014-06-11 15:52:12.000000000 +0200
-+++ vtk-dicom-0.5.0/vtkNIFTIHeader.h 2014-06-30 15:24:46.434252442 +0200
-@@ -273,7 +273,7 @@
- const char *GetDescrip() { return this->Descrip; }
-
- // Description:
-- // Get an auxilliary file, e.g. a color table, that is associated
-+ // Get an auxiliary file, e.g. a color table, that is associated
- // with this data. The length of the filename must be a maximum of
- // 24 characters, and it will be assumed to be in the same directory
- // as the NIFTI file.
Deleted: trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch 2014-07-03 19:08:29 UTC (rev 17403)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch 2014-07-04 08:45:52 UTC (rev 17404)
@@ -1,31 +0,0 @@
-Description: fix underlinking issues
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: no
-
-Index: vtk-dicom-0.5.0/CMakeLists.txt
-===================================================================
---- vtk-dicom-0.5.0.orig/CMakeLists.txt 2014-06-30 14:45:22.210110459 +0200
-+++ vtk-dicom-0.5.0/CMakeLists.txt 2014-06-30 14:45:34.274111183 +0200
-@@ -334,6 +334,7 @@
-
- # Wrappers
- if(BUILD_PYTHON_WRAPPERS)
-+ find_package(PythonLibs REQUIRED)
- set(vtk-module ${LIB_NAME})
- set(XY) # Get python version, e.g. 27 for python 2.7
- if(vtkPython_LIBRARIES)
-@@ -370,10 +371,12 @@
- VERSION "${DICOM_VERSION}" SOVERSION "${DICOM_SHORT_VERSION}"
- OUTPUT_NAME "${LIB_PYTHON_OUTPUT_NAME}")
- target_link_libraries(${LIB_PYTHON_NAME} ${LIB_NAME} ${LIB_PYTHON_LIBS})
-+ #message(${PYTHON_LIBRARY})
-+ target_link_libraries(${LIB_PYTHON_NAME} vtkPythonCore ${PYTHON_LIBRARY})
- # On Win32 and Mac, link python library now, on UNIX, don't
-- if(WIN32 OR APPLE)
-+ #if(WIN32 OR APPLE)
- target_link_libraries(${LIB_PYTHON_NAME} ${VTK_PYTHON_LIBRARIES})
-- endif()
-+ #endif()
- if(USE_DCMTK AND DCMTK_charls_LIBRARY)
- target_link_libraries(${LIB_PYTHON_NAME} ${DCMTK_charls_LIBRARY})
- endif()
Modified: trunk/packages/vtk-dicom/trunk/debian/rules
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/rules 2014-07-03 19:08:29 UTC (rev 17403)
+++ trunk/packages/vtk-dicom/trunk/debian/rules 2014-07-04 08:45:52 UTC (rev 17404)
@@ -17,6 +17,9 @@
%:
dh $@ --with python2 --with javahelper --parallel
+SOVERSION=0.5
+# https://github.com/dgobbi/vtk-dicom/issues/19
+# -DDICOM_INC_DIR:STRING=/include/vtk-dicom-$(SOVERSION)
CMAKE_EXTRA_FLAGS += \
-DCMAKE_SKIP_RPATH=OFF \
-DDICOM_LIB_DIR:STRING=/lib/$(DEB_HOST_MULTIARCH) \
@@ -31,7 +34,6 @@
dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
VERSION=$(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d- | cut -f2 -d~)
-SOVERSION=0.5
pkg_lib = libvtk-dicom$(SOVERSION)
pkg_dev = libvtk-dicom$(SOVERSION)-dev
pkg_bin = vtk-dicom-tools
More information about the debian-med-commit
mailing list