Author: malat Date: 2013-12-10 08:23:33 +0000 (Tue, 10 Dec 2013) New Revision: 15473
Removed: trunk/packages/gdcm/trunk/debian/patches/addman.patch trunk/packages/gdcm/trunk/debian/patches/java15.patch trunk/packages/gdcm/trunk/debian/patches/papyrus.patch Modified: trunk/packages/gdcm/trunk/debian/changelog trunk/packages/gdcm/trunk/debian/control trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch trunk/packages/gdcm/trunk/debian/patches/series Log: import 2.4.1 Modified: trunk/packages/gdcm/trunk/debian/changelog =================================================================== --- trunk/packages/gdcm/trunk/debian/changelog 2013-12-09 15:50:29 UTC (rev 15472) +++ trunk/packages/gdcm/trunk/debian/changelog 2013-12-10 08:23:33 UTC (rev 15473) @@ -1,3 +1,11 @@ +gdcm (2.4.1-1) experimental; urgency=low + + * New upstream: 2.4.1 + * Bump Std-Vers to 3.9.5, no changes needed + * Refreshed patches, removed patches applied upstream + + -- Mathieu Malaterre <[email protected]> Tue, 10 Dec 2013 09:19:13 +0100 + gdcm (2.4.0-2) experimental; urgency=low * Use socket++ system installed lib. Closes: #727154 Modified: trunk/packages/gdcm/trunk/debian/control =================================================================== --- trunk/packages/gdcm/trunk/debian/control 2013-12-09 15:50:29 UTC (rev 15472) +++ trunk/packages/gdcm/trunk/debian/control 2013-12-10 08:23:33 UTC (rev 15473) @@ -15,7 +15,7 @@ cli-common-dev (>= 0.8~) [amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x], mono-devel (>= 2.10.5) [amd64 armel i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x] Build-Depends-Indep: vtk-doc, doxygen-latex, ghostscript, graphviz -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 X-Python-Version: 2.7 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/gdcm/trunk/ Deleted: trunk/packages/gdcm/trunk/debian/patches/addman.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/addman.patch 2013-12-09 15:50:29 UTC (rev 15472) +++ trunk/packages/gdcm/trunk/debian/patches/addman.patch 2013-12-10 08:23:33 UTC (rev 15473) @@ -1,15 +0,0 @@ -Description: Build gdcmxml man page -Author: Mathieu Malaterre <[email protected]> - -Index: gdcm-2.4.0/Utilities/doxygen/CMakeLists.txt -=================================================================== ---- gdcm-2.4.0.orig/Utilities/doxygen/CMakeLists.txt 2013-10-17 11:35:23.006538246 +0200 -+++ gdcm-2.4.0/Utilities/doxygen/CMakeLists.txt 2013-10-17 11:35:30.770538143 +0200 -@@ -192,6 +192,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcm2pnm.1 - ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmconv.1 - ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmpap3.1 -+ ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmxml.1 - ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmanon.1 - ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmgendir.1 - ${CMAKE_CURRENT_BINARY_DIR}/man/man1/gdcmdump.1 Modified: trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2013-12-09 15:50:29 UTC (rev 15472) +++ trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2013-12-10 08:23:33 UTC (rev 15473) @@ -3,10 +3,10 @@ http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#GNU_specific_define_tt_ Author: Mathieu Malaterre <[email protected]> -Index: gdcm-2.4.0/Source/Common/gdcmSystem.cxx +Index: gdcm-2.4.1/Source/Common/gdcmSystem.cxx =================================================================== ---- gdcm-2.4.0.orig/Source/Common/gdcmSystem.cxx 2013-10-16 10:28:54.000000000 +0200 -+++ gdcm-2.4.0/Source/Common/gdcmSystem.cxx 2013-10-17 11:11:36.838557353 +0200 +--- gdcm-2.4.1.orig/Source/Common/gdcmSystem.cxx 2013-12-09 18:22:40.000000000 +0100 ++++ gdcm-2.4.1/Source/Common/gdcmSystem.cxx 2013-12-10 09:15:48.378563355 +0100 @@ -363,6 +363,10 @@ return Rmdir(source) == 0; } @@ -18,10 +18,10 @@ // return size of file; also returns zero if no file exists size_t System::FileSize(const char* filename) { -Index: gdcm-2.4.0/Source/DataDictionary/gdcmGlobal.cxx +Index: gdcm-2.4.1/Source/DataDictionary/gdcmGlobal.cxx =================================================================== ---- gdcm-2.4.0.orig/Source/DataDictionary/gdcmGlobal.cxx 2013-10-16 10:28:54.000000000 +0200 -+++ gdcm-2.4.0/Source/DataDictionary/gdcmGlobal.cxx 2013-10-17 11:11:36.838557353 +0200 +--- gdcm-2.4.1.orig/Source/DataDictionary/gdcmGlobal.cxx 2013-12-09 18:22:40.000000000 +0100 ++++ gdcm-2.4.1/Source/DataDictionary/gdcmGlobal.cxx 2013-12-10 09:15:48.378563355 +0100 @@ -133,6 +133,10 @@ return true; } @@ -33,10 +33,10 @@ const char *Global::Locate(const char *resfile) const { #ifdef _WIN32 -Index: gdcm-2.4.0/Utilities/socketxx/socket++/sockstream.h +Index: gdcm-2.4.1/Utilities/socketxx/socket++/sockstream.h =================================================================== ---- gdcm-2.4.0.orig/Utilities/socketxx/socket++/sockstream.h 2013-10-16 10:28:54.000000000 +0200 -+++ gdcm-2.4.0/Utilities/socketxx/socket++/sockstream.h 2013-10-17 11:11:36.838557353 +0200 +--- gdcm-2.4.1.orig/Utilities/socketxx/socket++/sockstream.h 2013-12-09 18:22:40.000000000 +0100 ++++ gdcm-2.4.1/Utilities/socketxx/socket++/sockstream.h 2013-12-10 09:15:48.378563355 +0100 @@ -163,7 +163,7 @@ msg_peek = MSG_PEEK, msg_dontroute = MSG_DONTROUTE @@ -46,10 +46,10 @@ ,msg_maxiovlen = MSG_MAXIOVLEN #endif }; -Index: gdcm-2.4.0/Utilities/socketxx/socket++/local.h +Index: gdcm-2.4.1/Utilities/socketxx/socket++/local.h =================================================================== ---- gdcm-2.4.0.orig/Utilities/socketxx/socket++/local.h 2013-10-16 10:28:54.000000000 +0200 -+++ gdcm-2.4.0/Utilities/socketxx/socket++/local.h 2013-10-17 11:11:36.838557353 +0200 +--- gdcm-2.4.1.orig/Utilities/socketxx/socket++/local.h 2013-12-09 18:22:40.000000000 +0100 ++++ gdcm-2.4.1/Utilities/socketxx/socket++/local.h 2013-12-10 09:15:48.378563355 +0100 @@ -97,7 +97,7 @@ // extern "C" int gethostname (char* hostname, size_t len); // the above breaks on some old MacOSX system where prototype is: @@ -59,17 +59,3 @@ extern char* SYS_SIGLIST []; #endif #endif -Index: gdcm-2.4.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx -=================================================================== ---- gdcm-2.4.0.orig/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2013-10-16 10:28:54.000000000 +0200 -+++ gdcm-2.4.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2013-10-17 11:11:36.838557353 +0200 -@@ -36,9 +36,7 @@ - #include <arpa/inet.h> - #endif - --#if defined (__APPLE__) - #include <arpa/inet.h> // inet_addr --#endif - - namespace gdcm - { Deleted: trunk/packages/gdcm/trunk/debian/patches/java15.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/java15.patch 2013-12-09 15:50:29 UTC (rev 15472) +++ trunk/packages/gdcm/trunk/debian/patches/java15.patch 2013-12-10 08:23:33 UTC (rev 15473) @@ -1,81 +0,0 @@ -Description: Force java target -Author: Mathieu Malaterre <[email protected]> -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 Deleted: trunk/packages/gdcm/trunk/debian/patches/papyrus.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/papyrus.patch 2013-12-09 15:50:29 UTC (rev 15472) +++ trunk/packages/gdcm/trunk/debian/patches/papyrus.patch 2013-12-10 08:23:33 UTC (rev 15473) @@ -1,36 +0,0 @@ -Description: Fix papyrus compilation -Author: Mathieu Malaterre <[email protected]> - -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-09 15:50:29 UTC (rev 15472) +++ trunk/packages/gdcm/trunk/debian/patches/series 2013-12-10 08:23:33 UTC (rev 15473) @@ -1,6 +1,3 @@ toplevelskip.patch fixhurd.patch linkvtkdoc.patch -addman.patch -java15.patch -papyrus.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
