Author: malat-guest Date: 2012-03-20 12:47:20 +0000 (Tue, 20 Mar 2012) New Revision: 10027
Modified: trunk/packages/gdcm/trunk/debian/changelog trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch trunk/packages/gdcm/trunk/debian/rules Log: Fix regression introduced by cmake 2.8.7 Modified: trunk/packages/gdcm/trunk/debian/changelog =================================================================== --- trunk/packages/gdcm/trunk/debian/changelog 2012-03-19 13:15:44 UTC (rev 10026) +++ trunk/packages/gdcm/trunk/debian/changelog 2012-03-20 12:47:20 UTC (rev 10027) @@ -1,3 +1,11 @@ +gdcm (2.2.0-8) unstable; urgency=medium + + * Fix error introduced by new cmake 2.8.7 behavior for monolithic export file. + Closes: #664188 + * Yet another compilation fix for hurd-i386. + + -- Mathieu Malaterre <[email protected]> Tue, 20 Mar 2012 13:45:17 +0100 + gdcm (2.2.0-7) unstable; urgency=low * Another compilation fix for hurd-i386. Modified: trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2012-03-19 13:15:44 UTC (rev 10026) +++ trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2012-03-20 12:47:20 UTC (rev 10027) @@ -2,8 +2,8 @@ http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#GNU_specific_define_tt_ Index: gdcm-2.2.0/Source/Common/gdcmSystem.cxx =================================================================== ---- gdcm-2.2.0.orig/Source/Common/gdcmSystem.cxx 2012-02-02 13:39:38.000000000 +0100 -+++ gdcm-2.2.0/Source/Common/gdcmSystem.cxx 2012-02-02 13:40:29.000000000 +0100 +--- gdcm-2.2.0.orig/Source/Common/gdcmSystem.cxx 2011-12-30 16:37:28.000000000 +0100 ++++ gdcm-2.2.0/Source/Common/gdcmSystem.cxx 2012-03-06 10:29:27.000000000 +0100 @@ -363,6 +363,10 @@ return Rmdir(source) == 0; } @@ -17,8 +17,8 @@ { Index: gdcm-2.2.0/Source/DataDictionary/gdcmGlobal.cxx =================================================================== ---- gdcm-2.2.0.orig/Source/DataDictionary/gdcmGlobal.cxx 2012-02-02 16:40:05.000000000 +0100 -+++ gdcm-2.2.0/Source/DataDictionary/gdcmGlobal.cxx 2012-02-02 16:40:40.000000000 +0100 +--- gdcm-2.2.0.orig/Source/DataDictionary/gdcmGlobal.cxx 2011-12-30 16:37:28.000000000 +0100 ++++ gdcm-2.2.0/Source/DataDictionary/gdcmGlobal.cxx 2012-03-06 10:29:27.000000000 +0100 @@ -131,6 +131,10 @@ return true; } @@ -30,29 +30,17 @@ const char *Global::Locate(const char *resfile) const { #ifdef _WIN32 -Index: gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h +Index: gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx =================================================================== ---- gdcm-2.2.0.orig/Utilities/socketxx/socket++/sockstream.h 2012-02-02 21:58:30.000000000 +0100 -+++ gdcm-2.2.0/Utilities/socketxx/socket++/sockstream.h 2012-02-02 21:58:59.000000000 +0100 -@@ -165,7 +165,7 @@ - msg_peek = MSG_PEEK, - msg_dontroute = MSG_DONTROUTE - --#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) -+#if !(defined(__FreeBSD__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) - ,msg_maxiovlen = MSG_MAXIOVLEN +--- gdcm-2.2.0.orig/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2012-03-20 13:40:05.000000000 +0100 ++++ gdcm-2.2.0/Source/MessageExchangeDefinition/gdcmULConnectionInfo.cxx 2012-03-20 13:40:10.000000000 +0100 +@@ -35,9 +35,7 @@ + #include <arpa/inet.h> #endif - }; -Index: gdcm-2.2.0/Utilities/socketxx/socket++/local.h -=================================================================== ---- gdcm-2.2.0.orig/Utilities/socketxx/socket++/local.h 2012-02-02 21:59:35.000000000 +0100 -+++ gdcm-2.2.0/Utilities/socketxx/socket++/local.h 2012-02-02 21:59:53.000000000 +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: - // extern "C" int gethostname (char* hostname, int len); --#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) -+#if !(defined(__FreeBSD__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) - extern char* SYS_SIGLIST []; - #endif - #endif + +-#if defined (__APPLE__) + #include <arpa/inet.h> // inet_addr +-#endif + + namespace gdcm + { Modified: trunk/packages/gdcm/trunk/debian/rules =================================================================== --- trunk/packages/gdcm/trunk/debian/rules 2012-03-19 13:15:44 UTC (rev 10026) +++ trunk/packages/gdcm/trunk/debian/rules 2012-03-20 12:47:20 UTC (rev 10027) @@ -32,6 +32,7 @@ PYMODDIR := /usr/lib/$(shell pyversions -r) CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ -DGDCM_NO_EXECUTABLE_PROPERTIES=ON \ -DGDCM_BUILD_APPLICATIONS=ON \ -DGDCM_DOCUMENTATION:BOOL=ON \ @@ -63,6 +64,8 @@ dh_install --list-missing override_dh_auto_install: + # See #664188 + sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/gdcm-2.2/GDCMTargets-relwithdebinfo.cmake dh_auto_install mv debian/tmp/usr/lib/python debian/tmp/$(PYMODDIR) mv debian/tmp/usr/lib/_gdcmswig.so* debian/tmp/$(PYMODDIR)/dist-packages/ _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
