Control: tags 804568 + patch Control: tags 804568 + pending Dear maintainer,
I've prepared an NMU for cmtk (versioned as 3.2.2-1.4) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
The package also FTBFS in the current state, for 2 reasons, even.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: http://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for cmtk-3.2.2 cmtk-3.2.2
changelog | 16 ++++++++++++++++
control | 6 +++---
patches/dcmtk-3.6.1-compatibility | 30 ++++++++++++++++++++++++++++++
patches/fix_cmake_version_comparison | 29 +++++++++++++++++++++++++++++
patches/series | 2 ++
5 files changed, 80 insertions(+), 3 deletions(-)
diff -Nru cmtk-3.2.2/debian/changelog cmtk-3.2.2/debian/changelog
--- cmtk-3.2.2/debian/changelog 2014-12-20 08:14:19.000000000 +0000
+++ cmtk-3.2.2/debian/changelog 2016-01-16 03:31:17.000000000 +0000
@@ -1,3 +1,19 @@
+cmtk (3.2.2-1.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove alternate Build-Dependency on libtiff4-dev, that package doesn't
+ exist anymore.
+ * Remove alternate Build-Dependencies on libdcmtk1-dev and libdcmtk2-dev,
+ keeping only the unversioned libdcmtk-dev. Closes: #804568
+ * Move the upstream metadata file to debian/upstream/metadata.
+ * Add a patch (fix_cmake_version_comparison) to fix FTBFS with newer sqlite3
+ with a version that makes cmake's STRGREATER misbehave (use VERSION_GREATER
+ instead).
+ * Add a patch (dcmtk-3.6.1-compatibility) taken from Ubuntu taken from
+ upstream to fix FTBFS with newer dcmtk.
+
+ -- Mattia Rizzolo <mat...@debian.org> Sat, 16 Jan 2016 03:31:16 +0000
+
cmtk (3.2.2-1.3) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru cmtk-3.2.2/debian/control cmtk-3.2.2/debian/control
--- cmtk-3.2.2/debian/control 2014-09-21 09:31:19.000000000 +0000
+++ cmtk-3.2.2/debian/control 2016-01-16 03:02:01.000000000 +0000
@@ -8,15 +8,15 @@
libmxml-dev,
libsqlite3-dev,
zlib1g-dev | libz-dev,
- libdcmtk2-dev | libdcmtk1-dev | libdcmtk-dev,
+ libdcmtk-dev,
libbz2-dev,
libfftw3-dev,
liblzma-dev,
libqt4-dev, qt4-qmake,
libpng-dev,
- libtiff-dev | libtiff4-dev,
+ libtiff-dev,
libwrap0-dev,
- libcharls-dev | libdcmtk1-dev | libdcmtk2-dev (<< 3.6.0-8~),
+ libcharls-dev,
libxml2-dev,
libssl-dev,
xvfb, bc, dc,
diff -Nru cmtk-3.2.2/debian/patches/dcmtk-3.6.1-compatibility cmtk-3.2.2/debian/patches/dcmtk-3.6.1-compatibility
--- cmtk-3.2.2/debian/patches/dcmtk-3.6.1-compatibility 1970-01-01 00:00:00.000000000 +0000
+++ cmtk-3.2.2/debian/patches/dcmtk-3.6.1-compatibility 2016-01-16 03:25:32.000000000 +0000
@@ -0,0 +1,30 @@
+Description: Add back some missing defines removed from dcmtk
+Origin: http://www.nitrc.org/plugins/scmsvn/viewcvs.php/trunk/core/libs/IO/cmtkDICOM.cxx?root=cmtk&r1=5376&r2=5390
+Acked-By: Mattia Rizzolo <mat...@debian.org>
+Last-Update: 2016-01-16
+
+--- a/libs/IO/cmtkDICOM.cxx
++++ b/libs/IO/cmtkDICOM.cxx
+@@ -53,6 +53,22 @@
+ #include <stdio.h>
+ #include <ctime>
+
++#ifndef DCM_ACR_NEMA_ImagePosition
++# define DCM_ACR_NEMA_ImagePosition DcmTagKey(0x0020, 0x0030)
++#endif
++
++#ifndef DCM_ACR_NEMA_ImageOrientation
++# define DCM_ACR_NEMA_ImageOrientation DcmTagKey(0x0020, 0x0035)
++#endif
++
++#ifndef DCM_ACR_NEMA_Location
++# define DCM_ACR_NEMA_Location DcmTagKey(0x0020, 0x0050)
++#endif
++
++#ifndef DCM_ACR_NEMA_2C_VariablePixelData
++# define DCM_ACR_NEMA_2C_VariablePixelData DcmTagKey(0x7f00, 0x0010)
++#endif
++
+ namespace
+ cmtk
+ {
diff -Nru cmtk-3.2.2/debian/patches/fix_cmake_version_comparison cmtk-3.2.2/debian/patches/fix_cmake_version_comparison
--- cmtk-3.2.2/debian/patches/fix_cmake_version_comparison 1970-01-01 00:00:00.000000000 +0000
+++ cmtk-3.2.2/debian/patches/fix_cmake_version_comparison 2016-01-16 03:32:29.000000000 +0000
@@ -0,0 +1,29 @@
+Description: use cmake's VERSION_GREATER instead of STRGREATER when comparing lib versions…
+Author: Mattia Rizzolo <mat...@debian.org>
+Last-Update: 2016-01-16
+Forwarded: no
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -511,18 +511,18 @@
+ INCLUDE_DIRECTORIES(BEFORE ${SQLITE_INCLUDE_DIR})
+ ELSE(CMTK_BUILD_SQLITE)
+ INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMake/FindSQLite3.cmake)
+- IF(SQLITE3_FOUND AND SQLITE3_VERSION STRGREATER "3.5.0")
++ IF(SQLITE3_FOUND AND SQLITE3_VERSION VERSION_GREATER "3.5.0")
+ MESSAGE( STATUS "Using system sqlite3 library" )
+ SET(SQLITE_INCLUDE_DIR "${SQLITE3_INCLUDE_DIR}")
+ SET(CMTK_SQLITE_LIB ${SQLITE3_LIBRARIES} CACHE INTERNAL "")
+- ELSE(SQLITE3_FOUND AND SQLITE3_VERSION STRGREATER "3.5.0")
++ ELSE(SQLITE3_FOUND AND SQLITE3_VERSION VERSION_GREATER "3.5.0")
+ MESSAGE( STATUS "Building bundled sqlite3 library due to missing or outdated system library" )
+ SET(CMTK_BUILD_SQLITE 1)
+
+ SET(SQLITE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/sqlite3")
+ SET(CMTK_SQLITE_LIB "cmtksqlite3" CACHE INTERNAL "")
+ INCLUDE_DIRECTORIES(BEFORE ${SQLITE_INCLUDE_DIR})
+- ENDIF(SQLITE3_FOUND AND SQLITE3_VERSION STRGREATER "3.5.0")
++ ENDIF(SQLITE3_FOUND AND SQLITE3_VERSION VERSION_GREATER "3.5.0")
+ ENDIF(CMTK_BUILD_SQLITE)
+
+ # if we're using SQLite and building with test support, then we need the "sqlite3" tool.
diff -Nru cmtk-3.2.2/debian/patches/series cmtk-3.2.2/debian/patches/series
--- cmtk-3.2.2/debian/patches/series 2014-12-14 21:32:29.000000000 +0000
+++ cmtk-3.2.2/debian/patches/series 2016-01-16 03:20:54.000000000 +0000
@@ -1,2 +1,4 @@
up_assure_no_as_needed_for_checklibdep
fix-bashisms.patch
+fix_cmake_version_comparison
+dcmtk-3.6.1-compatibility
File /tmp/8zfWQaikR4/cmtk-3.2.2/debian/upstream is a regular file while file /tmp/28loLAOR1O/cmtk-3.2.2/debian/upstream is a directory
signature.asc
Description: PGP signature
