[med-svn] r10530 - in trunk/packages/plink/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-04-23 06:54:21 +0000 (Mon, 23 Apr 2012)
New Revision: 10530

Added:
   trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch
Modified:
   trunk/packages/plink/trunk/debian/changelog
   trunk/packages/plink/trunk/debian/patches/series
Log:
Fix nested declaration which fails in gcc-4.7


Modified: trunk/packages/plink/trunk/debian/changelog
===================================================================
--- trunk/packages/plink/trunk/debian/changelog	2012-04-22 23:58:30 UTC (rev 10529)
+++ trunk/packages/plink/trunk/debian/changelog	2012-04-23 06:54:21 UTC (rev 10530)
@@ -11,6 +11,11 @@
   * debian/copyright: Rewritten to match DEP5 and verified using
      cme fix dpkg-copyright
   * debian/rules: Rewritten to use short dh
+  * debian/patches/gcc-4.7.patch: Fix nested declaration
+    Thanks for the hints on debian-mentors list to
+    Rodolfo García Peñas <kix at kix.es>, Dmitry Nezhevenko <dion at inhex.net>,
+    Fernando Lemos <fernandotcl at gmail.com
+    Closes: 667325
 
  -- Andreas Tille <tille at debian.org>  Sun, 22 Apr 2012 18:55:34 +0200
 

Added: trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch
===================================================================
--- trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch	                        (rev 0)
+++ trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch	2012-04-23 06:54:21 UTC (rev 10530)
@@ -0,0 +1,26 @@
+Author: Rodolfo García Peñas <kix at kix.es>, Dmitry Nezhevenko <dion at inhex.net>, Fernando Lemos <fernandotcl at gmail.com
+Date: Sun, 22 Apr 2012 23:37:53 +0300
+Bug-Closed: http://bugs.debian.org/667325
+Description: Fix nested declaration which fails in gcc-4.7
+ For more detailed explanation see
+   http://lists.debian.org/debian-mentors/2012/04/msg00410.html
+ and the other mails in this thread
+
+--- plink-1.07-src.orig/sets.cpp
++++ plink-1.07-src/sets.cpp
+@@ -768,11 +768,11 @@
+       //////////////////////////////////////////////
+       // Reset original missing status
+ 
+-      vector<Individual*>::iterator i = PP->sample.begin();
+-      while ( i != PP->sample.end() )
++      vector<Individual*>::iterator i_iter = PP->sample.begin();
++      while ( i_iter != PP->sample.end() )
+ 	{
+-	  (*i)->missing = (*i)->flag;
+-	  ++i;
++	  (*i_iter)->missing = (*i_iter)->flag;
++	  ++i_iter;
+ 	}
+ 
+       ////////////////////////////////////////////////

Modified: trunk/packages/plink/trunk/debian/patches/series
===================================================================
--- trunk/packages/plink/trunk/debian/patches/series	2012-04-22 23:58:30 UTC (rev 10529)
+++ trunk/packages/plink/trunk/debian/patches/series	2012-04-23 06:54:21 UTC (rev 10530)
@@ -1 +1,2 @@
 30_endiandetection.patch
+gcc-4.7.patch