[boinc] 01/03: Imported Upstream version 7.4.8+dfsg

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to annotated tag debian/7.4.8+dfsg-1
in repository boinc.

commit 40d3e28155cf3cfb12c0c2d37de8f39eabd7fd45
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Jun 28 12:34:46 2014 +0200

    Imported Upstream version 7.4.8+dfsg
---
 android/BOINC/AndroidManifest.xml |  4 ++--
 clientgui/sg_BoincSimpleFrame.cpp | 16 ++++++++++++++++
 configure.ac                      |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index 2f24e1c..1b230a0 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -20,8 +20,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="edu.berkeley.boinc"
     android:installLocation="internalOnly"
-    android:versionCode="82"
-    android:versionName="7.4.7" > <!-- installation on SD card would break boot receiver -->
+    android:versionCode="83"
+    android:versionName="7.4.8" > <!-- installation on SD card would break boot receiver -->
 
 
     <!-- Add Google Play store metadata informing the store we can run on tablets and other large screen devices -->
diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp
index 22aa497..9fceeae 100755
--- a/clientgui/sg_BoincSimpleFrame.cpp
+++ b/clientgui/sg_BoincSimpleFrame.cpp
@@ -127,6 +127,22 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
         strMenuDescription
     );
 
+    strMenuDescription.Printf(
+        _("Exit %s"),
+        pSkinAdvanced->GetApplicationName().c_str()
+    );
+
+    strMenuName.Printf(
+        _("Exit %s"),
+        pSkinAdvanced->GetApplicationName().c_str()
+    );
+
+    menuFile->Append(
+        wxID_EXIT,
+        strMenuName,
+        strMenuDescription
+    );
+
 #ifdef __WXMAC__
     menuFile->Append(
         wxID_PREFERENCES
diff --git a/configure.ac b/configure.ac
index 1f82c2e..44dcd1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
 AC_PREREQ(2.58)
 
 dnl Set the BOINC version here.  You can also use the set-version script.
-AC_INIT(BOINC, 7.4.7)
+AC_INIT(BOINC, 7.4.8)
 AC_CONFIG_MACRO_DIR([m4])
 LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
 AC_SUBST([LIBBOINC_VERSION])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git