[SCM] BOINC packaging branch, master, updated. upstream/7.0.28+dfsg-466-gccb7118

Guo Yixuan culu.gyx at gmail.com
Wed May 30 15:19:34 UTC 2012


The following commit has been merged in the master branch:
commit 7bde97b291cbfcd060d3c7822543a4f1855e6fa4
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Wed May 30 18:01:56 2012 +0800

    Add patch from Rom that fix project category crash

diff --git a/debian/changelog b/debian/changelog
index 8b03405..8c575ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 boinc (7.0.28+dfsg-3) UNRELEASED; urgency=low
 
+  [ Steffen Moeller ]
   * Splitting -dev package into libboinc and libboinc-dev.
   * Added shared library for libboinc.
   * Added configure flag in debian/rules to allow dynamic clients
   * Installing more from  debian/tmp to avoid lintian wrappers
  
+  [ Guo Yixuan ]
+  * Add patch from Rom that fix the project category crash. (Closes: #641593)
+
  -- Steffen Moeller <moeller at debian.org>  Mon, 28 May 2012 13:21:35 +0200
 
 boinc (7.0.28+dfsg-2) UNRELEASED; urgency=low
diff --git a/debian/patches/boinc_manager_project_info_page.patch b/debian/patches/boinc_manager_project_info_page.patch
new file mode 100644
index 0000000..7ae8ebb
--- /dev/null
+++ b/debian/patches/boinc_manager_project_info_page.patch
@@ -0,0 +1,23 @@
+Author: Rom Walton <romw at romwnet.org>
+Bug-Debian: http://bugs.debian.org/641593
+
+Index: boinc/clientgui/ProjectInfoPage.cpp
+===================================================================
+--- boinc.orig/clientgui/ProjectInfoPage.cpp	2012-05-30 23:05:52.000000000 +0800
++++ boinc/clientgui/ProjectInfoPage.cpp	2012-05-30 23:05:55.000000000 +0800
+@@ -488,6 +488,7 @@
+ void CProjectInfoPage::OnProjectSelected( wxCommandEvent& WXUNUSED(event) ) {
+     wxLogTrace(wxT("Function Start/End"), wxT("CProjectInfoPage::OnProjectSelected - Function Begin"));
+ 
++    if (m_pProjectsCtrl->GetSelection() != wxNOT_FOUND) {
+     CProjectInfo* pProjectInfo = (CProjectInfo*)m_pProjectsCtrl->GetClientData(m_pProjectsCtrl->GetSelection());
+ 
+     wxString strURL = pProjectInfo->m_strURL;
+@@ -539,6 +540,7 @@
+     // Set tooltip to full text in case ellipsed
+     m_pProjectDetailsOrganizationCtrl->SetToolTip(pProjectInfo->m_strOrganization);
+ 
++    }
+     wxLogTrace(wxT("Function Start/End"), wxT("CProjectInfoPage::OnProjectSelected - Function End"));
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6db116e..055389d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,3 +59,4 @@ screen_saver_boinc_extra.patch
 #socklenBuildFixByDavid.patch
 boinclib_shared.patch
 dynamic_libboinc.patch
+boinc_manager_project_info_page.patch

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list