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

[Steven Michael Robbins]

Author: smr
Date: 2013-09-18 00:45:48 +0000 (Wed, 18 Sep 2013)
New Revision: 14732

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Tweak build flags and architectures.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2013-09-17 17:46:06 UTC (rev 14731)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2013-09-18 00:45:48 UTC (rev 14732)
@@ -1,8 +1,9 @@
 insighttoolkit4 (4.4.2-2) unstable; urgency=low
 
-  * rules: configure without system libraries.
+  * control.in: Restrict to architectures amd64 and i386.
+  * rules: Configure with select system libraries.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 14 Sep 2013 08:45:02 -0500
+ -- Steve M. Robbins <smr at debian.org>  Tue, 17 Sep 2013 19:39:27 -0500
 
 insighttoolkit4 (4.4.2-1) unstable; urgency=low
 

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2013-09-17 17:46:06 UTC (rev 14731)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2013-09-18 00:45:48 UTC (rev 14732)
@@ -16,7 +16,7 @@
 
 Package: libinsighttoolkit4.4
 Section: libs
-Architecture: any
+Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Image processing toolkit for registration and segmentation - runtime
  ITK is an open-source software toolkit for performing registration and
@@ -33,7 +33,7 @@
 
 Package: libinsighttoolkit4-dev
 Section: libdevel
-Architecture: any
+Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit4.4 (= ${binary:Version}), libgdcm2-dev
 Recommends: libfftw3-dev, uuid-dev
 Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2013-09-17 17:46:06 UTC (rev 14731)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2013-09-18 00:45:48 UTC (rev 14732)
@@ -16,7 +16,7 @@
 
 Package: libinsighttoolkit at SOVERSION@
 Section: libs
-Architecture: any
+Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Image processing toolkit for registration and segmentation - runtime
  ITK is an open-source software toolkit for performing registration and
@@ -33,7 +33,7 @@
 
 Package: libinsighttoolkit at VER_MAJOR@-dev
 Section: libdevel
-Architecture: any
+Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit at SOVERSION@ (= ${binary:Version}), libgdcm2-dev
 Recommends: libfftw3-dev, uuid-dev
 Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2013-09-17 17:46:06 UTC (rev 14731)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2013-09-18 00:45:48 UTC (rev 14732)
@@ -24,11 +24,11 @@
 	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
 	-DITK_USE_SYSTEM_GDCM:BOOL=OFF \
 	-DITK_USE_SYSTEM_HDF5:BOOL=OFF \
-	-DITK_USE_SYSTEM_JPEG:BOOL=OFF \
-	-DITK_USE_SYSTEM_PNG:BOOL=OFF \
-	-DITK_USE_SYSTEM_TIFF:BOOL=OFF \
+	-DITK_USE_SYSTEM_JPEG:BOOL=ON \
+	-DITK_USE_SYSTEM_PNG:BOOL=ON \
+	-DITK_USE_SYSTEM_TIFF:BOOL=ON \
 	-DITK_USE_SYSTEM_VXL:BOOL=OFF \
-	-DITK_USE_SYSTEM_ZLIB:BOOL=OFF \
+	-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
 	-DModule_ITKIOPhilipsREC:BOOL=OFF \
 	-DModule_ITKLevelSetsv4Visualization:BOOL=OFF \
 	-DModule_ITKVideoBridgeOpenCV:BOOL=OFF \