Author: malat Date: 2013-12-02 19:38:26 +0000 (Mon, 02 Dec 2013) New Revision: 15402
Added: trunk/packages/gdcm/trunk/debian/patches/java15.patch trunk/packages/gdcm/trunk/debian/patches/papyrus.patch Modified: trunk/packages/gdcm/trunk/debian/control trunk/packages/gdcm/trunk/debian/copyright trunk/packages/gdcm/trunk/debian/patches/series trunk/packages/gdcm/trunk/debian/rules Log: Prepare next upload Modified: trunk/packages/gdcm/trunk/debian/control =================================================================== --- trunk/packages/gdcm/trunk/debian/control 2013-12-02 18:21:20 UTC (rev 15401) +++ trunk/packages/gdcm/trunk/debian/control 2013-12-02 19:38:26 UTC (rev 15402) @@ -9,7 +9,7 @@ uuid-dev, libz-dev, libexpat-dev, doxygen, swig (>= 2.0.7), cmake (>= 2.8.9), libvtk5-dev, libcharls-dev, javahelper, libopenjpeg-dev, default-jdk, php5-dev, php5-cli, libxml2-dev, libjson-c-dev, - libpoppler-private-dev, libssl-dev, python-vtk, gccxml, + libpoppler-private-dev, libssl-dev, python-vtk, gccxml, libsocket++-dev, libpapyrus3-dev, libactiviz.net-cil [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc], mummy [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc], cli-common-dev (>= 0.8~) [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc], Modified: trunk/packages/gdcm/trunk/debian/copyright =================================================================== --- trunk/packages/gdcm/trunk/debian/copyright 2013-12-02 18:21:20 UTC (rev 15401) +++ trunk/packages/gdcm/trunk/debian/copyright 2013-12-02 19:38:26 UTC (rev 15402) @@ -34,6 +34,76 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Files: Source/MessageExchangeDefinition/gdcmARTIMTimer.cxx + Source/MessageExchangeDefinition/gdcmARTIMTimer.h + Source/MessageExchangeDefinition/gdcmBaseCompositeMessage.h + Source/MessageExchangeDefinition/gdcmBasePDU.h + Source/MessageExchangeDefinition/gdcmBaseRootQuery.cxx + Source/MessageExchangeDefinition/gdcmBaseRootQuery.h + Source/MessageExchangeDefinition/gdcmCEchoMessages.cxx + Source/MessageExchangeDefinition/gdcmCEchoMessages.h + Source/MessageExchangeDefinition/gdcmCFindMessages.cxx + Source/MessageExchangeDefinition/gdcmCFindMessages.h + Source/MessageExchangeDefinition/gdcmCMoveMessages.cxx + Source/MessageExchangeDefinition/gdcmCMoveMessages.h + Source/MessageExchangeDefinition/gdcmCompositeMessageFactory.cxx + Source/MessageExchangeDefinition/gdcmCompositeMessageFactory.h + Source/MessageExchangeDefinition/gdcmCompositeNetworkFunctions.cxx + Source/MessageExchangeDefinition/gdcmCompositeNetworkFunctions.h + Source/MessageExchangeDefinition/gdcmCStoreMessages.cxx + Source/MessageExchangeDefinition/gdcmCStoreMessages.h + Source/MessageExchangeDefinition/gdcmNetworkEvents.h + Source/MessageExchangeDefinition/gdcmNetworkStateID.h + Source/MessageExchangeDefinition/gdcmPDUFactory.cxx + Source/MessageExchangeDefinition/gdcmPDUFactory.h + Source/MessageExchangeDefinition/gdcmQueryBase.h + Source/MessageExchangeDefinition/gdcmQueryFactory.cxx + Source/MessageExchangeDefinition/gdcmQueryFactory.h + Source/MessageExchangeDefinition/gdcmQueryImage.cxx + Source/MessageExchangeDefinition/gdcmQueryImage.h + Source/MessageExchangeDefinition/gdcmQueryPatient.cxx + Source/MessageExchangeDefinition/gdcmQueryPatient.h + Source/MessageExchangeDefinition/gdcmQuerySeries.cxx + Source/MessageExchangeDefinition/gdcmQuerySeries.h + Source/MessageExchangeDefinition/gdcmQueryStudy.cxx + Source/MessageExchangeDefinition/gdcmQueryStudy.h + Source/MessageExchangeDefinition/gdcmULActionAA.cxx + Source/MessageExchangeDefinition/gdcmULActionAA.h + Source/MessageExchangeDefinition/gdcmULActionAE.cxx + Source/MessageExchangeDefinition/gdcmULActionAE.h + Source/MessageExchangeDefinition/gdcmULActionAR.cxx + Source/MessageExchangeDefinition/gdcmULActionAR.h + Source/MessageExchangeDefinition/gdcmULActionDT.cxx + Source/MessageExchangeDefinition/gdcmULActionDT.h + Source/MessageExchangeDefinition/gdcmULAction.h + Source/MessageExchangeDefinition/gdcmULBasicCallback.cxx + Source/MessageExchangeDefinition/gdcmULBasicCallback.h + Source/MessageExchangeDefinition/gdcmULConnectionCallback.h + Source/MessageExchangeDefinition/gdcmULConnection.cxx + Source/MessageExchangeDefinition/gdcmULConnection.h + Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx + Source/MessageExchangeDefinition/gdcmULConnectionInfo.h + Source/MessageExchangeDefinition/gdcmULConnectionManager.cxx + Source/MessageExchangeDefinition/gdcmULConnectionManager.h + Source/MessageExchangeDefinition/gdcmULEvent.h + Source/MessageExchangeDefinition/gdcmULTransitionTable.cxx + Source/MessageExchangeDefinition/gdcmULTransitionTable.h + Source/MessageExchangeDefinition/gdcmULWritingCallback.cxx + Source/MessageExchangeDefinition/gdcmULWritingCallback.h +Copyright: Insight Software Consortium +License: Apache-2-0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0.txt + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + Files: CMake/*.cmake Copyright: 2006-2011 Mathieu Malaterre <mathieu.malate...@gmail.com> License: COPYING-CMAKE-SCRIPTS Added: trunk/packages/gdcm/trunk/debian/patches/java15.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/java15.patch (rev 0) +++ trunk/packages/gdcm/trunk/debian/patches/java15.patch 2013-12-02 19:38:26 UTC (rev 15402) @@ -0,0 +1,81 @@ +Description: Force java target +Author: Mathieu Malaterre <ma...@debian.org> +Bug-Debian: http://bugs.debian.org/729515 + +--- gdcm-2.4.0.orig/CMake/FindJavaProperties.cmake ++++ gdcm-2.4.0/CMake/FindJavaProperties.cmake +@@ -57,7 +57,7 @@ if(${current_list_path}/GetSystemPropert + #message("${current_list_path}/GetSystemProperty.java") + #message("${CMAKE_CURRENT_BINARY_DIR}/GetSystemProperty.class") + execute_process( +- COMMAND ${Java_JAVAC_EXECUTABLE} -source 1.5 ++ COMMAND ${Java_JAVAC_EXECUTABLE} -source 1.5 -target 1.5 + ${current_list_path}/GetSystemProperty.java -d ${CMAKE_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + ) +--- gdcm-2.4.0.orig/Examples/Java/CMakeLists.txt ++++ gdcm-2.4.0/Examples/Java/CMakeLists.txt +@@ -20,7 +20,7 @@ set(examples + foreach(example ${examples}) + add_custom_command( + OUTPUT ${EXECUTABLE_OUTPUT_PATH}/${example}.class +- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} -classpath ${LIBRARY_OUTPUT_PATH}/gdcm.jar ++ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -target 1.5 ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} -classpath ${LIBRARY_OUTPUT_PATH}/gdcm.jar + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java + COMMENT "javac ${example}.java" +--- gdcm-2.4.0.orig/Testing/Source/DataStructureAndEncodingDefinition/Java/CMakeLists.txt ++++ gdcm-2.4.0/Testing/Source/DataStructureAndEncodingDefinition/Java/CMakeLists.txt +@@ -15,7 +15,7 @@ set(classfilesdep) + foreach(example ${GDCM_JAVA_TEST_SRCS}) + add_custom_command( + OUTPUT ${EXECUTABLE_OUTPUT_PATH}/${example}.class +- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} -source 1.5 -classpath ${LIBRARY_OUTPUT_PATH}/gdcm.jar ++ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} -source 1.5 -target 1.5 -classpath ${LIBRARY_OUTPUT_PATH}/gdcm.jar + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java + COMMENT "javac ${example}.java" +--- gdcm-2.4.0.orig/Utilities/VTK/CMakeLists.txt ++++ gdcm-2.4.0/Utilities/VTK/CMakeLists.txt +@@ -640,7 +640,7 @@ if(GDCM_WRAP_JAVA) + #COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -cp ${GDCM_VTK_JAVA_JAR} "vtk/*.java" + # No such thing as -cp for javac only java is listed: + # http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/classpath.html +- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS ${jflags} -source 1.5 -classpath ${GDCM_VTK_JAVA_JAR} "vtk/*.java" ++ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS ${jflags} -source 1.5 -target 1.5 -classpath ${GDCM_VTK_JAVA_JAR} "vtk/*.java" + COMMAND ${Java_JAR_EXECUTABLE} ARGS -cvfm ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.jar ${CMAKE_CURRENT_SOURCE_DIR}/manifest.txt vtk/*.class + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java + DEPENDS ${VTKGDCM_NAME}Java +--- gdcm-2.4.0.orig/Utilities/VTK/Examples/Java/CMakeLists.txt ++++ gdcm-2.4.0/Utilities/VTK/Examples/Java/CMakeLists.txt +@@ -22,7 +22,7 @@ endif() + foreach(example ${examples}) + add_custom_command( + OUTPUT ${EXECUTABLE_OUTPUT_PATH}/${example}.class +- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -classpath "${classpath}" ++ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -target 1.5 -classpath "${classpath}" + ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java +--- gdcm-2.4.0.orig/Utilities/VTK/Testing/Java/CMakeLists.txt ++++ gdcm-2.4.0/Utilities/VTK/Testing/Java/CMakeLists.txt +@@ -21,7 +21,7 @@ set(classfilesdep) + foreach(example ${VTKGDCM_JAVA_TEST_SRCS}) + add_custom_command( + OUTPUT ${EXECUTABLE_OUTPUT_PATH}/${example}.class +- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -classpath "${classpath}" ++ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -target 1.5 -classpath "${classpath}" + ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java +--- gdcm-2.4.0.orig/Wrapping/Java/CMakeLists.txt ++++ gdcm-2.4.0/Wrapping/Java/CMakeLists.txt +@@ -77,7 +77,7 @@ add_custom_command( + # please compiler such as ecj (Eclipse Java Compiler 0.894_R34x) explicitly + # state we want 1.5 version to compile gdcm::ImageToImageFilter::GetOutput() + # const as covariant return type +- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 "gdcm/*.java" #${javafiles} ++ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -target 1.5 "gdcm/*.java" #${javafiles} + # 2. now that the *.class have been generated construct the jar file. We can + # only rely on the gdcm.java / gdcm.class to build dependencie, I am pretty + # sure it will break parallel builds... oh well Added: trunk/packages/gdcm/trunk/debian/patches/papyrus.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/papyrus.patch (rev 0) +++ trunk/packages/gdcm/trunk/debian/patches/papyrus.patch 2013-12-02 19:38:26 UTC (rev 15402) @@ -0,0 +1,36 @@ +Description: Fix papyrus compilation +Author: Mathieu Malaterre <ma...@debian.org> + +Index: gdcm-2.4.0/CMake/FindPAPYRUS3.cmake +=================================================================== +--- gdcm-2.4.0.orig/CMake/FindPAPYRUS3.cmake 2013-12-02 20:33:44.282339940 +0100 ++++ gdcm-2.4.0/CMake/FindPAPYRUS3.cmake 2013-12-02 20:34:05.374339655 +0100 +@@ -11,7 +11,13 @@ + # BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-find_path(PAPYRUS3_INCLUDE_DIR NAMES Papyrus3.h) ++set(PAPYRUS3_INCLUDE_DIRECTORIES ++ /usr/include/ ++ /usr/include/Papyrus3 ++ ) ++find_path(PAPYRUS3_INCLUDE_DIR Papyrus3.h ++ ${PAPYRUS3_INCLUDE_DIRECTORIES} ++ ) + find_library(PAPYRUS3_LIBRARY NAMES Papyrus3) + + include(FindPackageHandleStandardArgs) +Index: gdcm-2.4.0/Applications/Cxx/gdcmpap3.cxx +=================================================================== +--- gdcm-2.4.0.orig/Applications/Cxx/gdcmpap3.cxx 2013-12-02 20:33:41.450339979 +0100 ++++ gdcm-2.4.0/Applications/Cxx/gdcmpap3.cxx 2013-12-02 20:34:05.374339655 +0100 +@@ -34,7 +34,9 @@ + #include <getopt.h> + + #ifdef GDCM_USE_SYSTEM_PAPYRUS3 ++extern "C" { + #include <Papyrus3.h> ++} + #endif + + static void PrintVersion() Modified: trunk/packages/gdcm/trunk/debian/patches/series =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/series 2013-12-02 18:21:20 UTC (rev 15401) +++ trunk/packages/gdcm/trunk/debian/patches/series 2013-12-02 19:38:26 UTC (rev 15402) @@ -2,3 +2,5 @@ fixhurd.patch linkvtkdoc.patch addman.patch +java15.patch +papyrus.patch Modified: trunk/packages/gdcm/trunk/debian/rules =================================================================== --- trunk/packages/gdcm/trunk/debian/rules 2013-12-02 18:21:20 UTC (rev 15401) +++ trunk/packages/gdcm/trunk/debian/rules 2013-12-02 19:38:26 UTC (rev 15402) @@ -67,6 +67,8 @@ -DGDCM_USE_SYSTEM_JSON:BOOL=ON \ -DGDCM_USE_PARAVIEW:BOOL=OFF \ -DGDCM_USE_ACTIVIZ:BOOL=ON \ + -DGDCM_USE_SYSTEM_PAPYRUS3:BOOL=ON \ + -DGDCM_USE_SYSTEM_SOCKETXX:BOOL=ON \ -DPython_ADDITIONAL_VERSIONS=$(PYVER) \ -DGDCM_INSTALL_DOC_DIR:STRING=share/doc/gdcm-doc \ -DTAGFILES:STRING="/usr/share/doc/vtk-doc/html/vtk$(VTKVERS).tag=/usr/share/doc/vtk-doc/html/" \ _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit