[SCM] BOINC packaging branch, master, updated. upstream/7.0.59+dfsg-683-g9e44e91

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 9e44e914d7bff85f9aa3b04290acd8a49364afcb
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Mar 28 23:41:47 2013 +0100

    New upstream release candidate. Patch refresh

diff --git a/debian/changelog b/debian/changelog
index a6c05cd..774ee4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (7.0.59+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * New debian/watch file for upstream git switch.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 28 Mar 2013 23:25:42 +0100
+
 boinc (7.0.58+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/Fix-arch-detection.patch b/debian/patches/Fix-arch-detection.patch
deleted file mode 100644
index 01d20a9..0000000
--- a/debian/patches/Fix-arch-detection.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/clientgui/DlgAbout.cpp
-+++ b/clientgui/DlgAbout.cpp
-@@ -78,12 +78,14 @@
-     m_AboutBOINCLogoCtrl = NULL;
-     m_AboutBOINCSloganCtrl = NULL;
-     m_AboutBOINCURLCtrl = NULL;
--#if defined(_WIN64) && defined(_M_X64)
-+#if defined(__x86_64__) || defined(__x86_64) || defined(_M_AMD64)
-     m_strVersion.Printf(wxT("%s (x64)"), wxT(BOINC_VERSION_STRING));
-+#elif defined(__i386__) || 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/fix-add-exclusive-app.patch b/debian/patches/fix-add-exclusive-app.patch
index 1385f49..779ad8c 100644
--- a/debian/patches/fix-add-exclusive-app.patch
+++ b/debian/patches/fix-add-exclusive-app.patch
@@ -8,7 +8,7 @@ Returns true if a file with this name exists and if this process has execute per
 
 --- a/clientgui/DlgAdvPreferences.cpp
 +++ b/clientgui/DlgAdvPreferences.cpp
-@@ -816,7 +816,7 @@
+@@ -819,7 +819,7 @@
  #endif
              wxString directory = picker.GetDirectory();
              wxFileName fn(directory, appNames[i]);
@@ -16,4 +16,4 @@ Returns true if a file with this name exists and if this process has execute per
 +            if (!fn.IsOk() /*|| !fn.IsFileExecutable()*/) {
                  errmsg.Printf(_("'%s' is not an executable application."), appNames[i].c_str());
                  wxGetApp().SafeMessageBox(errmsg, _("Add Exclusive App"),
-                             wxOK | wxICON_EXCLAMATION, this);
+                     wxOK | wxICON_EXCLAMATION, this
diff --git a/debian/patches/opendir_errno.patch b/debian/patches/opendir_errno.patch
index 7554d83..fe2bbed 100644
--- a/debian/patches/opendir_errno.patch
+++ b/debian/patches/opendir_errno.patch
@@ -5,7 +5,7 @@
  
  static int CheckNestedDirectories(
 -    char * basepath, int depth, 
-+    const char * const basepath, int depth, 
++    const char * const basepath, int depth,
      int use_sandbox, int isManager, 
 -    char * path_to_error
 +    const char * const path_to_error
diff --git a/debian/patches/series b/debian/patches/series
index 418d51d..388a761 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,4 +63,3 @@ zip_only_built_with_server.patch
 #fix-for-debian-bug-646583.patch
 hurd-ftbfs.patch
 disable_new_version_check.patch
-Fix-arch-detection.patch

-- 
BOINC packaging