[med-svn] r8626 - in trunk/packages/bioimagexd/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Nov 21 14:32:49 UTC 2011
Author: malat-guest
Date: 2011-11-21 14:32:48 +0000 (Mon, 21 Nov 2011)
New Revision: 8626
Added:
trunk/packages/bioimagexd/trunk/debian/patches/faketoplevel.patch
trunk/packages/bioimagexd/trunk/debian/patches/findjni.patch
trunk/packages/bioimagexd/trunk/debian/patches/fixpython.patch
Modified:
trunk/packages/bioimagexd/trunk/debian/control
trunk/packages/bioimagexd/trunk/debian/patches/fixvtkjavaldpath.patch
trunk/packages/bioimagexd/trunk/debian/patches/series
trunk/packages/bioimagexd/trunk/debian/rules
Log:
redo d/rules
Modified: trunk/packages/bioimagexd/trunk/debian/control
===================================================================
--- trunk/packages/bioimagexd/trunk/debian/control 2011-11-21 14:11:59 UTC (rev 8625)
+++ trunk/packages/bioimagexd/trunk/debian/control 2011-11-21 14:32:48 UTC (rev 8626)
@@ -4,7 +4,7 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 8), libvtk5-dev, libinsighttoolkit3-dev, libvtk-java
+Build-Depends: debhelper (>= 8), libvtk5-dev, libinsighttoolkit3-dev, libvtk-java, default-jdk
Standards-Version: 3.9.2
Homepage: http://www.bioimagexd.net/
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/bioimagexd/trunk/
Added: trunk/packages/bioimagexd/trunk/debian/patches/faketoplevel.patch
===================================================================
--- trunk/packages/bioimagexd/trunk/debian/patches/faketoplevel.patch (rev 0)
+++ trunk/packages/bioimagexd/trunk/debian/patches/faketoplevel.patch 2011-11-21 14:32:48 UTC (rev 8626)
@@ -0,0 +1,8 @@
+Index: bioimagexd-1.0/CMakeLists.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ bioimagexd-1.0/CMakeLists.txt 2011-11-21 15:24:18.000000000 +0100
+@@ -0,0 +1,3 @@
++project(fake)
++add_subdirectory(vtkBXD)
++add_subdirectory(itkBXD)
Added: trunk/packages/bioimagexd/trunk/debian/patches/findjni.patch
===================================================================
--- trunk/packages/bioimagexd/trunk/debian/patches/findjni.patch (rev 0)
+++ trunk/packages/bioimagexd/trunk/debian/patches/findjni.patch 2011-11-21 14:32:48 UTC (rev 8626)
@@ -0,0 +1,13 @@
+Index: bioimagexd-1.0/vtkBXD/Processing/CMakeLists.txt
+===================================================================
+--- bioimagexd-1.0.orig/vtkBXD/Processing/CMakeLists.txt 2011-11-21 15:16:00.000000000 +0100
++++ bioimagexd-1.0/vtkBXD/Processing/CMakeLists.txt 2011-11-21 15:16:46.000000000 +0100
+@@ -79,6 +79,8 @@
+
+ # Create the vtkBXDBioImageXD Java library.
+ IF (VTK_WRAP_JAVA AND VTKBXD_WRAP_JAVA)
++ find_package(JNI REQUIRED)
++ include_directories( ${JNI_INCLUDE_DIRS} )
+ #INCLUDE(${VTK_CMAKE_DIR}/vtkWrapJava.cmake)
+ #SET(VTK_WRAP_JAVA3_INIT_DIR "${PROJECT_SOURCE_DIR}")
+ SET(VTK_JAVA_HOME ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME})
Added: trunk/packages/bioimagexd/trunk/debian/patches/fixpython.patch
===================================================================
--- trunk/packages/bioimagexd/trunk/debian/patches/fixpython.patch (rev 0)
+++ trunk/packages/bioimagexd/trunk/debian/patches/fixpython.patch 2011-11-21 14:32:48 UTC (rev 8626)
@@ -0,0 +1,13 @@
+Index: bioimagexd-1.0/vtkBXD/Processing/CMakeLists.txt
+===================================================================
+--- bioimagexd-1.0.orig/vtkBXD/Processing/CMakeLists.txt 2011-11-21 15:20:35.000000000 +0100
++++ bioimagexd-1.0/vtkBXD/Processing/CMakeLists.txt 2011-11-21 15:21:04.000000000 +0100
+@@ -43,6 +43,8 @@
+
+ # Create the vtkBXDBioImageXD Python library.
+ IF (VTK_WRAP_PYTHON AND VTKBXD_WRAP_PYTHON)
++ find_package(PythonLibs REQUIRED)
++ include_directories(${PYTHON_INCLUDE_DIRS})
+ VTK_WRAP_PYTHON3 (vtkBXDProcessingPython ProcessingPython_SRCS "${Processing_SRCS}")
+ ADD_LIBRARY (vtkBXDProcessingPythonD ${ProcessingPython_SRCS})
+ ADD_LIBRARY (vtkBXDProcessingPython MODULE vtkBXDProcessingPythonInit.cxx)
Modified: trunk/packages/bioimagexd/trunk/debian/patches/fixvtkjavaldpath.patch
===================================================================
--- trunk/packages/bioimagexd/trunk/debian/patches/fixvtkjavaldpath.patch 2011-11-21 14:11:59 UTC (rev 8625)
+++ trunk/packages/bioimagexd/trunk/debian/patches/fixvtkjavaldpath.patch 2011-11-21 14:32:48 UTC (rev 8626)
@@ -1,12 +1,12 @@
Index: bioimagexd-1.0/vtkBXD/Processing/CMakeLists.txt
===================================================================
---- bioimagexd-1.0.orig/vtkBXD/Processing/CMakeLists.txt 2011-11-21 14:59:03.000000000 +0100
-+++ bioimagexd-1.0/vtkBXD/Processing/CMakeLists.txt 2011-11-21 15:00:18.000000000 +0100
-@@ -90,6 +90,7 @@
- PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
- )
-
+--- bioimagexd-1.0.orig/vtkBXD/Processing/CMakeLists.txt 2011-05-09 15:49:40.000000000 +0200
++++ bioimagexd-1.0/vtkBXD/Processing/CMakeLists.txt 2011-11-21 15:20:01.000000000 +0100
+@@ -84,6 +84,7 @@
+ SET(VTK_JAVA_HOME ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME})
+ MAKE_DIRECTORY(${VTK_JAVA_HOME})
+ VTK_WRAP_JAVA3(vtkBXDProcessingJava ProcessingJava_SRCS "${Processing_SRCS}")
+ LINK_DIRECTORIES(/usr/lib/jni)
- TARGET_LINK_LIBRARIES(vtkBXDProcessingJava vtkBXDProcessing vtkImaging vtkImagingJava vtkCommon vtkCommonJava vtkIO vtkIOJava vtkWidgets vtkWidgetsJava vtkFiltering vtkFilteringJava)
+ ADD_LIBRARY (vtkBXDProcessingJava ${ProcessingJava_SRCS})
- INSTALL(TARGETS vtkBXDProcessing vtkBXDProcessingJava
+ SET_TARGET_PROPERTIES (vtkBXDProcessingJava
Modified: trunk/packages/bioimagexd/trunk/debian/patches/series
===================================================================
--- trunk/packages/bioimagexd/trunk/debian/patches/series 2011-11-21 14:11:59 UTC (rev 8625)
+++ trunk/packages/bioimagexd/trunk/debian/patches/series 2011-11-21 14:32:48 UTC (rev 8626)
@@ -1,2 +1,5 @@
fixvtkjavaldpath.patch
fixwrappingvtk56.patch
+findjni.patch
+fixpython.patch
+faketoplevel.patch
Modified: trunk/packages/bioimagexd/trunk/debian/rules
===================================================================
--- trunk/packages/bioimagexd/trunk/debian/rules 2011-11-21 14:11:59 UTC (rev 8625)
+++ trunk/packages/bioimagexd/trunk/debian/rules 2011-11-21 14:32:48 UTC (rev 8626)
@@ -3,9 +3,14 @@
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+
+# Technically one would only do
+#dh $@ --sourcedirectory=vtkBXD
+#dh $@ --sourcedirectory=itkBXD
+# however this does not work...instead create a fake toplevel cmake entry
+
%:
- dh $@ --sourcedirectory=vtkBXD
- dh $@ --sourcedirectory=itkBXD
+ dh $@
get-orig-source:
./debian/get-orig-source
More information about the debian-med-commit
mailing list