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

[Frank S. Thomas]

Author: fst-guest
Date: 2006-06-03 21:40:18 +0000 (Sat, 03 Jun 2006)
New Revision: 447

Added:
   trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
Modified:
   trunk/boinc/debian/changelog
   trunk/boinc/debian/patches/00list
Log:
Display AM names correctly. This fixes Ubuntu bug #48246.


Modified: trunk/boinc/debian/changelog
===================================================================
--- trunk/boinc/debian/changelog	2006-05-28 15:37:07 UTC (rev 446)
+++ trunk/boinc/debian/changelog	2006-06-03 21:40:18 UTC (rev 447)
@@ -7,8 +7,11 @@
     - 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.
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 17 May 2006 00:13:46 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat,  3 Jun 2006 23:34:13 +0200
 
 boinc (5.4.9-1) unstable; urgency=low
 

Modified: trunk/boinc/debian/patches/00list
===================================================================
--- trunk/boinc/debian/patches/00list	2006-05-28 15:37:07 UTC (rev 446)
+++ trunk/boinc/debian/patches/00list	2006-06-03 21:40:18 UTC (rev 447)
@@ -1,2 +1,3 @@
+03_wx2.6-with-unicode.dpatch
 07_use-sensible-browser.dpatch
 10_exclude-sea.dpatch

Added: trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
===================================================================
--- trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch	2006-05-28 15:37:07 UTC (rev 446)
+++ trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch	2006-06-03 21:40:18 UTC (rev 447)
@@ -0,0 +1,33 @@
+#! /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-06-03 23:21:46.000000000 +0200
++++ boinc-5.4.9/clientgui/MainFrame.cpp	2006-06-03 23:24:41.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, 


Property changes on: trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
___________________________________________________________________
Name: svn:executable
   + *