[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-266-gaa6266b
Steffen Moeller
moeller at debian.org
Sat Jun 11 21:10:00 UTC 2011
The following commit has been merged in the master branch:
commit 2e8a0d846d5132fa1af8c079738cc37cab0babb3
Author: Steffen Moeller <moeller at debian.org>
Date: Sat Jun 11 18:54:13 2011 +0200
Upstream has adopted a series of patches of ours.
diff --git a/debian/changelog b/debian/changelog
index 3317e34..0f04f58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ boinc (6.12.32+dfsg-1) unstable; urgency=low
* New upstream version.
- finally contains MAXPATHLEN fixes for building on HURD
- - fewer warnings while compiling
+ - fewer warnings while compiling (some Debian patches
+ accepted)
* Initial preparations for merging with developments
for Debian and beyond at SZTAKI, Budapest.
* amd64 package now explicitly presents itself also
diff --git a/debian/patches/AdvancedFrame_const.patch b/debian/patches/AdvancedFrame_const.patch
deleted file mode 100644
index 3e2fe16..0000000
--- a/debian/patches/AdvancedFrame_const.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: boinc/clientgui/AdvancedFrame.cpp
-===================================================================
---- boinc.orig/clientgui/AdvancedFrame.cpp 2011-04-27 22:39:12.000000000 +0200
-+++ boinc/clientgui/AdvancedFrame.cpp 2011-04-27 22:45:42.000000000 +0200
-@@ -1492,14 +1492,14 @@
- int prog;
- #endif
- int argc = 3;
-- char* argv[3];
-+ char* const argv[3] = {
-+ const_cast<char *>("boincmgr"),
-+ const_cast<char *>("--multiple"),
-+ const_cast<char *>("")
-+ };
-
- wxString strExecutable = wxGetApp().GetRootDirectory() + wxGetApp().GetExecutableName();
-
-- argv[0] = "boincmgr";
-- argv[1] = "--multiple";
-- argv[2] = "";
--
- run_program(
- wxGetApp().GetRootDirectory().mb_str(),
- strExecutable.mb_str(),
-@@ -1508,6 +1508,7 @@
- 2.0,
- prog
- );
-+
- #else
- char s[512];
- unsigned char procName[256];
diff --git a/debian/patches/AvoidingBlanksInMakefiles.patch b/debian/patches/AvoidingBlanksInMakefiles.patch
index f9302e5..fa3e8c3 100644
--- a/debian/patches/AvoidingBlanksInMakefiles.patch
+++ b/debian/patches/AvoidingBlanksInMakefiles.patch
@@ -1,7 +1,7 @@
Index: boinc/Makefile.am
===================================================================
---- boinc.orig/Makefile.am 2011-06-04 19:41:50.000000000 +0200
-+++ boinc/Makefile.am 2011-06-04 19:49:16.000000000 +0200
+--- boinc.orig/Makefile.am 2011-06-10 10:39:29.000000000 +0200
++++ boinc/Makefile.am 2011-06-11 18:45:03.000000000 +0200
@@ -9,15 +9,15 @@
ACLOCAL_AMFLAGS = -I m4
@@ -39,8 +39,8 @@ Index: boinc/Makefile.am
# svn_version.h should always be rebuilt.
Index: boinc/Makefile.incl
===================================================================
---- boinc.orig/Makefile.incl 2011-06-04 19:41:37.000000000 +0200
-+++ boinc/Makefile.incl 2011-06-04 19:41:48.000000000 +0200
+--- boinc.orig/Makefile.incl 2011-06-10 10:39:29.000000000 +0200
++++ boinc/Makefile.incl 2011-06-11 18:45:03.000000000 +0200
@@ -18,13 +18,13 @@
AM_LIBTOOLFLAGS =
@@ -64,8 +64,8 @@ Index: boinc/Makefile.incl
AM_CFLAGS =
Index: boinc/api/Makefile.am
===================================================================
---- boinc.orig/api/Makefile.am 2011-06-04 19:48:05.000000000 +0200
-+++ boinc/api/Makefile.am 2011-06-04 19:48:16.000000000 +0200
+--- boinc.orig/api/Makefile.am 2011-06-10 10:39:30.000000000 +0200
++++ boinc/api/Makefile.am 2011-06-11 18:45:03.000000000 +0200
@@ -7,24 +7,24 @@
# stuff linked into both main app and graphics app
@@ -106,8 +106,8 @@ Index: boinc/api/Makefile.am
EXTRA_DIST = *.h
Index: boinc/client/Makefile.am
===================================================================
---- boinc.orig/client/Makefile.am 2011-06-04 19:46:27.000000000 +0200
-+++ boinc/client/Makefile.am 2011-06-04 19:47:01.000000000 +0200
+--- boinc.orig/client/Makefile.am 2011-06-10 10:39:30.000000000 +0200
++++ boinc/client/Makefile.am 2011-06-11 18:45:03.000000000 +0200
@@ -4,7 +4,7 @@
include $(top_srcdir)/Makefile.incl
@@ -243,8 +243,8 @@ Index: boinc/client/Makefile.am
+ win
Index: boinc/clientgui/Makefile.am
===================================================================
---- boinc.orig/clientgui/Makefile.am 2011-06-04 19:47:11.000000000 +0200
-+++ boinc/clientgui/Makefile.am 2011-06-04 19:48:40.000000000 +0200
+--- boinc.orig/clientgui/Makefile.am 2011-06-10 10:39:30.000000000 +0200
++++ boinc/clientgui/Makefile.am 2011-06-11 18:45:03.000000000 +0200
@@ -4,7 +4,7 @@
include $(top_srcdir)/Makefile.incl
@@ -458,8 +458,8 @@ Index: boinc/clientgui/Makefile.am
boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS)
Index: boinc/clientscr/Makefile.am
===================================================================
---- boinc.orig/clientscr/Makefile.am 2011-06-04 19:46:06.000000000 +0200
-+++ boinc/clientscr/Makefile.am 2011-06-04 19:46:17.000000000 +0200
+--- boinc.orig/clientscr/Makefile.am 2011-06-10 10:39:30.000000000 +0200
++++ boinc/clientscr/Makefile.am 2011-06-11 18:45:03.000000000 +0200
@@ -4,7 +4,7 @@
include $(top_srcdir)/Makefile.incl
@@ -480,8 +480,8 @@ Index: boinc/clientscr/Makefile.am
Index: boinc/doc/Makefile.am
===================================================================
---- boinc.orig/doc/Makefile.am 2011-06-04 19:44:51.000000000 +0200
-+++ boinc/doc/Makefile.am 2011-06-04 19:44:58.000000000 +0200
+--- boinc.orig/doc/Makefile.am 2011-06-10 10:39:30.000000000 +0200
++++ boinc/doc/Makefile.am 2011-06-11 18:45:03.000000000 +0200
@@ -4,7 +4,7 @@
include $(top_srcdir)/Makefile.incl
@@ -493,9 +493,9 @@ Index: boinc/doc/Makefile.am
SUBDIRS = $(MAYBE_MANPAGES)
Index: boinc/lib/Makefile.am
===================================================================
---- boinc.orig/lib/Makefile.am 2011-06-04 19:45:10.000000000 +0200
-+++ boinc/lib/Makefile.am 2011-06-04 19:45:54.000000000 +0200
-@@ -17,70 +17,70 @@
+--- boinc.orig/lib/Makefile.am 2011-06-11 18:04:00.000000000 +0200
++++ boinc/lib/Makefile.am 2011-06-11 18:46:12.000000000 +0200
+@@ -17,71 +17,71 @@
if ENABLE_LIBRARIES
libfcgi_sources = \
@@ -567,6 +567,7 @@ Index: boinc/lib/Makefile.am
notice.cpp \
- parse.cpp \
- prefs.cpp \
+- procinfo.cpp \
- procinfo_unix.cpp \
- proxy_info.cpp \
- shmem.cpp \
@@ -575,6 +576,7 @@ Index: boinc/lib/Makefile.am
- unix_util.cpp \
+ parse.cpp \
+ prefs.cpp \
++ procinfo.cpp \
+ procinfo_unix.cpp \
+ proxy_info.cpp \
+ shmem.cpp \
@@ -621,7 +623,7 @@ Index: boinc/lib/Makefile.am
else
mac_sources =
mac_headers =
-@@ -89,52 +89,52 @@
+@@ -90,52 +90,52 @@
if INSTALL_HEADERS
pkginclude_HEADERS = \
@@ -716,8 +718,8 @@ Index: boinc/lib/Makefile.am
libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
Index: boinc/sched/Makefile.am
===================================================================
---- boinc.orig/sched/Makefile.am 2011-06-04 19:43:43.000000000 +0200
-+++ boinc/sched/Makefile.am 2011-06-04 19:48:55.000000000 +0200
+--- boinc.orig/sched/Makefile.am 2011-06-10 10:39:30.000000000 +0200
++++ boinc/sched/Makefile.am 2011-06-11 18:45:03.000000000 +0200
@@ -9,16 +9,16 @@
if ENABLE_LIBRARIES
diff --git a/debian/patches/FlatBookStaticChar.patch b/debian/patches/FlatBookStaticChar.patch
deleted file mode 100644
index 548b031..0000000
--- a/debian/patches/FlatBookStaticChar.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Index: boinc/clientgui/common/wxFlatNotebookImages.h
-===================================================================
---- boinc.orig/clientgui/common/wxFlatNotebookImages.h 2011-04-27 22:39:13.000000000 +0200
-+++ boinc/clientgui/common/wxFlatNotebookImages.h 2011-04-27 22:45:42.000000000 +0200
-@@ -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/advanced_link_image_const.patch b/debian/patches/advanced_link_image_const.patch
deleted file mode 100644
index 84fbd9d..0000000
--- a/debian/patches/advanced_link_image_const.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: boinc/clientgui/res/skins/default/graphic/advanced_link_image.xpm
-===================================================================
---- boinc.orig/clientgui/res/skins/default/graphic/advanced_link_image.xpm 2011-04-27 22:39:12.000000000 +0200
-+++ boinc/clientgui/res/skins/default/graphic/advanced_link_image.xpm 2011-04-27 22:45:43.000000000 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char *advanced_link_image_xpm[] = {
-+static const char *advanced_link_image_xpm[] = {
- /* columns rows colors chars-per-pixel */
- "101 20 67 1",
- "o c Black",
diff --git a/debian/patches/file_upload_handler_permission.patch b/debian/patches/file_upload_handler_permission.patch
index f1f0ed3..e961f0c 100644
--- a/debian/patches/file_upload_handler_permission.patch
+++ b/debian/patches/file_upload_handler_permission.patch
@@ -1,6 +1,8 @@
Author: SZTAKI developers
Description: Files uploaded shall also be writable by the group
-Disclaimer: This patch aims at being adopted by upstream.
+Disclaimer: This patch aims at being adopted by upstream. It may
+ however be Debian-specific. Here, users are commonly created with
+ a group of the same name.
Index: boinc/sched/file_upload_handler.cpp
===================================================================
diff --git a/debian/patches/series b/debian/patches/series
index 3d2fb82..f37d49e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,8 +6,5 @@ texfont_removal.patch
Makefile_subdirs.patch
MakefileWrapper.patch
wrapperURL.patch
-FlatBookStaticChar.patch
csh2tcsh.patch
-AdvancedFrame_const.patch
-advanced_link_image_const.patch
file_upload_handler_permission.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list