[med-svn] r15292 - in trunk/packages/dcmtk/branches/experimental/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2013-11-27 14:55:49 +0000 (Wed, 27 Nov 2013)
New Revision: 15292

Added:
   trunk/packages/dcmtk/branches/experimental/debian/patches/iknowwhatiamdoing.patch
Modified:
   trunk/packages/dcmtk/branches/experimental/debian/changelog
   trunk/packages/dcmtk/branches/experimental/debian/patches/series
Log:
Remove -O3 comp flags

Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog	2013-11-27 14:45:49 UTC (rev 15291)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog	2013-11-27 14:55:49 UTC (rev 15292)
@@ -2,6 +2,8 @@
 
   * Fix failing test (ofstd_markup_6). Closes: #730582
   * Remove some spelling error in man pages. Closes: #730635
+  * Remove CMake overriding our compilation flags
+    + d/p/iknowwhatiamdoing.patch
 
  -- Mathieu Malaterre <malat at debian.org>  Wed, 27 Nov 2013 15:42:52 +0100
 

Added: trunk/packages/dcmtk/branches/experimental/debian/patches/iknowwhatiamdoing.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/iknowwhatiamdoing.patch	                        (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/iknowwhatiamdoing.patch	2013-11-27 14:55:49 UTC (rev 15292)
@@ -0,0 +1,27 @@
+Description: remove code that was overriding debian default compilation flags
+ dcmtk upstream was forcing us to use -O3 and -NDEBUG which is EBW !
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: dcmtk-3.6.1~20131114/CMake/dcmtkPrepare.cmake
+===================================================================
+--- dcmtk-3.6.1~20131114.orig/CMake/dcmtkPrepare.cmake	2013-11-27 15:52:05.000000000 +0100
++++ dcmtk-3.6.1~20131114/CMake/dcmtkPrepare.cmake	2013-11-27 15:52:41.000000000 +0100
+@@ -19,12 +19,12 @@
+ # Debug and Release). It is empty for other generators and for those
+ # generators the build type is controlled at CMake time by CMAKE_BUILD_TYPE.
+ # http://www.cmake.org/pipermail/cmake/2006-January/008065.html
+-IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+-  MESSAGE(STATUS "Setting build type to 'Release' as none was specified.")
+-  SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+-  # Set the possible values of build type for cmake-gui
+-  SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+-ENDIF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
++#IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
++#  MESSAGE(STATUS "Setting build type to 'Release' as none was specified.")
++#  SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
++#  # Set the possible values of build type for cmake-gui
++#  SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
++#ENDIF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+ 
+ # Basic version information

Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/series	2013-11-27 14:45:49 UTC (rev 15291)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/series	2013-11-27 14:55:49 UTC (rev 15292)
@@ -7,3 +7,4 @@
 debian_iconv.patch
 spelling.patch
 ofstd_markup_6.patch
+iknowwhatiamdoing.patch