[med-svn] r7205 - in trunk/packages/clonalframe/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-06-30 20:32:26 +0000 (Thu, 30 Jun 2011)
New Revision: 7205

Added:
   trunk/packages/clonalframe/trunk/debian/patches/
   trunk/packages/clonalframe/trunk/debian/patches/01_gcc-4.6.patch
   trunk/packages/clonalframe/trunk/debian/patches/series
Modified:
   trunk/packages/clonalframe/trunk/debian/changelog
   trunk/packages/clonalframe/trunk/debian/compat
   trunk/packages/clonalframe/trunk/debian/control
   trunk/packages/clonalframe/trunk/debian/rules
Log:
Fix gcc-4.6 build issue


Modified: trunk/packages/clonalframe/trunk/debian/changelog
===================================================================
--- trunk/packages/clonalframe/trunk/debian/changelog	2011-06-30 17:52:37 UTC (rev 7204)
+++ trunk/packages/clonalframe/trunk/debian/changelog	2011-06-30 20:32:26 UTC (rev 7205)
@@ -1,3 +1,13 @@
+clonalframe (1.2-2) unstable; urgency=low
+
+  * Fix gcc-4.6 build issue (thanks to Sebastian Ramacher
+    <s.ramacher at gmx.at> for the patch)
+    Closes: #625120
+  * Standards-Version: 3.9.2 (no changes needed)
+  * Debhelper 8 (control+compat)
+
+ -- Andreas Tille <tille at debian.org>  Thu, 30 Jun 2011 21:09:59 +0200
+
 clonalframe (1.2-1) unstable; urgency=low
 
   * Initial release (Closes: #614657)

Modified: trunk/packages/clonalframe/trunk/debian/compat
===================================================================
--- trunk/packages/clonalframe/trunk/debian/compat	2011-06-30 17:52:37 UTC (rev 7204)
+++ trunk/packages/clonalframe/trunk/debian/compat	2011-06-30 20:32:26 UTC (rev 7205)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/clonalframe/trunk/debian/control
===================================================================
--- trunk/packages/clonalframe/trunk/debian/control	2011-06-30 17:52:37 UTC (rev 7204)
+++ trunk/packages/clonalframe/trunk/debian/control	2011-06-30 20:32:26 UTC (rev 7205)
@@ -4,8 +4,8 @@
 Maintainer:  Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7.1), qt4-qmake, libgsl0-dev, libqt4-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8), qt4-qmake, libgsl0-dev, libqt4-dev, quilt
+Standards-Version: 3.9.2
 Homepage: http://www.xavierdidelot.xtreemhost.com/clonalframe.htm
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/clonalframe/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/clonalframe/trunk/?rev=0&sc=0

Added: trunk/packages/clonalframe/trunk/debian/patches/01_gcc-4.6.patch
===================================================================
--- trunk/packages/clonalframe/trunk/debian/patches/01_gcc-4.6.patch	                        (rev 0)
+++ trunk/packages/clonalframe/trunk/debian/patches/01_gcc-4.6.patch	2011-06-30 20:32:26 UTC (rev 7205)
@@ -0,0 +1,27 @@
+Author: Sebastian Ramacher <s.ramacher at gmx.at>
+Description: Fix gcc-4.6 build issue
+Closes: #625120
+Date: Date: Thu, 30 Jun 2011 18:34:10 +0200
+
+--- clonalframe-1.2.orig/src/move_hidden.cpp
++++ clonalframe-1.2/src/move_hidden.cpp
+@@ -166,7 +166,8 @@
+                     sum+=gsl_matrix_get(f,j,i)*q[j][state][site-siteprev-1];
+                 gsl_matrix_set(f,state,i+1,sum*gsl_matrix_get(e,state,msgs[site]));
+             }
+-            Util::normalize(&(gsl_matrix_column(f,i+1).vector));
++            gsl_vector_view view = gsl_matrix_column(f,i+1);
++            Util::normalize(&view.vector);
+         }
+         return f;
+     }
+@@ -420,7 +421,8 @@
+                 gsl_matrix_set(e,i+1,2,(1.0-m2)*m3+(1.0-m3)*m2);
+             }
+ 
+-            Util::normalize(&(gsl_matrix_row(e,i+1).vector));
++            gsl_vector_view view = gsl_matrix_row(e,i+1);
++            Util::normalize(&view.vector);
+         }
+     }
+ 

Added: trunk/packages/clonalframe/trunk/debian/patches/series
===================================================================
--- trunk/packages/clonalframe/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/clonalframe/trunk/debian/patches/series	2011-06-30 20:32:26 UTC (rev 7205)
@@ -0,0 +1 @@
+01_gcc-4.6.patch

Modified: trunk/packages/clonalframe/trunk/debian/rules
===================================================================
--- trunk/packages/clonalframe/trunk/debian/rules	2011-06-30 17:52:37 UTC (rev 7204)
+++ trunk/packages/clonalframe/trunk/debian/rules	2011-06-30 20:32:26 UTC (rev 7205)
@@ -7,7 +7,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@ --with quilt
 
 override_dh_clean:
 	dh_clean