[med-svn] [dcmtk] 01/03: Update cmake file installation to prepare itk-4.9

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository dcmtk.

commit b8d56af7b07020c7264d70999e16db29de7c8ab7
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sat Jan 30 22:56:28 2016 +0100

    Update cmake file installation to prepare itk-4.9
---
 debian/changelog            | 8 ++++++++
 debian/control              | 2 +-
 debian/libdcmtk-dev.install | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8707ca..6d7571c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dcmtk (3.6.1~20150924-5) UNRELEASED; urgency=medium
+
+  * d/libdcmtk-dev revert last change since ITK-4.9 now supports
+    properly the dcmtk*.cmake files.
+  * d/control: conflict with older versions of libinsighttoolkit-dev
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Sat, 30 Jan 2016 22:52:38 +0100
+
 dcmtk (3.6.1~20150924-4) unstable; urgency=medium
 
   * Do not install DCMTK*.cmake files, they break things.
diff --git a/debian/control b/debian/control
index 5e913e9..855a9c2 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Depends: libxml2-dev,
          libdcmtk5 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: dcmtk-doc
-Conflicts: libdcmtk2-dev, libdcmtk4-dev 
+Conflicts: libdcmtk2-dev, libdcmtk4-dev, libinsighttoolkit4-dev (< 4.9.0)
 Provides: libdcmtk2-dev
 Replaces: libdcmtk2-dev, libdcmtk4-dev 
 Description: OFFIS DICOM toolkit development libraries and headers
diff --git a/debian/libdcmtk-dev.install b/debian/libdcmtk-dev.install
index 2c5ae4a..ec97f9e 100644
--- a/debian/libdcmtk-dev.install
+++ b/debian/libdcmtk-dev.install
@@ -1,2 +1,4 @@
 usr/include/dcmtk/*
-usr/lib/*.so
\ No newline at end of file
+usr/lib/*.so
+usr/lib/cmake/
+

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