[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-372-ga2a0fc3

Steffen Moeller moeller at debian.org
Sun Jan 22 12:39:40 UTC 2012


The following commit has been merged in the master branch:
commit a2a0fc35cd056386f9ba92f10d1ab3f6d14faad1
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jan 22 12:30:48 2012 +0100

    Eliminating compiler warning about shadowed i

diff --git a/debian/patches/redundant_i.patch b/debian/patches/redundant_i.patch
new file mode 100644
index 0000000..55256a7
--- /dev/null
+++ b/debian/patches/redundant_i.patch
@@ -0,0 +1,22 @@
+Index: boinc/clientgui/BOINCListCtrl.cpp
+===================================================================
+--- boinc.orig/clientgui/BOINCListCtrl.cpp	2011-03-17 18:51:03.000000000 +0100
++++ boinc/clientgui/BOINCListCtrl.cpp	2012-01-22 12:26:50.000000000 +0100
+@@ -267,7 +267,7 @@
+ 
+ void CBOINCListCtrl::DrawProgressBars()
+ {
+-    long topItem, numItems, numVisibleItems, i, row;
++    long topItem, numItems, numVisibleItems, row;
+     wxRect r, rr;
+     int w = 0, x = 0, xx, yy, ww;
+     int progressColumn = m_pParentView->GetProgressColumn();
+@@ -300,7 +300,7 @@
+         if (numItems <= (topItem + numVisibleItems)) numVisibleItems = numItems - topItem;
+ 
+         x = 0;
+-        for (i=0; i< progressColumn; i++) {
++        for (int i=0; i< progressColumn; i++) {
+             x += GetColumnWidth(i);
+         }
+         w = GetColumnWidth(progressColumn);
diff --git a/debian/patches/series b/debian/patches/series
index 8c11052..87aaba9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ stripchart_security.patch
 #evenMoreConst03.patch
 #andYetMorePatches04.patch
 #erase_while_1.patch
+redundant_i.patch

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list