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

[smr at alioth.debian.org]

Author: smr
Date: 2008-12-06 23:56:10 +0000 (Sat, 06 Dec 2008)
New Revision: 2754

Removed:
   trunk/packages/gdcm/trunk/debian/patches/no-executable-properties.patch
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/patches/series
Log:
Remove no-executable-properties.patch: it is now applied upstream.

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2008-12-05 14:07:58 UTC (rev 2753)
+++ trunk/packages/gdcm/trunk/debian/changelog	2008-12-06 23:56:10 UTC (rev 2754)
@@ -1,11 +1,15 @@
-gdcm (2.0.10) unstable; urgency=low
+gdcm (2.0.10-1) unstable; urgency=low
 
-  * Non-maintainer upload.
+  [ Steve M. Robbins ]
+  * New upstream.
+    - patches/no-executable-properties.patch: Remove.  Applied upstream.
+
+  [ Mathieu Malaterre ]
   * Add csharp-wrapping
   * Use libopenjpeg-dev instead of gdcm internal one
   * Fix installation of jpeg headers files
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 05 Dec 2008 11:24:20 +0100
+ -- Steve M. Robbins <smr at debian.org>  Sat, 06 Dec 2008 17:51:47 -0600
 
 gdcm (2.0.9-1.1) unstable; urgency=low
 

Deleted: trunk/packages/gdcm/trunk/debian/patches/no-executable-properties.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/no-executable-properties.patch	2008-12-05 14:07:58 UTC (rev 2753)
+++ trunk/packages/gdcm/trunk/debian/patches/no-executable-properties.patch	2008-12-06 23:56:10 UTC (rev 2754)
@@ -1,48 +0,0 @@
-Author: "Steve M. Robbins" <steve at sumost.ca>
-Forwarded: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-
-Normally, gdcm appends the package version string (e.g. "-2.0") to all
-executables.  This patch creates a new booleanCMake variable
-GDCM_NO_EXECUTABLE_PROPERTIES.  If set to true, the package version
-suffix is suppressed.
-
-
---- gdcm-2.0.9.orig/CMakeLists.txt
-+++ gdcm-2.0.9/CMakeLists.txt
-@@ -54,6 +54,10 @@
-   VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}"
- )
- 
-+IF(GDCM_NO_EXECUTABLE_PROPERTIES)
-+  SET(GDCM_EXECUTABLE_PROPERTIES)
-+ENDIF(GDCM_NO_EXECUTABLE_PROPERTIES)
-+
- #-----------------------------------------------------------------------------
- INCLUDE(${GDCM_SOURCE_DIR}/CMake/UseCopyright.cmake)
- CREATE_COPYRIGHT_FILE(${CMAKE_CURRENT_BINARY_DIR}/Copyright.txt)
---- gdcm-2.0.9.orig/Applications/Cxx/CMakeLists.txt
-+++ gdcm-2.0.9/Applications/Cxx/CMakeLists.txt
-@@ -48,7 +48,9 @@
-   ADD_EXECUTABLE(${exename} ${exename}.cxx)
-   ENDIF(${exename} STREQUAL "gdcminfo")
-     TARGET_LINK_LIBRARIES(${exename} gdcmMSFF)
--  SET_TARGET_PROPERTIES(${exename} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
-+  IF(GDCM_EXECUTABLE_PROPERTIES)
-+    SET_TARGET_PROPERTIES(${exename} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
-+  ENDIF(GDCM_EXECUTABLE_PROPERTIES)
-   IF(WIN32 AND NOT CYGWIN)
-     TARGET_LINK_LIBRARIES(${exename} gdcmgetopt)
-   ENDIF(WIN32 AND NOT CYGWIN)
---- gdcm-2.0.9.orig/Utilities/VTK/Applications/CMakeLists.txt
-+++ gdcm-2.0.9/Utilities/VTK/Applications/CMakeLists.txt
-@@ -17,7 +17,9 @@
- 
- FOREACH(app ${GDCM_VTK_APPS})
-   ADD_EXECUTABLE(${app} ${app}.cxx)
--  SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
-+  IF(GDCM_EXECUTABLE_PROPERTIES)
-+    SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
-+  ENDIF(GDCM_EXECUTABLE_PROPERTIES)
-   TARGET_LINK_LIBRARIES(${app} vtkgdcm vtkRendering)
-   IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
-     TARGET_LINK_LIBRARIES(${app} vtkgdcm vtkWidgets)

Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	2008-12-05 14:07:58 UTC (rev 2753)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2008-12-06 23:56:10 UTC (rev 2754)
@@ -1 +0,0 @@
-no-executable-properties.patch