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

[Frank S. Thomas]

Author: fst-guest
Date: 2006-04-28 23:54:32 +0000 (Fri, 28 Apr 2006)
New Revision: 413

Removed:
   trunk/boinc/debian/patches/02_wx2.6-configure.ac.dpatch
   trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
Modified:
   trunk/boinc/debian/changelog
   trunk/boinc/debian/patches/00list
Log:
Finally removed all wxWidgets patches, upstream has included them all.


Modified: trunk/boinc/debian/changelog
===================================================================
--- trunk/boinc/debian/changelog	2006-04-27 05:40:23 UTC (rev 412)
+++ trunk/boinc/debian/changelog	2006-04-28 23:54:32 UTC (rev 413)
@@ -1,13 +1,18 @@
-boinc (5.4.6-1) unstable; urgency=low
+boinc (5.4.7-1) unstable; urgency=low
 
   [ Frank S. Thomas ]
   * New upstream release.
     - Really fix the connection to a remote machine bug. (closes: #360143)
+    - Fix another FTBFS bug with G++ 4.1, thanks again to Martin Michlmayr.
+      (closes: #358650)
   * Removed watch file because upstream stopped providing nightly tarballs.
   * debian/control:
     - Bumped Standards-Version from 3.6.2 to 3.7.0, no changes required.
+  * debian/patches/:
+    - Removed 02_wx2.6-configure.ac.dpatch and 03_wx2.6-with-unicode.dpatch,
+      both were included upstream.
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Tue, 25 Apr 2006 16:18:11 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Fri, 28 Apr 2006 23:36:28 +0200
 
 boinc (5.4.3-1) unstable; urgency=low
 

Modified: trunk/boinc/debian/patches/00list
===================================================================
--- trunk/boinc/debian/patches/00list	2006-04-27 05:40:23 UTC (rev 412)
+++ trunk/boinc/debian/patches/00list	2006-04-28 23:54:32 UTC (rev 413)
@@ -1,4 +1,2 @@
-02_wx2.6-configure.ac.dpatch
-03_wx2.6-with-unicode.dpatch
 07_use-sensible-browser.dpatch
 10_exclude-sea.dpatch

Deleted: trunk/boinc/debian/patches/02_wx2.6-configure.ac.dpatch
===================================================================
--- trunk/boinc/debian/patches/02_wx2.6-configure.ac.dpatch	2006-04-27 05:40:23 UTC (rev 412)
+++ trunk/boinc/debian/patches/02_wx2.6-configure.ac.dpatch	2006-04-28 23:54:32 UTC (rev 413)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_wx2.6-configure.ac.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@
-
---- boinc-5.2.2a.orig/configure.ac	2005-10-17 22:09:53.000000000 +0200
-+++ boinc-5.2.2a/configure.ac	2005-10-19 13:54:05.000000000 +0200
-@@ -473,20 +473,10 @@
- AM_OPTIONS_WXCONFIG
- 
- dnl check for wxWidgets
--
--if test "${enable_client_release}" = yes ; then
--   echo 'Portable client-build: checking for  *static* wx-libs ...'
--    if test "${enable_debug}" = yes ; then
--        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=yes)
--    else
--        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=no)
--    fi
-+if test "${enable_debug}" = yes ; then
-+    AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=no --unicode=yes --debug=yes)
- else
--    if test "${enable_debug}" = yes ; then
--        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=yes)
--    else
--        AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=no)
--    fi
-+    AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=no --unicode=yes --debug=no)
- fi
- 
- 

Deleted: trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
===================================================================
--- trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch	2006-04-27 05:40:23 UTC (rev 412)
+++ trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch	2006-04-28 23:54:32 UTC (rev 413)
@@ -1,19 +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.1~/clientgui/BOINCGUIApp.cpp boinc-5.4.1/clientgui/BOINCGUIApp.cpp
---- boinc-5.4.1~/clientgui/BOINCGUIApp.cpp	2006-03-29 06:12:28.000000000 +0200
-+++ boinc-5.4.1/clientgui/BOINCGUIApp.cpp	2006-04-13 08:24:54.000000000 +0200
-@@ -847,7 +847,7 @@
-             RPC_CLIENT rpc;
-             if (!rpc.init("localhost")) {
-                 m_pDocument->m_pNetworkConnection->GetLocalPassword(strPassword);
--                rpc.authorize(strPassword.c_str());
-+                rpc.authorize((const char*)strPassword.mb_str());
-                 if (wxProcess::Exists(m_lBOINCCoreProcessId)) {
-                     rpc.quit();
-                     for (iCount = 0; iCount <= 10; iCount++) {