[SCM] BOINC packaging branch, master, updated. upstream/7.0.27+dfsg-434-g1bd7146

Steffen Moeller steffen_moeller at gmx.de
Tue May 8 09:29:03 UTC 2012


The following commit has been merged in the master branch:
commit 124c476cb5f04285fa044e1f3abd4bfc940e00ac
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Mon May 7 02:02:20 2012 +0200

    A missing "virtual" is not the culprit of menu defect

diff --git a/debian/changelog b/debian/changelog
index fe5973f..072d156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,9 @@
-boinc (7.0.27+dfsg-3) UNRELEASED; urgency=low
-
-  * Attempt to eliminate menu line issue
-
- -- Steffen Moeller <moeller at debian.org>  Mon, 07 May 2012 00:23:27 +0200
-
 boinc (7.0.27+dfsg-2) unstable; urgency=low
 
   * Removed a couple of patches to help preventing crash in some
     scientific apps
 
- -- Steffen Moeller <moeller at debian.org>  Sun, 06 May 2012 14:06:18 +0200
+ -- Steffen Moeller <moeller at debian.org>  Mon, 07 May 2012 23:39:30 +0200
 
 boinc (7.0.27+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index 1588de7..7eea816 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,12 +26,13 @@ cwd_handling.patch
 parse_issues.patch
 client_stream_realloc.patch
 # --- A
-#convinceDavid# MoreInformativeAppStartFailure.patch
+#convinceDavid#
+MoreInformativeAppStartFailure.patch
+#send to David#
 stream_memory_leak_fix.patch
 #SETIprobCandidate#app_ipc_uninitialised_A_reorder.patch
 #SETIprobCandidate#app_ipc_uninitialised_B_buffer.patch
 uninitialised_client_states.patch
-#convinceDavid# MainDocumentConst.patch
 MainDocumentWarnings.patch
 # --- B 
 #tmpA# add_init_to_client_state_constructor.patch
diff --git a/debian/patches/wxWidgets_observations.patch b/debian/patches/wxWidgets_observations.patch
index 652c48b..d306630 100644
--- a/debian/patches/wxWidgets_observations.patch
+++ b/debian/patches/wxWidgets_observations.patch
@@ -1,20 +1,7 @@
-Index: boinc/clientgui/BOINCGUIApp.cpp
-===================================================================
---- boinc.orig/clientgui/BOINCGUIApp.cpp	2012-04-29 16:07:21.000000000 +0200
-+++ boinc/clientgui/BOINCGUIApp.cpp	2012-04-29 16:14:32.000000000 +0200
-@@ -108,7 +108,7 @@
- #endif
- 
- 
--bool CBOINCGUIApp::OnInit() {
-+virtual bool CBOINCGUIApp::OnInit() {
-     // Initialize globals
- #ifdef SANDBOX
-     g_use_sandbox = true;
 Index: boinc/clientgui/BOINCGUIApp.h
 ===================================================================
---- boinc.orig/clientgui/BOINCGUIApp.h	2012-04-29 16:07:21.000000000 +0200
-+++ boinc/clientgui/BOINCGUIApp.h	2012-04-29 16:11:23.000000000 +0200
+--- boinc.orig/clientgui/BOINCGUIApp.h	2012-05-07 00:45:29.061521189 +0200
++++ boinc/clientgui/BOINCGUIApp.h	2012-05-07 00:46:34.000000000 +0200
 @@ -117,7 +117,7 @@
  
  public:

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list