[med-svn] r3486 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Jun 15 17:44:57 UTC 2009
Author: malat-guest
Date: 2009-06-15 17:44:56 +0000 (Mon, 15 Jun 2009)
New Revision: 3486
Added:
trunk/packages/gdcm/trunk/debian/libgdcm-java.install
trunk/packages/gdcm/trunk/debian/libgdcm-tools.manpages
trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install
trunk/packages/gdcm/trunk/debian/libvtkgdcm-tools.manpages
trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/control
trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
trunk/packages/gdcm/trunk/debian/libgdcm-tools.install
trunk/packages/gdcm/trunk/debian/patches/series
trunk/packages/gdcm/trunk/debian/rules
Log:
Move up to GDCM 2.0.12 (except man page)
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2009-06-15 13:47:24 UTC (rev 3485)
+++ trunk/packages/gdcm/trunk/debian/changelog 2009-06-15 17:44:56 UTC (rev 3486)
@@ -1,3 +1,13 @@
+gdcm (2.0.12-1) unstable; urgency=low
+
+ * Skipping 2.0.11 packaging as it does not provides anything more than 2.0.12
+ * Adding libvtkgdcm-cil, libgdcm-java and libvtkgdcm-java which provides, namely
+ the CLI binding to VTK/GDCM, the Java binding to gdcm and to VTK/GDCM.
+ * New cmd line tools: gdcmanon, gdcmpdf and gdcmgendir
+ * Adding man pages
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 15 Jun 2009 16:56:43 +0200
+
gdcm (2.0.10-3) unstable; urgency=low
* Do not build libgdcm-cil when mono is not available. Closes: #531174
Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control 2009-06-15 13:47:24 UTC (rev 3485)
+++ trunk/packages/gdcm/trunk/debian/control 2009-06-15 17:44:56 UTC (rev 3486)
@@ -11,7 +11,7 @@
python-support (>= 0.3.9), uuid-dev, zlib1g-dev, libexpat1-dev,
swig, cmake, libvtk5-dev (>= 5.2.1-4), python-vtk, libpng12-dev | libpng-dev,
libjpeg62-dev, libtiff4-dev, libfreetype6-dev, libopenjpeg-dev,
- libxext-dev, libxss-dev, libxft-dev, mono-devel (>= 2.0.1)
+ libxext-dev, libxss-dev, libxft-dev, mono-devel (>= 2.0.1), default-jdk, libpoppler-dev, libssl-dev
Standards-Version: 3.8.1
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gdcm/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gdcm/trunk/
@@ -20,7 +20,6 @@
Package: libgdcm2.0
Architecture: any
Depends: ${shlibs:Depends}
-Suggests: dcmtk
Description: Grassroots DICOM runtime libraries
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -33,6 +32,7 @@
Architecture: any
Section: utils
Depends: ${shlibs:Depends}
+Suggests: dcmtk
Description: Grassroots DICOM tools and utilities
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -79,6 +79,18 @@
CLI bindings to the GDCM DICOM library. It allows developers to use
GDCM from C# environment.
+Package: libgdcm-java
+Section: cli-mono
+Architecture: any
+Depends: ${shlibs:Depends}, ${java:Depends}, libgdcm2.0 (= ${binary:Version})
+Description: Grassroots DICOM Java bindings
+ Grassroots DiCoM is a C++ library for DICOM medical files. It is
+ automatically wrapped to python/C#/Java (using swig). It supports
+ RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
+ .
+ Java bindings to the GDCM DICOM library. It allows developers to use
+ GDCM from Java environment.
+
Package: python-gdcm
Section: python
Architecture: any
@@ -95,7 +107,6 @@
Package: libvtkgdcm2.0
Architecture: any
Depends: ${shlibs:Depends}
-Recommends: dcmtk
Description: Grassroots DICOM VTK runtime libraries
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -117,6 +128,28 @@
use GDCM, but are needed to build plugins or programs that link
against libvtkgdcm.
+Package: libvtkgdcm-cil
+Section: cli-mono
+Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Depends: ${shlibs:Depends}, ${cli:Depends}, libgdcm2.0 (= ${binary:Version})
+Description: Grassroots DICOM VTK CLI bindings
+ Grassroots DiCoM is a C++ library for DICOM medical files. It is
+ automatically wrapped to python/C#/Java (using swig). It supports
+ RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
+ .
+ VTK CLI bindings to the GDCM DICOM library.
+
+Package: libvtkgdcm-java
+Section: java
+Architecture: any
+Depends: ${shlibs:Depends}, ${java:Depends}, libgdcm2.0 (= ${binary:Version})
+Description: Grassroots DICOM VTK Java bindings
+ Grassroots DiCoM is a C++ library for DICOM medical files. It is
+ automatically wrapped to python/C#/Java (using swig). It supports
+ RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
+ .
+ VTK Java bindings to the GDCM DICOM library.
+
Package: python-vtkgdcm
Section: python
Architecture: any
Modified: trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2009-06-15 13:47:24 UTC (rev 3485)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2009-06-15 17:44:56 UTC (rev 3486)
@@ -1,2 +1,3 @@
-usr/lib/libgdcm-cil/*.dll
-usr/lib/libgdcm-cil/libgdcm.so
+usr/lib/libgdcm-cil/gdcm-sharp.dll
+usr/lib/libgdcm-cil/gdcm-sharp.dll.config
+usr/lib/libgdcm-cil/libgdcmsharpglue.so
Added: trunk/packages/gdcm/trunk/debian/libgdcm-java.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-java.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-java.install 2009-06-15 17:44:56 UTC (rev 3486)
@@ -0,0 +1,2 @@
+usr/share/java/gdcm.jar
+usr/lib/jni/libgdcmjni.so
Property changes on: trunk/packages/gdcm/trunk/debian/libgdcm-java.install
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/packages/gdcm/trunk/debian/libgdcm-tools.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-tools.install 2009-06-15 13:47:24 UTC (rev 3485)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-tools.install 2009-06-15 17:44:56 UTC (rev 3486)
@@ -1,7 +1,10 @@
+usr/bin/gdcmanon
+usr/bin/gdcmconv
usr/bin/gdcmdump
-usr/bin/gdcmconv
+usr/bin/gdcmgendir
usr/bin/gdcmimg
usr/bin/gdcminfo
+usr/bin/gdcmpdf
usr/bin/gdcmraw
usr/bin/gdcmscanner
usr/bin/gdcmtar
Added: trunk/packages/gdcm/trunk/debian/libgdcm-tools.manpages
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-tools.manpages (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-tools.manpages 2009-06-15 17:44:56 UTC (rev 3486)
@@ -0,0 +1,10 @@
+usr/share/man/man1/gdcmanon.1
+usr/share/man/man1/gdcmconv.1
+usr/share/man/man1/gdcmdump.1
+usr/share/man/man1/gdcmgendir.1
+usr/share/man/man1/gdcmimg.1
+usr/share/man/man1/gdcminfo.1
+usr/share/man/man1/gdcmpdf.1
+usr/share/man/man1/gdcmraw.1
+usr/share/man/man1/gdcmscanner.1
+usr/share/man/man1/gdcmtar.1
Added: trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install 2009-06-15 17:44:56 UTC (rev 3486)
@@ -0,0 +1,3 @@
+usr/lib/libvtkgdcm-cil/vtkgdcm-sharp.dll
+usr/lib/libvtkgdcm-cil/vtkgdcm-sharp.dll.config
+usr/lib/libvtkgdcm-cil/libvtkgdcmsharpglue.so
Property changes on: trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install 2009-06-15 17:44:56 UTC (rev 3486)
@@ -0,0 +1,2 @@
+usr/share/java/vtkgdcm.jar
+usr/lib/jni/libvtkgdcmJava.so
Property changes on: trunk/packages/gdcm/trunk/debian/libvtkgdcm-java.install
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/packages/gdcm/trunk/debian/libvtkgdcm-tools.manpages
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-tools.manpages (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-tools.manpages 2009-06-15 17:44:56 UTC (rev 3486)
@@ -0,0 +1,2 @@
+usr/share/man/man1/gdcmviewer.1
+usr/share/man/man1/gdcm2vtk.1
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2009-06-15 13:47:24 UTC (rev 3485)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2009-06-15 17:44:56 UTC (rev 3486)
@@ -1,4 +1,5 @@
-csharp-install.patch
+#csharp-install.patch
gdcmjpeg-versioning.patch
-gdcm210_tagbackport.patch
-gdcm210_branchbackport.patch
+#gdcm210_tagbackport.patch
+#gdcm210_branchbackport.patch
+vtk_jar.patch
Added: trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch 2009-06-15 17:44:56 UTC (rev 3486)
@@ -0,0 +1,30 @@
+See debian bug #533193
+
+--- gdcm-2.0.12.orig/Utilities/VTK/CMakeLists.txt (revision 5834)
++++ gdcm-2.0.12/Utilities/VTK/CMakeLists.txt (working copy)
+@@ -235,9 +235,13 @@
+ # Create the jar file:
+ # I am pretty sure this *.java thingy will byte me one day, when someone will try
+ # to recompile from an existing build tree with invalid generated *.java file...
++ if(EXISTS ${VTK_JAVA_JAR})
++ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533193
++ set(GDCM_VTK_JAVA_JAR ${VTK_JAVA_JAR})
++ endif(EXISTS ${VTK_JAVA_JAR})
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
+- COMMAND ${JAVA_COMPILE} ARGS -cp ${VTK_JAVA_JAR} "vtk/*.java"
++ COMMAND ${JAVA_COMPILE} ARGS -cp ${GDCM_VTK_JAVA_JAR} "vtk/*.java"
+ COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.jar vtk/*.class
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java
+ DEPENDS ${VTKGDCM_NAME}Java
+@@ -255,6 +259,10 @@
+ LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKLibraries ${NAMELINK_SKIP}
+ ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKDevelopment
+ )
++ # because vtkgdcm.jar is constructed with custom commands, it need the INSTALL(FILES signature:
++ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar
++ DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries
++ )
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+
+ ELSE(VTK_WRAP_JAVA)
Property changes on: trunk/packages/gdcm/trunk/debian/patches/vtk_jar.patch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules 2009-06-15 13:47:24 UTC (rev 3485)
+++ trunk/packages/gdcm/trunk/debian/rules 2009-06-15 17:44:56 UTC (rev 3486)
@@ -37,6 +37,8 @@
JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
+export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj-4.3-1.5.0.0/
+
SRC := $(CURDIR)
BUILD := $(CURDIR)/debian/build
TARGET := $(CURDIR)/debian/tmp
@@ -55,9 +57,12 @@
-DGDCM_NO_EXECUTABLE_PROPERTIES=ON \
-DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
-DGDCM_BUILD_APPLICATIONS=ON \
+ -DGDCM_DOCUMENTATION:BOOL=ON \
+ -DGDCM_PDF_DOCUMENTATION:BOOL=OFF \
-DGDCM_BUILD_SHARED_LIBS=ON \
-DGDCM_WRAP_PYTHON=ON \
-DGDCM_WRAP_CSHARP=ON \
+ -DGDCM_WRAP_JAVA=ON \
-DMCS_EXECUTABLE:FILEPATH=/usr/bin/gmcs \
-DGDCM_BUILD_TESTING:BOOL=OFF \
-DCMAKE_BUILD_TYPE:STRING=Release \
@@ -65,8 +70,10 @@
-DGDCM_USE_SYSTEM_UUID:BOOL=ON \
-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON \
-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=ON \
- -DGDCM_USE_VTK:BOOL=ON \
- -DPREFERRED_PYTHON_VERSION=python$*
+ -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
+ -DGDCM_USE_SYSTEM_POPPLER:BOOL=ON \
+ -DGDCM_VTK_JAVA_JAR:FILEPATH=/usr/share/java/vtk.jar \
+ -DGDCM_USE_VTK:BOOL=ON
touch $@
build: debian/build-stamp
@@ -103,7 +110,20 @@
# correct location of libgdcm-cil files
cd $(TARGET)/usr/lib && mkdir libgdcm-cil
- cd $(TARGET)/usr/lib && mv gdcm-*/*.dll gdcm-*/libgdcm.so libgdcm-cil
+ cd $(TARGET)/usr/lib && mv gdcm-sharp.dll gdcm-sharp.dll.config libgdcmsharpglue.so libgdcm-cil
+ # correct location of libvtkgdcm-cil files
+ cd $(TARGET)/usr/lib && mkdir libvtkgdcm-cil
+ cd $(TARGET)/usr/lib && mv vtkgdcm-sharp.dll vtkgdcm-sharp.dll.config libvtkgdcmsharpglue.so libvtkgdcm-cil
+ # correct location of libgdcm-java
+ cd $(TARGET)/usr/share && mkdir java
+ cd $(TARGET)/usr && mv lib/gdcm.jar share/java
+ cd $(TARGET)/usr/lib && mkdir jni
+ cd $(TARGET)/usr/lib && mv libgdcmjni.so jni
+ # correct location of libvtkgdcm-java
+ cd $(TARGET)/usr && mv lib/vtkgdcm.jar share/java
+ cd $(TARGET)/usr/lib && mv libvtkgdcmJava.so jni
+ # correct location of libvtkgdcm-java
+ cd $(TARGET)/usr && mv man share
# This single target is used to build all the packages, all at once, or
# one at a time. So keep in mind: any options passed to commands here will
More information about the debian-med-commit
mailing list