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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit b539be46c08e169c48dc1423373d0b9e3f1721b6
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jan 3 01:02:25 2011 +0100

    addressing some more const char* bits

diff --git a/debian/patches/FlatBookStaticChar.patch b/debian/patches/FlatBookStaticChar.patch
new file mode 100644
index 0000000..f6ecf6c
--- /dev/null
+++ b/debian/patches/FlatBookStaticChar.patch
@@ -0,0 +1,130 @@
+Index: boinc/clientgui/common/wxFlatNotebookImages.h
+===================================================================
+--- boinc.orig/clientgui/common/wxFlatNotebookImages.h	2011-01-03 01:00:53.000000000 +0100
++++ boinc/clientgui/common/wxFlatNotebookImages.h	2011-01-03 01:01:48.000000000 +0100
+@@ -25,7 +25,7 @@
+ 	// Images used by the control
+ 	////////////////////////////////////////////////////////////
+ 	/* XPM */
+-	static char *left_arrow_disabled_xpm[] = {
++	static const char *left_arrow_disabled_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -57,7 +57,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *x_button_pressed_xpm[] = {
++	static const char *x_button_pressed_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -90,7 +90,7 @@
+ 
+ 
+ 	/* XPM */
+-	static char *left_arrow_xpm[] = {
++	static const char *left_arrow_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -122,7 +122,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *x_button_hilite_xpm[] = {
++	static const char *x_button_hilite_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -154,7 +154,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *x_button_xpm[] = {
++	static const char *x_button_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -186,7 +186,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *left_arrow_pressed_xpm[] = {
++	static const char *left_arrow_pressed_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -218,7 +218,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *left_arrow_hilite_xpm[] = {
++	static const char *left_arrow_hilite_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -250,7 +250,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *right_arrow_disabled_xpm[] = {
++	static const char *right_arrow_disabled_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -282,7 +282,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *right_arrow_hilite_xpm[] = {
++	static const char *right_arrow_hilite_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -314,7 +314,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *right_arrow_pressed_xpm[] = {
++	static const char *right_arrow_pressed_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -347,7 +347,7 @@
+ 
+ 
+ 	/* XPM */
+-	static char *right_arrow_xpm[] = {
++	static const char *right_arrow_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"    16    16        8            1",
+ 			/* colors */
+@@ -381,7 +381,7 @@
+ 	const int tab_x_size = 9;
+ 
+ 	/* XPM */
+-	static char *tab_x_button_pressed_xpm[] = {
++	static const char *tab_x_button_pressed_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"     9     9        8            1",
+ 			/* colors */
+@@ -406,7 +406,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *tab_x_button_xpm[] = {
++	static const char *tab_x_button_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"     9     9        8            1",
+ 			/* colors */
+@@ -431,7 +431,7 @@
+ 	};
+ 
+ 	/* XPM */
+-	static char *tab_x_button_hilite_xpm[] = {
++	static const char *tab_x_button_hilite_xpm[] = {
+ 		/* width height num_colors chars_per_pixel */
+ 		"     9     9        8            1",
+ 			/* colors */
diff --git a/debian/patches/series b/debian/patches/series
index 74323f9..d4b0456 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ texfont_removal.patch
 Makefile_subdirs.patch
 MakefileWrapper.patch
 wrapperURL.patch
+FlatBookStaticChar.patch

-- 
BOINC packaging