[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-63-g3d5842b

[Guo Yixuan]

The following commit has been merged in the master branch:
commit 3d5842b51d319a06ecfdabbd40dccdb9ad8e9e11
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Fri Oct 12 22:35:48 2012 +0800

    Refreshed cppcheck_avoid_redundant_check.patch

diff --git a/debian/changelog b/debian/changelog
index 06b6295..b0bd415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 boinc (7.0.36+dfsg-2) UNRELEASED; urgency=low
 
   [ Guo Yixuan ]
-  * Removed some old patches (those not in series anymore).
-  * Removed the deprecated DMUA field from debian/control.
+  * debian/control: Removed the deprecated DMUA field.
+  * debian/patches:
+    - Removed some old patches (those not in series anymore).
+    - Refreshed cppcheck_avoid_redundant_check.patch.
 
   [ Gianfranco Costamagna ]
   * without boinclib_shared.patch boinc FTBFS, changed the order of patch
diff --git a/debian/patches/cppcheck_avoid_redundant_check.patch b/debian/patches/cppcheck_avoid_redundant_check.patch
index 4098234..f3aa932 100644
--- a/debian/patches/cppcheck_avoid_redundant_check.patch
+++ b/debian/patches/cppcheck_avoid_redundant_check.patch
@@ -1,8 +1,8 @@
 Index: boinc/api/gutil.cpp
 ===================================================================
---- boinc.orig/api/gutil.cpp	2012-09-01 19:32:35.497548789 +0200
-+++ boinc/api/gutil.cpp	2012-09-01 19:38:05.093079839 +0200
-@@ -767,15 +767,13 @@
+--- boinc.orig/api/gutil.cpp
++++ boinc/api/gutil.cpp
+@@ -737,15 +737,13 @@
  	gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->sizeX, pImage->sizeY, GL_RGB, GL_UNSIGNED_BYTE, pImage->data);
  	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
  	glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR);
@@ -25,8 +25,8 @@ Index: boinc/api/gutil.cpp
  
 Index: boinc/api/make_app_icon_h.cpp
 ===================================================================
---- boinc.orig/api/make_app_icon_h.cpp	2012-03-31 13:44:20.967194213 +0200
-+++ boinc/api/make_app_icon_h.cpp	2012-09-01 19:40:17.671280387 +0200
+--- boinc.orig/api/make_app_icon_h.cpp
++++ boinc/api/make_app_icon_h.cpp
 @@ -39,7 +39,7 @@
      }
      

-- 
BOINC packaging