[med-svn] [dcmtkpp] 02/02: Fix #804570

[Julien Lamy]

This is an automated email from the git hooks/post-receive script.

lamy-guest pushed a commit to branch master
in repository dcmtkpp.

commit b943246ad0f439402ccd87ef04f6d2284c96b94e
Author: Julien Lamy <lamy at unistra.fr>
Date:   Tue Nov 17 16:52:12 2015 +0100

    Fix #804570
---
 debian/changelog            | 10 ++++++++--
 debian/control              |  2 +-
 debian/patches/804570.patch | 14 ++++++++++++++
 debian/patches/series       |  1 +
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6818897..7a81366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-dcmtkpp (0.3.1-1) UNRELEASED; urgency=medium
+dcmtkpp (0.3.1-2) UNRELEASED; urgency=medium
+
+  * build-depend on libdcmtk (Closes: #804570)
+
+ -- Julien Lamy <lamy at unistra.fr>  Tue, 17 Nov 2015 16:38:57 +0100
+
+dcmtkpp (0.3.1-1ubuntu1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Julien Lamy <lamy at unistra.fr>  Thu, 08 Oct 2015 16:21:24 +0200
+ -- Julien Lamy <lamy at unistra.fr>  Tue, 17 Nov 2015 16:38:32 +0100
 
 dcmtkpp (0.2.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7f15e18..90b9158 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9),
                d-shlibs,
                cmake,
                libjsoncpp-dev,
-               libdcmtk2-dev,
+               libdcmtk-dev | libdcmtk2-dev,
                libicu-dev (>= 4.8.1.1),
                zlib1g-dev,
                uuid-dev,
diff --git a/debian/patches/804570.patch b/debian/patches/804570.patch
new file mode 100644
index 0000000..6dda455
--- /dev/null
+++ b/debian/patches/804570.patch
@@ -0,0 +1,14 @@
+Subject: Fix library SONAME
+Author: Julien Lamy <lamy at unistra.fr>
+Forwarded: https://github.com/lamyj/dcmtkpp/commit/0a7b8b9eb65be99b20b08f3b1b51b96da2dbcdf5
+--- a/tests/code/Exception.cpp
++++ b/tests/code/Exception.cpp
+@@ -31,6 +31,6 @@ BOOST_AUTO_TEST_CASE(ConditionConstructor)
+ {
+     dcmtkpp::Exception const exception(EC_IllegalParameter);
+     BOOST_CHECK_EQUAL(exception.get_source(), dcmtkpp::Exception::Source::Condition);
+-    BOOST_CHECK_EQUAL(exception.what(), EC_IllegalParameter.text());
++    BOOST_CHECK_EQUAL(exception.what(), OFCondition(EC_IllegalParameter).text());
+     BOOST_CHECK(exception.get_condition() == EC_IllegalParameter);
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 9ddbfa5..cbb7140 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-tests-boost1.56.patch
+804570.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtkpp.git