[med-svn] r11170 - trunk/packages/insighttoolkit/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2012-06-02 21:28:26 +0000 (Sat, 02 Jun 2012)
New Revision: 11170

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
Log:
Dev package conflicts with libinsighttoolkit3-dev.


Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2012-06-02 20:54:46 UTC (rev 11169)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2012-06-02 21:28:26 UTC (rev 11170)
@@ -1,3 +1,10 @@
+insighttoolkit4 (4.1.0-2) experimental; urgency=low
+
+  * control.in: Dev package conflicts with libinsighttoolkit3-dev.
+    Closes: #670609.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 02 Jun 2012 16:27:27 -0500
+
 insighttoolkit4 (4.1.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2012-06-02 20:54:46 UTC (rev 11169)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2012-06-02 21:28:26 UTC (rev 11170)
@@ -37,7 +37,7 @@
 Architecture: any
 Depends: ${misc:Depends}, libinsighttoolkit4.1 (= ${binary:Version}), libgdcm2-dev
 Recommends: libfftw3-dev, uuid-dev
-Conflicts: libinsighttoolkit-dev
+Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev
 Replaces: libinsighttoolkit-dev
 Suggests: insighttoolkit4-examples
 Description: Image processing toolkit for registration and segmentation - development

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2012-06-02 20:54:46 UTC (rev 11169)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2012-06-02 21:28:26 UTC (rev 11170)
@@ -8,7 +8,7 @@
 Build-Depends: debhelper (>= 8),
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libvxl1-dev,
- libfftw3-dev, libgeotiff-dev,
+ libfftw3-dev,
  uuid-dev, libgdcm2-dev, libminc-dev, libhdf5-dev,
  libvtk5-dev, python-vtk
 Standards-Version: 3.9.2
@@ -37,7 +37,7 @@
 Architecture: any
 Depends: ${misc:Depends}, libinsighttoolkit at SOVERSION@ (= ${binary:Version}), libgdcm2-dev
 Recommends: libfftw3-dev, uuid-dev
-Conflicts: libinsighttoolkit-dev
+Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev
 Replaces: libinsighttoolkit-dev
 Suggests: insighttoolkit at VER_MAJOR@-examples
 Description: Image processing toolkit for registration and segmentation - development