[med-svn] r20492 - trunk/packages/dcmtk/trunk/debian

[Gert Wollny]

Author: gert-guest
Date: 2015-11-12 12:31:45 +0000 (Thu, 12 Nov 2015)
New Revision: 20492

Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/control
Log:
Add conflict/replaces for libdcmtk4-dev

Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog	2015-11-12 10:16:51 UTC (rev 20491)
+++ trunk/packages/dcmtk/trunk/debian/changelog	2015-11-12 12:31:45 UTC (rev 20492)
@@ -1,3 +1,9 @@
+dcmtk (3.6.1~20150629-5) unstable; urgency=medium
+
+  * d/control: Add conflict/replace for libdcmtk4-dev 
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Thu, 12 Nov 2015 13:30:12 +0100
+
 dcmtk (3.6.1~20150629-4) unstable; urgency=medium
 
   * Add patch soversion_abi.patch to change not only the library file 

Modified: trunk/packages/dcmtk/trunk/debian/control
===================================================================
--- trunk/packages/dcmtk/trunk/debian/control	2015-11-12 10:16:51 UTC (rev 20491)
+++ trunk/packages/dcmtk/trunk/debian/control	2015-11-12 12:31:45 UTC (rev 20492)
@@ -63,9 +63,9 @@
 Depends: libdcmtk4v5 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: dcmtk-doc
-Conflicts: libdcmtk2-dev
+Conflicts: libdcmtk2-dev, libdcmtk4-dev 
 Provides: libdcmtk-dev
-Replaces: libdcmtk2-dev
+Replaces: libdcmtk2-dev, libdcmtk4-dev 
 Description: OFFIS DICOM toolkit development libraries and headers
  DCMTK includes a collection of libraries and applications for examining,
  constructing and converting DICOM image files, handling offline media,