[med-svn] r14872 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Thu Oct 17 09:16:10 UTC 2013
Author: malat
Date: 2013-10-17 09:16:10 +0000 (Thu, 17 Oct 2013)
New Revision: 14872
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch
trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch
trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch
Log:
Prepare upload
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2013-10-17 07:43:28 UTC (rev 14871)
+++ trunk/packages/gdcm/trunk/debian/changelog 2013-10-17 09:16:10 UTC (rev 14872)
@@ -1,8 +1,9 @@
-gdcm (2.4.0-1) UNRELEASED; urgency=low
+gdcm (2.4.0-1) experimental; urgency=low
* New upstream
+ - upload to experimental, since change of API
- -- Mathieu Malaterre <malat at debian.org> Wed, 16 Oct 2013 11:29:33 +0200
+ -- Mathieu Malaterre <malat at debian.org> Thu, 17 Oct 2013 11:08:37 +0200
gdcm (2.2.4-1) unstable; urgency=low
Modified: trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2013-10-17 07:43:28 UTC (rev 14871)
+++ trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2013-10-17 09:16:10 UTC (rev 14872)
@@ -3,10 +3,10 @@
http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#GNU_specific_define_tt_
Author: Mathieu Malaterre <malat at debian.org>
-Index: gdcm-2.2.4/Source/Common/gdcmSystem.cxx
+Index: gdcm-2.4.0/Source/Common/gdcmSystem.cxx
===================================================================
---- gdcm-2.2.4.orig/Source/Common/gdcmSystem.cxx 2013-07-08 19:20:27.000000000 +0200
-+++ gdcm-2.2.4/Source/Common/gdcmSystem.cxx 2013-07-11 12:08:50.000000000 +0200
+--- 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
@@ -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.2.4/Source/DataDictionary/gdcmGlobal.cxx
+Index: gdcm-2.4.0/Source/DataDictionary/gdcmGlobal.cxx
===================================================================
---- gdcm-2.2.4.orig/Source/DataDictionary/gdcmGlobal.cxx 2013-07-08 19:20:27.000000000 +0200
-+++ gdcm-2.2.4/Source/DataDictionary/gdcmGlobal.cxx 2013-07-11 12:08:50.000000000 +0200
+--- 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
@@ -133,6 +133,10 @@
return true;
}
@@ -33,11 +33,11 @@
const char *Global::Locate(const char *resfile) const
{
#ifdef _WIN32
-Index: gdcm-2.2.4/Utilities/socketxx/socket++/sockstream.h
+Index: gdcm-2.4.0/Utilities/socketxx/socket++/sockstream.h
===================================================================
---- gdcm-2.2.4.orig/Utilities/socketxx/socket++/sockstream.h 2013-07-08 19:20:27.000000000 +0200
-+++ gdcm-2.2.4/Utilities/socketxx/socket++/sockstream.h 2013-07-11 12:08:50.000000000 +0200
-@@ -165,7 +165,7 @@
+--- 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
+@@ -163,7 +163,7 @@
msg_peek = MSG_PEEK,
msg_dontroute = MSG_DONTROUTE
@@ -46,10 +46,10 @@
,msg_maxiovlen = MSG_MAXIOVLEN
#endif
};
-Index: gdcm-2.2.4/Utilities/socketxx/socket++/local.h
+Index: gdcm-2.4.0/Utilities/socketxx/socket++/local.h
===================================================================
---- gdcm-2.2.4.orig/Utilities/socketxx/socket++/local.h 2013-07-08 19:20:27.000000000 +0200
-+++ gdcm-2.2.4/Utilities/socketxx/socket++/local.h 2013-07-11 12:08:50.000000000 +0200
+--- 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
@@ -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,10 +59,10 @@
extern char* SYS_SIGLIST [];
#endif
#endif
-Index: gdcm-2.2.4/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx
+Index: gdcm-2.4.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx
===================================================================
---- gdcm-2.2.4.orig/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2013-07-08 19:20:27.000000000 +0200
-+++ gdcm-2.2.4/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2013-07-11 12:08:50.000000000 +0200
+--- 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
Modified: trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch 2013-10-17 07:43:28 UTC (rev 14871)
+++ trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch 2013-10-17 09:16:10 UTC (rev 14872)
@@ -1,41 +1,10 @@
Description: link to vtk doc
Author: Mathieu Malaterre <malat at debian.org>
-Index: gdcm-2.2.2/Utilities/doxygen/vtk/CMakeLists.txt
+Index: gdcm-2.4.0/Utilities/doxygen/vtk/doxyfile.in
===================================================================
---- gdcm-2.2.2.orig/Utilities/doxygen/vtk/CMakeLists.txt 2013-03-14 16:08:34.000000000 +0100
-+++ gdcm-2.2.2/Utilities/doxygen/vtk/CMakeLists.txt 2013-03-15 10:17:07.000000000 +0100
-@@ -22,7 +22,7 @@
- SET (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag")
- ENDIF (INCLUDE_QT_DOCUMENTATION)
- SET(BUILD_DOXYGEN ON)
-- SET(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE ON)
-+ SET(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE OFF)
- SET(DOCUMENTATION_HTML_TARZ ON)
- SET(DOXYGEN_PROJECT_NAME "vtkgdcm")
- if(VTK_SOURCE_DIR)
-@@ -89,7 +89,7 @@
- GET_FILENAME_COMPONENT(DOT_PATH ${DOT} PATH)
- ENDIF(NOT DOT_PATH)
-
-- SET(TAGFILES "\"${CMAKE_CURRENT_BINARY_DIR}/vtkNightlyDoc.tag=http://www.vtk.org/doc/nightly/html\"")
-+ #SET(TAGFILES "\"${CMAKE_CURRENT_BINARY_DIR}/vtkNightlyDoc.tag=http://www.vtk.org/doc/nightly/html\"")
- IF(INCLUDE_QT_DOCUMENTATION)
- SET (TAGFILES "${TAGFILES} \"${QT_TAG_FILE}=http://doc.trolltech.com/4.2\"")
- ENDIF(INCLUDE_QT_DOCUMENTATION)
-@@ -103,7 +103,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY )
-
- ADD_CUSTOM_TARGET(${DOXYGEN_PROJECT_NAME}DoxygenDoc
-- #ALL
-+ ALL
- ${BASH}
- ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
-
-Index: gdcm-2.2.2/Utilities/doxygen/vtk/doxyfile.in
-===================================================================
---- gdcm-2.2.2.orig/Utilities/doxygen/vtk/doxyfile.in 2013-03-14 16:08:34.000000000 +0100
-+++ gdcm-2.2.2/Utilities/doxygen/vtk/doxyfile.in 2013-03-15 10:17:07.000000000 +0100
+--- gdcm-2.4.0.orig/Utilities/doxygen/vtk/doxyfile.in 2013-10-16 10:28:54.000000000 +0200
++++ gdcm-2.4.0/Utilities/doxygen/vtk/doxyfile.in 2013-10-17 11:11:45.650557236 +0200
@@ -23,6 +23,7 @@
HAVE_DOT = YES
#HAVE_DOT = NO
@@ -44,11 +13,11 @@
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
TEMPLATE_RELATIONS = YES
-Index: gdcm-2.2.2/Utilities/doxygen/doxyfile.in
+Index: gdcm-2.4.0/Utilities/doxygen/doxyfile.in
===================================================================
---- gdcm-2.2.2.orig/Utilities/doxygen/doxyfile.in 2013-03-14 16:08:34.000000000 +0100
-+++ gdcm-2.2.2/Utilities/doxygen/doxyfile.in 2013-03-15 10:17:07.000000000 +0100
-@@ -1590,7 +1590,7 @@
+--- gdcm-2.4.0.orig/Utilities/doxygen/doxyfile.in 2013-10-16 10:28:54.000000000 +0200
++++ gdcm-2.4.0/Utilities/doxygen/doxyfile.in 2013-10-17 11:11:45.650557236 +0200
+@@ -1591,7 +1591,7 @@
# generated by dot. Possible values are png, jpg, or gif
# If left blank png will be used.
@@ -57,3 +26,34 @@
# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
+Index: gdcm-2.4.0/Utilities/doxygen/vtk/CMakeLists.txt
+===================================================================
+--- gdcm-2.4.0.orig/Utilities/doxygen/vtk/CMakeLists.txt 2013-10-16 10:28:54.000000000 +0200
++++ gdcm-2.4.0/Utilities/doxygen/vtk/CMakeLists.txt 2013-10-17 11:13:11.374556089 +0200
+@@ -22,7 +22,7 @@
+ set (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag")
+ endif ()
+ set(BUILD_DOXYGEN ON)
+- set(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE ON)
++ set(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE OFF)
+ set(DOCUMENTATION_HTML_TARZ ON)
+ set(DOXYGEN_PROJECT_NAME "vtkgdcm")
+ if(VTK_SOURCE_DIR)
+@@ -89,7 +89,7 @@
+ get_filename_component(DOT_PATH ${DOT} PATH)
+ endif()
+
+- set(TAGFILES "\"${CMAKE_CURRENT_BINARY_DIR}/vtkNightlyDoc.tag=http://www.vtk.org/doc/nightly/html\"")
++ #set(TAGFILES "\"${CMAKE_CURRENT_BINARY_DIR}/vtkNightlyDoc.tag=http://www.vtk.org/doc/nightly/html\"")
+ if(INCLUDE_QT_DOCUMENTATION)
+ set (TAGFILES "${TAGFILES} \"${QT_TAG_FILE}=http://doc.trolltech.com/4.2\"")
+ endif()
+@@ -103,7 +103,7 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY )
+
+ add_custom_target(${DOXYGEN_PROJECT_NAME}DoxygenDoc
+- #ALL
++ ALL
+ ${BASH}
+ ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
+
Modified: trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch 2013-10-17 07:43:28 UTC (rev 14871)
+++ trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch 2013-10-17 09:16:10 UTC (rev 14872)
@@ -3,18 +3,18 @@
insource build since it break cpack source packaging
Author: Mathieu Malaterre <malat at debian.org>
-Index: gdcm-2.0.18/CMakeLists.txt
+Index: gdcm-2.4.0/CMakeLists.txt
===================================================================
---- gdcm-2.0.18.orig/CMakeLists.txt 2011-09-06 15:26:11.000000000 +0200
-+++ gdcm-2.0.18/CMakeLists.txt 2011-09-06 15:26:26.000000000 +0200
+--- gdcm-2.4.0.orig/CMakeLists.txt 2013-10-17 11:10:17.000000000 +0200
++++ gdcm-2.4.0/CMakeLists.txt 2013-10-17 11:10:55.978557903 +0200
@@ -31,8 +31,8 @@
- GET_FILENAME_COMPONENT(PARENTDIR ${GDCM_BINARY_DIR} PATH)
- STRING(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR)
- IF(INSOURCE OR INSOURCESUBDIR)
-- MESSAGE(FATAL_ERROR "GDCM requires an out of source Build. "
+ get_filename_component(PARENTDIR ${GDCM_BINARY_DIR} PATH)
+ string(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR)
+ if(INSOURCE OR INSOURCESUBDIR)
+- message(FATAL_ERROR "GDCM requires an out of source Build. "
- "Please create a separate binary directory and run CMake there.")
-+# MESSAGE(FATAL_ERROR "GDCM requires an out of source Build. "
-+# "Please create a separate binary directory and run CMake there.")
- ENDIF(INSOURCE OR INSOURCESUBDIR)
++ # message(FATAL_ERROR "GDCM requires an out of source Build. "
++ # "Please create a separate binary directory and run CMake there.")
+ endif()
- #-----------------------------------------------------------------------------
+ #----------------------------------------------------------------------------
More information about the debian-med-commit
mailing list