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

[Mathieu Malaterre]

Author: malat
Date: 2013-12-05 11:55:04 +0000 (Thu, 05 Dec 2013)
New Revision: 15428

Removed:
   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
   trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
Prepare next upload

Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/changelog	2013-12-04 22:07:56 UTC (rev 15427)
+++ trunk/packages/dcmtk/branches/experimental/debian/changelog	2013-12-05 11:55:04 UTC (rev 15428)
@@ -1,10 +1,10 @@
-dcmtk (3.6.1~20131114-2) UNRELEASED; urgency=low
+dcmtk (3.6.1~20131114-2) experimental; urgency=low
 
   * Fix failing test (ofstd_markup_6). Closes: #730582
   * Remove some spelling error in man pages. Closes: #730635
   * Remove CMake overriding our compilation flags. Closes: #730636
 
- -- Mathieu Malaterre <malat at debian.org>  Wed, 27 Nov 2013 15:42:52 +0100
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 05 Dec 2013 12:50:28 +0100
 
 dcmtk (3.6.1~20131114-1) experimental; urgency=low
 

Deleted: trunk/packages/dcmtk/branches/experimental/debian/patches/iknowwhatiamdoing.patch
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/patches/iknowwhatiamdoing.patch	2013-12-04 22:07:56 UTC (rev 15427)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/iknowwhatiamdoing.patch	2013-12-05 11:55:04 UTC (rev 15428)
@@ -1,30 +0,0 @@
-Description: remove code that was overriding debian default compilation flags
- dcmtk upstream was forcing us to use -O3 and -DNDEBUG which is EBW !
- See thread at: http://bugs.debian.org/711515
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/730636
-
-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-12-04 22:07:56 UTC (rev 15427)
+++ trunk/packages/dcmtk/branches/experimental/debian/patches/series	2013-12-05 11:55:04 UTC (rev 15428)
@@ -7,5 +7,4 @@
 debian_iconv.patch
 spelling.patch
 ofstd_markup_6.patch
-iknowwhatiamdoing.patch
 warn_unused_result.patch

Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules	2013-12-04 22:07:56 UTC (rev 15427)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules	2013-12-05 11:55:04 UTC (rev 15428)
@@ -22,7 +22,7 @@
 
 # SKIP_RPATH=OFF to run test suite:
 # see #701231
-CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING="" \
+CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DBUILD_SHARED_LIBS:BOOL=ON \
  -DDCMTK_WITH_OPENSSL:BOOL=ON \
  -DDCMTK_WITH_PRIVATE_TAGS:BOOL=ON \