[med-svn] r16573 - in trunk/packages/gdcm/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2014-04-07 09:27:09 +0000 (Mon, 07 Apr 2014)
New Revision: 16573

Removed:
   trunk/packages/gdcm/trunk/debian/patches/socket.patch
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/series
   trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch
   trunk/packages/gdcm/trunk/debian/rules
Log:
prepapre upload

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2014-04-06 05:53:10 UTC (rev 16572)
+++ trunk/packages/gdcm/trunk/debian/changelog	2014-04-07 09:27:09 UTC (rev 16573)
@@ -1,3 +1,12 @@
+gdcm (2.4.2-1) sid; urgency=low
+
+  * New upstream
+  * Remove piwiki footer. Fix lintian error privacy-breach-logo/piwik
+  * Remove patch applied upstream:
+    - d/p/socket.patch
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 07 Apr 2014 11:25:27 +0200
+
 gdcm (2.4.1-2) sid; urgency=low
 
   * Upload to sid

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2014-04-06 05:53:10 UTC (rev 16572)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2014-04-07 09:27:09 UTC (rev 16573)
@@ -1,4 +1,3 @@
 toplevelskip.patch
 fixhurd.patch
 linkvtkdoc.patch
-socket.patch

Deleted: trunk/packages/gdcm/trunk/debian/patches/socket.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/socket.patch	2014-04-06 05:53:10 UTC (rev 16572)
+++ trunk/packages/gdcm/trunk/debian/patches/socket.patch	2014-04-07 09:27:09 UTC (rev 16573)
@@ -1,17 +0,0 @@
-Index: gdcm-2.4.1/Applications/Cxx/CMakeLists.txt
-===================================================================
---- gdcm-2.4.1.orig/Applications/Cxx/CMakeLists.txt	2013-12-09 18:22:40.000000000 +0100
-+++ gdcm-2.4.1/Applications/Cxx/CMakeLists.txt	2013-12-10 10:16:19.000000000 +0100
-@@ -130,7 +130,11 @@
-   elseif(${exename} STREQUAL "gdcmxml")
-     target_link_libraries(${exename} ${LIBXML2_LIBRARIES})
-   elseif(${exename} STREQUAL "gdcmscu")
--    target_link_libraries(${exename} gdcmMEXD socketxx)
-+    if(NOT GDCM_USE_SYSTEM_SOCKETXX)
-+      target_link_libraries(${exename} gdcmMEXD socketxx)
-+    else()
-+      target_link_libraries(${exename} gdcmMEXD socket++)
-+    endif()
-   elseif(${exename} STREQUAL "gdcmstream")
-     target_link_libraries(${exename} ${GDCM_OPENJPEG_LIBRARIES})
-   elseif(${exename} STREQUAL "gdcminfo")

Modified: trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch	2014-04-06 05:53:10 UTC (rev 16572)
+++ trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch	2014-04-07 09:27:09 UTC (rev 16573)
@@ -3,11 +3,11 @@
  insource build since it break cpack source packaging
 Author: Mathieu Malaterre <malat at debian.org>
 
-Index: gdcm-2.4.0/CMakeLists.txt
+Index: gdcm-2.4.2/CMakeLists.txt
 ===================================================================
---- 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 @@
+--- gdcm-2.4.2.orig/CMakeLists.txt	2014-04-03 09:33:49.000000000 +0200
++++ gdcm-2.4.2/CMakeLists.txt	2014-04-07 11:19:28.000000000 +0200
+@@ -32,8 +32,8 @@
  get_filename_component(PARENTDIR ${GDCM_BINARY_DIR} PATH)
  string(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR)
  if(INSOURCE OR INSOURCESUBDIR)

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2014-04-06 05:53:10 UTC (rev 16572)
+++ trunk/packages/gdcm/trunk/debian/rules	2014-04-07 09:27:09 UTC (rev 16573)
@@ -42,7 +42,8 @@
 # Need to make sure to build using the same vtk/python version:
 CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_BUILD_TYPE:STRING=None \
-		-DGDCM_BUILD_APPLICATIONS=ON \
+		-DGDCM_DOXYGEN_NO_FOOTER:BOOL=ON \
+		-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
 		-DGDCM_DOCUMENTATION:BOOL=ON \
 		-DGDCM_VTK_DOCUMENTATION:BOOL=$(BUILDDOC) \
 		-DDOCUMENTATION_DOWNLOAD_VTK_TAGFILE:BOOL=OFF \
@@ -69,7 +70,7 @@
 		-DGDCM_USE_ACTIVIZ:BOOL=ON \
 		-DGDCM_USE_SYSTEM_PAPYRUS3:BOOL=ON \
 		-DGDCM_USE_SYSTEM_SOCKETXX:BOOL=ON \
-		-DPython_ADDITIONAL_VERSIONS=$(PYVER) \
+		-DPython_ADDITIONAL_VERSIONS:STRING=$(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/" \
 		-DGDCM_INSTALL_PYTHONMODULE_DIR:STRING=lib/python/dist-packages \