[med-svn] [orthanc] 01/01: preparing for 1.1.0+dfsg-2

[Sebastien Jodogne]

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

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit 8d9cbc2f8b4c8d6395ad59cee45ba92adf39b447
Author: jodogne-guest <s.jodogne at gmail.com>
Date:   Fri Jul 8 15:43:42 2016 +0200

    preparing for 1.1.0+dfsg-2
---
 debian/changelog           |  9 ++++++++-
 debian/patches/cmake-dcmtk | 18 ++++++++++++++++++
 debian/patches/series      |  1 +
 debian/rules               |  1 -
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e6d3aa..fed4e8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-orthanc (1.1.0+dfsg-1) UNRELEASED; urgency=medium
+orthanc (1.1.0+dfsg-2) UNRELEASED; urgency=medium
+
+  [ Gianfranco Costamagna and Sebastien Jodogne ]
+  * Fix for cmake to find new versions of dcmtk. Closes: #829608
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Fri, 08 Jul 2016 15:42:10 +0200
+
+orthanc (1.1.0+dfsg-1) unstable; urgency=medium
 
   [ Sebastien Jodogne ]
   * New upstream version
diff --git a/debian/patches/cmake-dcmtk b/debian/patches/cmake-dcmtk
new file mode 100644
index 0000000..ba010f2
--- /dev/null
+++ b/debian/patches/cmake-dcmtk
@@ -0,0 +1,18 @@
+Description: Fix for cmake to find new versions of dcmtk
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.1.0/Resources/CMake/DcmtkConfiguration.cmake
+===================================================================
+--- Orthanc-1.1.0.orig/Resources/CMake/DcmtkConfiguration.cmake	2016-06-27 13:02:35.000000000 +0200
++++ Orthanc-1.1.0/Resources/CMake/DcmtkConfiguration.cmake	2016-07-08 15:29:05.748036168 +0200
+@@ -271,6 +271,9 @@
+       /usr/share/libdcmtk4
+       /usr/share/libdcmtk5
+       /usr/share/libdcmtk6
++      /usr/share/libdcmtk7
++      /usr/share/libdcmtk8
++      /usr/share/libdcmtk9
+       /usr/local/share/dcmtk
+       )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..2c63196 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cmake-dcmtk
diff --git a/debian/rules b/debian/rules
index 7a67d2f..ab256a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ CMAKE_EXTRA_FLAGS += \
 	-DUSE_GTEST_DEBIAN_SOURCE_PACKAGE:BOOL=ON \
 	-DDCMTK_LIBRARIES:STRING=dcmjpls \
 	-DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=OFF \
-	-DDCMTK_DICTIONARY_DIR:PATH=/usr/share/libdcmtk5 \
 	-DCMAKE_BUILD_TYPE=""
 
 override_dh_auto_configure:

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