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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 44190a5e7543a5f82fa50bb96b86e900d2c9b41f
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Nov 13 22:45:53 2011 +0100

    Upload of 6.13.12, post-compile warning fixes.

diff --git a/debian/changelog b/debian/changelog
index 6ac4f22..2edf297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
+boinc (6.13.12+dfsg-2) UNRELEASED; urgency=low
+
+  * Added explicit dependencies on x11-common and network-manager
+    for boot sequence, as indicated by
+    http://wiki.debian.org/LSBInitScripts
+
+ -- Steffen Moeller <moeller at debian.org>  Tue, 15 Nov 2011 22:06:19 +0100
+
 boinc (6.13.12+dfsg-1) unstable; urgency=low
 
   * New upstream version.
-  * Starting only at runlevel 4 and 5 (Closes: #820246), possibly.
+  * Starting only at runlevel 4 and 5 (lp: #820246), possibly.
   * Stopping also at runlevel 2 and 3
 
  -- Steffen Moeller <moeller at debian.org>  Sun, 13 Nov 2011 17:38:16 +0100
diff --git a/debian/patches/annoying_warning_const_image.patch b/debian/patches/annoying_warning_const_image.patch
new file mode 100644
index 0000000..8bd852b
--- /dev/null
+++ b/debian/patches/annoying_warning_const_image.patch
@@ -0,0 +1,33 @@
+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
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char *Linux_xpm[] = {
++static const char *Linux_xpm[] = {
+ /* columns rows colors chars-per-pixel */
+ "14 14 17 1",
+ ". 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
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char *MacOS_xpm[] = {
++static const char *MacOS_xpm[] = {
+ /* columns rows colors chars-per-pixel */
+ "14 14 14 1",
+ "= 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
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char *Win32_xpm[] = {
++static const char *Win32_xpm[] = {
+ /* columns rows colors chars-per-pixel */
+ "14 14 23 1",
+ "4 c #6CC0EE",
diff --git a/debian/patches/series b/debian/patches/series
index 1d303cb..1eba789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
 debian_debian_AdjustBoincTopdirPython.patch
 libnotify-0.7.patch
 stripchart_security.patch
+annoying_warning_const_image.patch

-- 
BOINC packaging