[SCM] BOINC packaging branch, master, updated. upstream/7.0.54+dfsg-672-g710f8e2
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Thu Mar 7 16:11:41 UTC 2013
The following commit has been merged in the master branch:
commit 710f8e2bf9158a3503cec9c022021b18765ac77b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Thu Mar 7 17:10:51 2013 +0100
New upstream release, dropped boincmgr_fix_long_pointers.patch
Added disable_new_version_check.patch fixing lp: #1140597
Thanks ChristianB (djangofett)
diff --git a/debian/changelog b/debian/changelog
index 2949833..c45a100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc (7.0.54+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Dropped boincmgr_fix_long_pointers.patch accepted upstream.
+ * New Patch disable_new_version_check.patch (lp: #1140597)
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Thu, 07 Mar 2013 17:06:38 +0100
+
boinc (7.0.53+dfsg-1) UNRELEASED; urgency=low
[ Gianfranco Costamagna ]
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index 492f808..b9cabb3 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
-@@ -1643,20 +1643,20 @@
+@@ -1640,20 +1640,20 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -31,7 +31,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1666,6 +1666,10 @@
+@@ -1663,6 +1663,10 @@
0,
id
);
diff --git a/debian/patches/boincmgr_fix_long_pointers.patch b/debian/patches/boincmgr_fix_long_pointers.patch
deleted file mode 100644
index d2250d9..0000000
--- a/debian/patches/boincmgr_fix_long_pointers.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From http://boinc.berkeley.edu/trac/ticket/1226
-
-Thanks Alyssa Milburn
-Closes bug 679207
---- a/clientgui/DlgOptions.cpp
-+++ b/clientgui/DlgOptions.cpp
-@@ -651,7 +651,7 @@
- CMainDocument* pDoc = wxGetApp().GetDocument();
- CBOINCBaseFrame* pFrame = wxGetApp().GetFrame();
- CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
-- int iBuffer = 0;
-+ long lBuffer = 0;
- wxString strBuffer = wxEmptyString;
-
-
-@@ -731,8 +731,8 @@
- pDoc->proxy_info.noproxy_hosts = (const char*)m_HTTPNoProxiesCtrl->GetValue().mb_str();
- }
- strBuffer = m_HTTPPortCtrl->GetValue();
-- strBuffer.ToLong((long*)&iBuffer);
-- pDoc->proxy_info.http_server_port = iBuffer;
-+ strBuffer.ToLong((long*)&lBuffer);
-+ pDoc->proxy_info.http_server_port = lBuffer;
-
- pDoc->proxy_info.use_socks_proxy = m_EnableSOCKSProxyCtrl->GetValue();
- pDoc->proxy_info.socks_server_name = (const char*)m_SOCKSAddressCtrl->GetValue().mb_str();
-@@ -742,8 +742,8 @@
- pDoc->proxy_info.noproxy_hosts = (const char*)m_SOCKSNoProxiesCtrl->GetValue().mb_str();
- }
- strBuffer = m_SOCKSPortCtrl->GetValue();
-- strBuffer.ToLong((long*)&iBuffer);
-- pDoc->proxy_info.socks_server_port = iBuffer;
-+ strBuffer.ToLong((long*)&lBuffer);
-+ pDoc->proxy_info.socks_server_port = lBuffer;
-
- pDoc->SetProxyConfiguration();
- }
---- a/clientgui/ProxyPage.cpp
-+++ b/clientgui/ProxyPage.cpp
-@@ -392,7 +392,7 @@
- void CErrProxyPage::OnPageChanging( wxWizardExEvent& event ) {
- CMainDocument* pDoc = wxGetApp().GetDocument();
- wxString strBuffer = wxEmptyString;
-- int iBuffer = 0;
-+ long lBuffer = 0;
-
- wxASSERT(pDoc);
- wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-@@ -405,8 +405,8 @@
- pDoc->proxy_info.http_user_passwd = (const char*)m_pProxyHTTPPasswordCtrl->GetValue().mb_str();
-
- strBuffer = m_pProxyHTTPPortCtrl->GetValue();
-- strBuffer.ToLong((long*)&iBuffer);
-- pDoc->proxy_info.http_server_port = iBuffer;
-+ strBuffer.ToLong((long*)&lBuffer);
-+ pDoc->proxy_info.http_server_port = lBuffer;
-
- pDoc->proxy_info.use_socks_proxy = (m_pProxySOCKSServerCtrl->GetValue().Length() > 0);
- pDoc->proxy_info.socks_server_name = (const char*)m_pProxySOCKSServerCtrl->GetValue().mb_str();
-@@ -414,8 +414,8 @@
- pDoc->proxy_info.socks5_user_passwd = (const char*)m_pProxySOCKSPasswordCtrl->GetValue().mb_str();
-
- strBuffer = m_pProxySOCKSPortCtrl->GetValue();
-- strBuffer.ToLong((long*)&iBuffer);
-- pDoc->proxy_info.socks_server_port = iBuffer;
-+ strBuffer.ToLong((long*)&lBuffer);
-+ pDoc->proxy_info.socks_server_port = lBuffer;
-
- pDoc->SetProxyConfiguration();
- }
---- a/clientgui/ViewProjects.cpp
-+++ b/clientgui/ViewProjects.cpp
-@@ -1187,16 +1187,19 @@
- wxInt32 CViewProjects::ConvertLinkToWebsiteIndex(const wxString& strLink, wxInt32& iProjectIndex, wxInt32& iWebsiteIndex) {
- wxString strTemplate = strLink;
- wxString strBuffer = wxEmptyString;
-+ long lProjectIndex, lWebsiteIndex;
-
- strTemplate.Replace(wxT("web:"), wxEmptyString);
-
- strBuffer = strTemplate;
- strBuffer.Remove(strBuffer.Find(wxT(":")));
-- strBuffer.ToLong((long*) &iProjectIndex);
-+ strBuffer.ToLong((long*) &lProjectIndex);
-+ iProjectIndex = lProjectIndex;
-
- strBuffer = strTemplate;
- strBuffer = strBuffer.Mid(strBuffer.Find(wxT(":")) + 1);
-- strBuffer.ToLong((long*) &iWebsiteIndex);
-+ strBuffer.ToLong((long*) &lWebsiteIndex);
-+ iWebsiteIndex = lWebsiteIndex;
-
- return 0;
- }
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
new file mode 100644
index 0000000..1748534
--- /dev/null
+++ b/debian/patches/disable_new_version_check.patch
@@ -0,0 +1,22 @@
+Description: Disable new version check in notices tab
+Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it
+ ChristianB
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1140597
+
+---
+
+Forwarded: not-needed
+Reviewed-By: costamagnagianfranco at yahoo.it
+Last-Update: <2013-03-07>
+
+--- boinc-7.0.54+dfsg.orig/client/client_state.cpp
++++ boinc-7.0.54+dfsg/client/client_state.cpp
+@@ -458,7 +458,7 @@ int CLIENT_STATE::init() {
+
+ // inform the user if there's a newer version of client
+ //
+- newer_version_startup_check();
++// newer_version_startup_check();
+
+ // parse account files again,
+ // now that we know the host's venue on each project
diff --git a/debian/patches/series b/debian/patches/series
index 00b608a..388a761 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,4 +62,4 @@ fix-add-exclusive-app.patch
zip_only_built_with_server.patch
#fix-for-debian-bug-646583.patch
hurd-ftbfs.patch
-boincmgr_fix_long_pointers.patch
+disable_new_version_check.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list