[SCM] BOINC packaging branch, master, updated. upstream/7.0.48+dfsg-648-gb9b0962

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit b9b096246793c018b74e96dbd1349e88dd4e10bf
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Feb 8 15:43:12 2013 +0100

    New upstream release, patch refresh

diff --git a/debian/changelog b/debian/changelog
index dfb1a48..029e7ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,26 @@
+boinc (7.0.48+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 08 Feb 2013 15:42:50 +0100
+
 boinc (7.0.47+dfsg-1) UNRELEASED; urgency=low
 
-  * New upstream release, l10n updated
-  * Adding path to some files (Closes: #646583 lp: #347651)
+  * New upstream release, l10n updated.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Thu, 31 Jan 2013 22:09:35 +0100
 
 boinc (7.0.46+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * Fixed a FTBFS when building without zip library (Closes: #699789)
+  * Fixed a FTBFS when building without zip library. (Closes: #699789)
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 29 Jan 2013 23:46:33 +0100
 
 boinc (7.0.45+dfsg-1) experimental; urgency=low
 
   * New upstream release
-  * Removed boinc zip library from client builds
+  * Removed boinc zip library from client builds.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 25 Jan 2013 00:01:24 +0100
 
@@ -37,7 +42,7 @@ boinc (7.0.44+dfsg-1) UNRELEASED; urgency=low
 boinc (7.0.42+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * Revised some patches
+  * Revised some patches.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 12 Dec 2012 01:53:09 +0100
 
@@ -47,7 +52,7 @@ boinc (7.0.40+dfsg-1) UNRELEASED; urgency=low
   * Dropped mac_addresses_cores_in_kfreebsd.patch (file to patch deleted upstream)
     and ensure_there_is_no_newline_in_passwd.patch (applied upstream)
   * Revised slot_dir_source_trace.patch
-  * Removed some old patches
+  * Removed some old patches.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 08 Dec 2012 01:26:23 +0100
 
@@ -56,7 +61,7 @@ boinc (7.0.39+dfsg-1) UNRELEASED; urgency=low
   * New upstram release
   * Dropped add-missing-test-files.patch and add-missing-stripchart-samples.patch patch
     already applied upstream
-  * Added link time optimisation
+  * Added link time optimisation.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 26 Nov 2012 00:11:23 +0100
 
@@ -65,7 +70,7 @@ boinc (7.0.38+dfsg-1) UNRELEASED; urgency=low
   * New upstream release
   * Revised some patches (some of them should will be removed in a future commit)
   * Added add-missing-test-files.patch to fix a FTBFS 
-  * Added add-missing-stripchart-samples.patch to fix another FTBFS
+  * Added add-missing-stripchart-samples.patch to fix another FTBFS.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 05 Nov 2012 13:16:32 +0100
 
diff --git a/debian/patches/fix-add-exclusive-app.patch b/debian/patches/fix-add-exclusive-app.patch
index 47a18cf..c966833 100644
--- a/debian/patches/fix-add-exclusive-app.patch
+++ b/debian/patches/fix-add-exclusive-app.patch
@@ -17,7 +17,7 @@ Returns true if a file with this name exists and if this process has execute per
                              wxFD_OPEN|wxFD_FILE_MUST_EXIST|wxFD_CHANGE_DIR|wxFD_MULTIPLE|wxFD_CHANGE_DIR);
  #endif
          if (picker.ShowModal() != wxID_OK) return;
-@@ -816,7 +816,7 @@ void CDlgAdvPreferences::OnAddExclusiveA
+@@ -816,7 +816,7 @@
  #endif
              wxString directory = picker.GetDirectory();
              wxFileName fn(directory, appNames[i]);
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index 480d09c..93e7ce5 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -311,9 +311,9 @@
      boinc_getcwd(path);
      if (strlen(relname)) {
          strcat(path, "/");
-@@ -771,7 +771,7 @@
- // get total and free space on current filesystem (in bytes)
- //
+@@ -769,7 +769,7 @@
+ }
+ 
  #if defined(_WIN32) && !(defined(WXDEBUG) || defined(WXNDEBUG))
 -int boinc_allocate_file(const char* path, double size) {
 +int boinc_allocate_file(const char* const path, double size) {
diff --git a/debian/patches/zip_only_built_with_server.patch b/debian/patches/zip_only_built_with_server.patch
index 533c809..0cda03c 100644
--- a/debian/patches/zip_only_built_with_server.patch
+++ b/debian/patches/zip_only_built_with_server.patch
@@ -1,7 +1,5 @@
-Index: boinc_debian/Makefile.am
-===================================================================
---- boinc_debian.orig/Makefile.am
-+++ boinc_debian/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -9,7 +9,10 @@
  ACLOCAL_AMFLAGS = -I m4
  

-- 
BOINC packaging