[pkg-boinc-commits] r457 - in trunk/boinc/debian: . patches

[Frank S. Thomas]

Author: fst-guest
Date: 2006-06-17 19:11:56 +0000 (Sat, 17 Jun 2006)
New Revision: 457

Removed:
   trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
Modified:
   trunk/boinc/debian/changelog
   trunk/boinc/debian/patches/00list
Log:
* Probably last commit before releasing 5.4.10-1.
* Removed wxwidgets patch, included upstream.


Modified: trunk/boinc/debian/changelog
===================================================================
--- trunk/boinc/debian/changelog	2006-06-13 16:21:45 UTC (rev 456)
+++ trunk/boinc/debian/changelog	2006-06-17 19:11:56 UTC (rev 457)
@@ -1,15 +1,13 @@
-boinc (5.4.9-2) unstable; urgency=low
+boinc (5.4.10-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-
   [ Frank S. Thomas ]
-  * debian/control:
+  * New upstream release.
+    - Display Account Manager names correctly in BOINC Manager. This fixes
+      Ubuntu bug #48246.
+  * debian/control: 
     - Really bumped the Standards-Version to 3.7.2.
   * Added the boinc_gl.h header to the boinc-dev package. This file is needed
     to compile SETI at home's graphics component.
-  * debian/patches/:
-    - Added new 03_wx2.6-with-unicode.dpatch to display the AM name correctly.
-      See also Ubuntu bug #48246.
   * Added a hint to use "update-alternatives --set x-www-browser [...]" to
     manually set the x-www-browser alternative to boinc-manager's
     README.Debian. See Ubuntu bug #48766 for more details.
@@ -24,7 +22,7 @@
     - Make sure that the group boinc exists before trying to create the user
       boinc. Thanks to Christoph Martin for the report. (closes: #372950)
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Tue, 13 Jun 2006 12:00:49 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat, 17 Jun 2006 21:09:15 +0200
 
 boinc (5.4.9-1) unstable; urgency=low
 

Modified: trunk/boinc/debian/patches/00list
===================================================================
--- trunk/boinc/debian/patches/00list	2006-06-13 16:21:45 UTC (rev 456)
+++ trunk/boinc/debian/patches/00list	2006-06-17 19:11:56 UTC (rev 457)
@@ -1,3 +1,2 @@
-03_wx2.6-with-unicode.dpatch
 07_use-sensible-browser.dpatch
 10_exclude-sea.dpatch

Deleted: trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
===================================================================
--- trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch	2006-06-13 16:21:45 UTC (rev 456)
+++ trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch	2006-06-17 19:11:56 UTC (rev 457)
@@ -1,65 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_wx2.6-with-unicode.dpatch by Frank S. Thomas <frank at thomas-alfeld.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad boinc-5.4.9~/clientgui/MainFrame.cpp boinc-5.4.9/clientgui/MainFrame.cpp
---- boinc-5.4.9~/clientgui/MainFrame.cpp	2006-05-02 20:17:44.000000000 +0200
-+++ boinc-5.4.9/clientgui/MainFrame.cpp	2006-06-11 12:45:37.000000000 +0200
-@@ -366,11 +366,11 @@
-     } else {
-         strMenuName.Printf(
-             _("&Synchronize with %s"), 
--            ami.acct_mgr_name.c_str()
-+            wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
-         );
-         strMenuDescription.Printf(
-             _("Get current settings from %s"), 
--            ami.acct_mgr_name.c_str()
-+            wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
-         );
-         menuTools->Append(
-             ID_TOOLSAMUPDATENOW, 
-@@ -448,7 +448,7 @@
-     if (is_acct_mgr_detected) {
-         strMenuName.Printf(
-             _("&Defect from %s"), 
--            ami.acct_mgr_name.c_str()
-+            wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
-         );
-         menuAdvanced->Append(
-             ID_ADVANCEDAMDEFECT, 
-@@ -1220,7 +1220,7 @@
- 
-         strTitle.Printf(
-             _("BOINC Manager - Detach from %s"), 
--            ami.acct_mgr_name.c_str()
-+            wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
-         );
-         strMessage.Printf(
-             _("If you defect from %s,\n"
-@@ -1228,8 +1228,8 @@
-               "but you'll have to manage projects manually.\n"
-               "\n"
-               "Do you want to defect from %s?"), 
--            ami.acct_mgr_name.c_str(),
--            ami.acct_mgr_name.c_str()
-+            wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str(),
-+            wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
-         );
- 
-         iAnswer = ::wxMessageBox(
-diff -urNad boinc-5.4.9~/clientgui/ViewTransfers.cpp boinc-5.4.9/clientgui/ViewTransfers.cpp
---- boinc-5.4.9~/clientgui/ViewTransfers.cpp	2006-04-18 02:49:47.000000000 +0200
-+++ boinc-5.4.9/clientgui/ViewTransfers.cpp	2006-06-11 12:49:00.000000000 +0200
-@@ -188,7 +188,7 @@
-         _("Are you sure you want to abort this file transfer '%s'?\n"
-           "NOTE: Aborting a transfer will invalidate a task and you\n"
-           "will not receive credit for it."), 
--        pDoc->file_transfer(m_pListPane->GetFirstSelected())->name.c_str()
-+        wxString(pDoc->file_transfer(m_pListPane->GetFirstSelected())->name.c_str(), wxConvUTF8).c_str()
-     );
- 
-     iAnswer = ::wxMessageBox(