[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-347-g96da082
Steffen Moeller
moeller at debian.org
Tue Dec 6 21:45:05 UTC 2011
The following commit has been merged in the master branch:
commit f6a23f908b6d209d79b0d1a56eccb27d67a7f699
Author: Steffen Moeller <moeller at debian.org>
Date: Fri Nov 25 21:17:25 2011 +0100
First patch submitted to upstream for "const" omissions.
diff --git a/debian/patches/annoying_warning_const_image.patch b/debian/patches/annoying_warning_const_image.patch
index 8bd852b..daf6c3f 100644
--- a/debian/patches/annoying_warning_const_image.patch
+++ b/debian/patches/annoying_warning_const_image.patch
@@ -1,7 +1,7 @@
Index: boinc/clientgui/res/linuxicon.xpm
===================================================================
---- boinc.orig/clientgui/res/linuxicon.xpm 2011-07-24 19:39:09.000000000 +0200
-+++ boinc/clientgui/res/linuxicon.xpm 2011-11-13 19:53:15.000000000 +0100
+--- boinc.orig/clientgui/res/linuxicon.xpm 2011-11-13 20:04:29.000000000 +0100
++++ boinc/clientgui/res/linuxicon.xpm 2011-11-13 22:51:17.000000000 +0100
@@ -1,5 +1,5 @@
/* XPM */
-static char *Linux_xpm[] = {
@@ -11,8 +11,8 @@ Index: boinc/clientgui/res/linuxicon.xpm
". c #8F8979",
Index: boinc/clientgui/res/macosicon.xpm
===================================================================
---- boinc.orig/clientgui/res/macosicon.xpm 2011-07-24 19:39:09.000000000 +0200
-+++ boinc/clientgui/res/macosicon.xpm 2011-11-13 19:54:13.000000000 +0100
+--- boinc.orig/clientgui/res/macosicon.xpm 2011-11-13 20:04:29.000000000 +0100
++++ boinc/clientgui/res/macosicon.xpm 2011-11-13 22:51:17.000000000 +0100
@@ -1,5 +1,5 @@
/* XPM */
-static char *MacOS_xpm[] = {
@@ -22,8 +22,8 @@ Index: boinc/clientgui/res/macosicon.xpm
"= c #295A9C",
Index: boinc/clientgui/res/windowsicon.xpm
===================================================================
---- boinc.orig/clientgui/res/windowsicon.xpm 2011-07-24 19:39:09.000000000 +0200
-+++ boinc/clientgui/res/windowsicon.xpm 2011-11-13 19:56:04.000000000 +0100
+--- boinc.orig/clientgui/res/windowsicon.xpm 2011-11-13 20:04:29.000000000 +0100
++++ boinc/clientgui/res/windowsicon.xpm 2011-11-13 22:51:17.000000000 +0100
@@ -1,5 +1,5 @@
/* XPM */
-static char *Win32_xpm[] = {
diff --git a/debian/patches/series b/debian/patches/series
index 1eba789..971e857 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@ debian_debian_AdjustBoincTopdirPython.patch
libnotify-0.7.patch
stripchart_security.patch
annoying_warning_const_image.patch
+AddSomeConstToMakeClearMemoryIsNotAllocated.patch
+AddingMoreConst.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list