[med-svn] r9494 - trunk/packages/insighttoolkit/branches/3.20.1/debian

[Steven Michael Robbins]

Author: smr
Date: 2012-01-31 02:41:22 +0000 (Tue, 31 Jan 2012)
New Revision: 9494

Modified:
   trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
   trunk/packages/insighttoolkit/branches/3.20.1/debian/control
   trunk/packages/insighttoolkit/branches/3.20.1/debian/control.in
   trunk/packages/insighttoolkit/branches/3.20.1/debian/rules
Log:
Revert to using ITK copy of VXL.

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2012-01-29 09:23:35 UTC (rev 9493)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog	2012-01-31 02:41:22 UTC (rev 9494)
@@ -1,3 +1,11 @@
+insighttoolkit (3.20.1-4) unstable; urgency=low
+
+  * Revert to using ITK copy of VXL.  Closes: #657943.  The change to
+    system VXL needs to be coordinated since it means libraries such as
+    libitkvnl_algo are no longer present, breaking dependent packages.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 29 Jan 2012 22:13:32 -0600
+
 insighttoolkit (3.20.1-3) unstable; urgency=low
 
   * control.in: libinsighttoolkit3-dev depends on libvxl1-dev.  Resolves

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/control
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/control	2012-01-29 09:23:35 UTC (rev 9493)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/control	2012-01-31 02:41:22 UTC (rev 9494)
@@ -7,7 +7,7 @@
 Uploaders: Steve M. Robbins <smr at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Build-Depends: debhelper (>= 8),
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
- zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev, libvxl1-dev,
+ zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev,
  libfftw3-dev,
  uuid-dev, libgdcm2-dev,
  libvtk5-dev, python-vtk
@@ -35,7 +35,7 @@
 Package: libinsighttoolkit3-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libinsighttoolkit3.20 (= ${binary:Version}), libgdcm2-dev, libvxl1-dev
+Depends: ${misc:Depends}, libinsighttoolkit3.20 (= ${binary:Version}), libgdcm2-dev
 Recommends: libfftw3-dev, uuid-dev
 Conflicts: libinsighttoolkit-dev
 Replaces: libinsighttoolkit-dev

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/control.in	2012-01-29 09:23:35 UTC (rev 9493)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/control.in	2012-01-31 02:41:22 UTC (rev 9494)
@@ -7,7 +7,7 @@
 Uploaders: Steve M. Robbins <smr at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Build-Depends: debhelper (>= 8),
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
- zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev, libvxl1-dev,
+ zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev,
  libfftw3-dev,
  uuid-dev, libgdcm2-dev,
  libvtk5-dev, python-vtk
@@ -35,7 +35,7 @@
 Package: libinsighttoolkit at VER_MAJOR@-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libinsighttoolkit at SOVERSION@ (= ${binary:Version}), libgdcm2-dev, libvxl1-dev
+Depends: ${misc:Depends}, libinsighttoolkit at SOVERSION@ (= ${binary:Version}), libgdcm2-dev
 Recommends: libfftw3-dev, uuid-dev
 Conflicts: libinsighttoolkit-dev
 Replaces: libinsighttoolkit-dev

Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/branches/3.20.1/debian/rules	2012-01-29 09:23:35 UTC (rev 9493)
+++ trunk/packages/insighttoolkit/branches/3.20.1/debian/rules	2012-01-31 02:41:22 UTC (rev 9494)
@@ -21,7 +21,7 @@
 	-DITK_USE_SYSTEM_PNG:BOOL=ON \
 	-DITK_USE_SYSTEM_TIFF:BOOL=ON \
 	-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
-	-DITK_USE_SYSTEM_VXL:BOOL=ON \
+	-DITK_USE_SYSTEM_VXL:BOOL=OFF \
 	-DUSE_FFTWD:BOOL=ON \
 	-DUSE_FFTWF:BOOL=ON \
 	-DITK_USE_CONCEPT_CHECKING:BOOL=ON \