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

[Steven Michael Robbins]

Author: smr
Date: 2012-06-10 04:14:14 +0000 (Sun, 10 Jun 2012)
New Revision: 11302

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:
Build using gcc 4.6.  Solves build failures with gcc 4.7.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2012-06-10 02:50:25 UTC (rev 11301)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2012-06-10 04:14:14 UTC (rev 11302)
@@ -8,10 +8,13 @@
 
   * patches/gcc4.7.patch: New.  Fixes for gcc 4.7 issues.
   
-  * rules: Do not use system fftw.
+  * rules: Do not use system fftw.  
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 03 Jun 2012 00:09:41 -0500
+  * control.in:
+  * rules: Build using gcc 4.6.
 
+ -- Steve M. Robbins <smr at debian.org>  Sat, 09 Jun 2012 23:12:22 -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-10 02:50:25 UTC (rev 11301)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2012-06-10 04:14:14 UTC (rev 11302)
@@ -5,7 +5,7 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Steve M. Robbins <smr at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8), gcc-4.6, g++-4.6,
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libvxl1-dev,
  libfftw3-dev,

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2012-06-10 02:50:25 UTC (rev 11301)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2012-06-10 04:14:14 UTC (rev 11302)
@@ -5,7 +5,7 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Steve M. Robbins <smr at debian.org>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8), gcc-4.6, g++-4.6,
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libvxl1-dev,
  libfftw3-dev,

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2012-06-10 02:50:25 UTC (rev 11301)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2012-06-10 04:14:14 UTC (rev 11302)
@@ -16,6 +16,8 @@
 # Module_ITKVtkGlue (https://issues.itk.org/jira/browse/ITK-2856)
 
 CMAKE_FLAGS = \
+	-DCMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-4.6 \
+	-DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-4.6 \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
 	-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \