Bug#804568: cmtk: diff for NMU version 3.2.2-1.4
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi, >> Anyway, now you have a syncable package in Ubuntu (I already >> request a sync to a MOTU friend of mine) and a buildable package >> that will migrate to testing and as such will have chances to be >> in stretch. Sorry if I accidentally caused more troubles for you >> (did not knowing the full life and use cases of this package). > > no problem at all -- thanks for all your help! > syncpackage -f -V 3.2.2-1.4 -s mapreri cmtk syncpackage: Source cmtk -> xenial/Proposed: current version 3.2.2-1.3ubuntu2, new version 3.2.2-1.4 syncpackage: New changes: 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 Sat, 16 Jan 2016 03:31:16 + syncpackage: Sponsoring this sync for Mattia Rizzolo (mapreri) Sync this package [y|N]? y syncpackage: Request succeeded; you should get an e-mail once it is processed. cheers! Gianfranco -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCAAGBQJWmim2AAoJEPNPCXROn13ZN2wQAKtCO5vWvpEtU5EhoNqW8QnT DTPo1UB8a40DqASD7GcID5gX1Cy8OVTsDAKH5hJ7ARvZpOwMSox/68SJYRqZEAoN bxsrYUGfBusrfhhVwP3TieH0VkDoM/9j+TagjT0iWs3jctAkX/m08IJKoOsgmVYp vljjNtlI5ecBTiPzjOlybWYqBqas4GwArTd3zFu89+rHk50Vf8bidPhFRYqBCCLs gOqRmrtAlMePFt+oTTRdPeA1iFUaTlVga8Kuq4TmRjtYpwl/icFq1Y0DnQimTabz bwvr/gMZ2C5jLBSJzl74ZEfzJd/itScop6G7aIpjpXfsQqHXgx7R9+Noi2M9p9Xa eRZnyc/5r96FJZpZTVLnhuvRWTFS7pP+LCb5R/Amuh6mdusqHwKS7CImomkWxh/s U1JXVvei9pw0MAtGGJIzfae0l+PDzEaUlSYU4/YZtcgIaJ0ZOD7T+b41kwd1zHaQ HPuDE/f16oM+Wng9ubQ+K9fH2X7F239G4lyrZrrPDC5BCm/Uz3Mlx5fTqOE60QoX 4iD6hGWEgsbJRIdaI86C7ClQlxeQ1TUeHMjQNLJR7rmsW0Tcgibq//5H8ikmI/sP /pzc1EvVL49wCCLIFtCG9tw/BVt178yyqR6mnOtTwFEkipUu+yaBqLtEz1spHLdu sMz41TDG2DPl7XiUjNP0 =vrCc -END PGP SIGNATURE-
Bug#804568: cmtk: diff for NMU version 3.2.2-1.4
On Sat, 16 Jan 2016, Mattia Rizzolo wrote: > On Fri, Jan 15, 2016 at 10:51:09PM -0500, Yaroslav Halchenko wrote: > > > 2) I removed versioned development packages in favour of unversioned > > >ones. This should actually make *easier* backporting, as in all the > > >past debian releases there is a package providing, e.g. libdcmtk-dev, > > >even if at the time was different than the current one (now there is > > >libdcmtk5, in jessie there is libdcmtk2). > > so not all (at least not the ancient squeeze and wheezy... we do still > > build for wheezy) > umh, ok. > but libtiff-dev and libcharls-dev are both in wheezy ;) > Anyway, now you have a syncable package in Ubuntu (I already request a > sync to a MOTU friend of mine) and a buildable package that will migrate > to testing and as such will have chances to be in stretch. > Sorry if I accidentally caused more troubles for you (did not knowing > the full life and use cases of this package). no problem at all -- thanks for all your help! -- Yaroslav O. Halchenko Center for Open Neuroscience http://centerforopenneuroscience.org Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik
Bug#804568: cmtk: diff for NMU version 3.2.2-1.4
On Fri, Jan 15, 2016 at 10:51:09PM -0500, Yaroslav Halchenko wrote: > > 2) I removed versioned development packages in favour of unversioned > >ones. This should actually make *easier* backporting, as in all the > >past debian releases there is a package providing, e.g. libdcmtk-dev, > >even if at the time was different than the current one (now there is > >libdcmtk5, in jessie there is libdcmtk2). > > so not all (at least not the ancient squeeze and wheezy... we do still build > for wheezy) umh, ok. but libtiff-dev and libcharls-dev are both in wheezy ;) Anyway, now you have a syncable package in Ubuntu (I already request a sync to a MOTU friend of mine) and a buildable package that will migrate to testing and as such will have chances to be in stretch. Sorry if I accidentally caused more troubles for you (did not knowing the full life and use cases of this package). -- 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 `- signature.asc Description: PGP signature
Bug#804568: cmtk: diff for NMU version 3.2.2-1.4
On Sat, 16 Jan 2016, Mattia Rizzolo wrote: > On Fri, Jan 15, 2016 at 10:40:20PM -0500, Yaroslav Halchenko wrote: > > thanks!!! feel free to reupload without delay > oh, that was quick ;) > ok, I'll reschedule to 0-day, than. Thank you! > > when I get to that package though I will return alternative > > build-depends which are listed there so we could easily backport build > > this package on older debian/ubuntu releases: > > http://neuro.debian.net/pkgs/cmtk.html?highlight=cmtk > > see -- all are covered there ;) > umh, but the changes I did should really not affect backporting: > 1) alternative build depends are not considered by Debian's buildds, >only the first is used yeap -- but they are "considered" by pbuilder's satisfy-depends whenever leading one can't even be found (since likely to be not available on older releases) > 2) I removed versioned development packages in favour of unversioned >ones. This should actually make *easier* backporting, as in all the >past debian releases there is a package providing, e.g. libdcmtk-dev, >even if at the time was different than the current one (now there is >libdcmtk5, in jessie there is libdcmtk2). $> whohas -D Debian,Ubuntu --strict libdcmtk-dev Ubuntu libdcmtk-dev all http://packages.ubuntu.com/trusty/libdcmtk-dev Ubuntu libdcmtk-dev all http://packages.ubuntu.com/vivid/libdcmtk-dev Ubuntu libdcmtk-dev all http://packages.ubuntu.com/wily/libdcmtk-dev Ubuntu libdcmtk-dev3.6.1~20150629-5 693Kall http://packages.ubuntu.com/xenial/libdcmtk-dev Debian libdcmtk-dev all http://packages.debian.org/jessie/libdcmtk-dev Debian libdcmtk-dev all http://packages.debian.org/stretch/libdcmtk-dev Debian libdcmtk-dev3.6.1~20150924-4 807Kall http://packages.debian.org/sid/libdcmtk-dev so not all (at least not the ancient squeeze and wheezy... we do still build for wheezy) -- Yaroslav O. Halchenko Center for Open Neuroscience http://centerforopenneuroscience.org Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik
Bug#804568: cmtk: diff for NMU version 3.2.2-1.4
On Fri, Jan 15, 2016 at 10:40:20PM -0500, Yaroslav Halchenko wrote: > thanks!!! feel free to reupload without delay oh, that was quick ;) ok, I'll reschedule to 0-day, than. Thank you! > when I get to that package though I will return alternative > build-depends which are listed there so we could easily backport build > this package on older debian/ubuntu releases: > http://neuro.debian.net/pkgs/cmtk.html?highlight=cmtk > see -- all are covered there ;) umh, but the changes I did should really not affect backporting: 1) alternative build depends are not considered by Debian's buildds, only the first is used 2) I removed versioned development packages in favour of unversioned ones. This should actually make *easier* backporting, as in all the past debian releases there is a package providing, e.g. libdcmtk-dev, even if at the time was different than the current one (now there is libdcmtk5, in jessie there is libdcmtk2). -- 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 `- signature.asc Description: PGP signature
Bug#804568: cmtk: diff for NMU version 3.2.2-1.4
On Sat, 16 Jan 2016, Mattia Rizzolo wrote: > 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. thanks!!! feel free to reupload without delay when I get to that package though I will return alternative build-depends which are listed there so we could easily backport build this package on older debian/ubuntu releases: http://neuro.debian.net/pkgs/cmtk.html?highlight=cmtk see -- all are covered there ;) -- Yaroslav O. Halchenko Center for Open Neuroscience http://centerforopenneuroscience.org Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik
Bug#804568: cmtk: diff for NMU version 3.2.2-1.4
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.0 +
+++ cmtk-3.2.2/debian/changelog 2016-01-16 03:31:17.0 +
@@ -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 Sat, 16 Jan 2016 03:31:16 +
+
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.0 +
+++ cmtk-3.2.2/debian/control 2016-01-16 03:02:01.0 +
@@ -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.0 +
+++ cmtk-3.2.2/debian/patches/dcmtk-3.6.1-compatibility 2016-01-16 03:25:32.0 +
@@ -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
+Last-Update: 2016-01-16
+
+--- a/libs/IO/cmtkDICOM.cxx
b/libs/IO/cmtkDICOM.cxx
+@@ -53,6 +53,22 @@
+ #include
+ #include
+
++#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.0 +
+++ cmtk-3.2.2/debian/patches/fix_cmake_version_comparison 2016-01-16 03:32:29.0 +
@@ -0,0 +1,29 @@
+Description: use cmake's VERSION_GREATER instead of STRGREATER when comparing lib versions…
+Author: Mattia Rizzolo
+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
