[SCM] BOINC packaging branch, master, updated. upstream/7.0.58+dfsg-680-g8d21122

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 8d21122c45b1c8a911ae0d71836e04717685eb9f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Mar 27 08:58:06 2013 +0100

    Fix arch detection and watch file after git-v2 upstream migration

diff --git a/debian/changelog b/debian/changelog
index 90a2b27..a6c05cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 boinc (7.0.58+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Fix arch detection in About dialog box.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 22 Mar 2013 17:47:31 +0100
 
diff --git a/debian/patches/Fix-arch-detection.patch b/debian/patches/Fix-arch-detection.patch
new file mode 100644
index 0000000..0dd93b0
--- /dev/null
+++ b/debian/patches/Fix-arch-detection.patch
@@ -0,0 +1,18 @@
+--- boinc-7.0.58+dfsg.orig/clientgui/DlgAbout.cpp
++++ boinc-7.0.58+dfsg/clientgui/DlgAbout.cpp
+@@ -80,10 +80,14 @@ bool CDlgAbout::Create(wxWindow* parent,
+     m_AboutBOINCURLCtrl = NULL;
+ #if defined(_WIN64) && defined(_M_X64)
+     m_strVersion.Printf(wxT("%s (x64)"), wxT(BOINC_VERSION_STRING));
++#elif defined(__x86_64__) || defined(_M_X64)
++    m_strVersion.Printf(wxT("%s (x64)"), wxT(BOINC_VERSION_STRING));
++#elif defined(__i386) || defined(_M_IX86)
++    m_strVersion.Printf(wxT("%s (x86)"), wxT(BOINC_VERSION_STRING));
+ #elif defined(__ppc__)
+     m_strVersion.Printf(wxT("%s (PowerPC)"), wxT(BOINC_VERSION_STRING));
+ #else
+-    m_strVersion.Printf(wxT("%s (x86)"), wxT(BOINC_VERSION_STRING));
++    m_strVersion.Printf(wxT("%s (unknown)"), wxT(BOINC_VERSION_STRING));
+ #endif
+     m_strWidgetsVersion.Printf(wxT("%d.%d.%d"), wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
+ ////@end CDlgAbout member initialisation
diff --git a/debian/patches/series b/debian/patches/series
index 388a761..418d51d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,3 +63,4 @@ zip_only_built_with_server.patch
 #fix-for-debian-bug-646583.patch
 hurd-ftbfs.patch
 disable_new_version_check.patch
+Fix-arch-detection.patch
diff --git a/debian/watch b/debian/watch
index 3faf84e..c58a918 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=uversionmangle=s/^(7_0_37)$/0.0.$1/,dversionmangle=s/\+dfsg$// \
-http://boinc.berkeley.edu/git/boinc.git/refs/tags/client_release_(\d.*)
-# Bart Martens <bartm at debian.org>  Tue, 05 Mar 2013 20:35:41 +0000
+opts=dversionmangle=s/\+dfsg$// \
+http://boinc.berkeley.edu/git/boinc-v2.git/refs/tags/client_release/7.0/(\d.*)

-- 
BOINC packaging