[SCM] BOINC packaging branch, master, updated. debian/7.1.10+dfsg-1-8-g800603c

Gianfranco Costamagna costamagnagianfranco at yahoo.it
Wed Jun 19 17:12:06 UTC 2013 

The following commit has been merged in the master branch:
commit 800603cb58a2e49561423186819dec980adf8a58
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jun 19 19:06:26 2013 +0200

    Fixed binaries

diff --git a/debian/changelog b/debian/changelog
index e16338d..2e81c17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.1.18+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 19 Jun 2013 19:09:48 +0200
+
 boinc (7.1.10+dfsg-2) UNRELEASED; urgency=low
 
   * Experimenting with memory-only shared-memory
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index f866898..e26e22b 100644
--- a/debian/patches/investigate_boinc_api.patch
+++ b/debian/patches/investigate_boinc_api.patch
@@ -1,6 +1,6 @@
 --- a/api/boinc_api.cpp
 +++ b/api/boinc_api.cpp
-@@ -353,7 +353,7 @@
+@@ -354,7 +354,7 @@
  
      if (standalone) return true;
  
@@ -9,7 +9,7 @@
          "<current_cpu_time>%e</current_cpu_time>\n"
          "<checkpoint_cpu_time>%e</checkpoint_cpu_time>\n",
          cpu_t, cp_cpu_t
-@@ -632,6 +632,10 @@
+@@ -633,6 +633,10 @@
  }
  
  int boinc_get_status(BOINC_STATUS *s) {
@@ -20,7 +20,7 @@
      s->no_heartbeat = boinc_status.no_heartbeat;
      s->suspended = boinc_status.suspended;
      s->quit_request = boinc_status.quit_request;
-@@ -808,7 +812,7 @@
+@@ -809,7 +813,7 @@
  int boinc_parse_init_data_file() {
      FILE* f;
      int retval;
@@ -29,7 +29,7 @@
  
      if (aid.project_preferences) {
          free(aid.project_preferences);
-@@ -858,15 +862,15 @@
+@@ -859,15 +863,15 @@
      );
      if (other_pid) {
          sprintf(buf, "<other_pid>%d</other_pid>\n", other_pid);
@@ -48,7 +48,7 @@
      }
      if (app_client_shm->shm->app_status.send_msg(msg_buf)) {
          return 0;
-@@ -949,7 +953,7 @@
+@@ -950,7 +954,7 @@
  }
  
  static void handle_upload_file_status() {
@@ -57,7 +57,7 @@
      std::string filename;
      int status;
  
-@@ -1281,7 +1285,7 @@
+@@ -1282,7 +1286,7 @@
      // send graphics-related messages
      //
      if (send_web_graphics_url && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -66,7 +66,7 @@
              "<web_graphics_url>%s</web_graphics_url>",
              web_graphics_url
          );
-@@ -1289,7 +1293,7 @@
+@@ -1290,7 +1294,7 @@
          send_web_graphics_url = false;
      }
      if (send_remote_desktop_addr && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -75,7 +75,7 @@
              "<remote_desktop_addr>%s</remote_desktop_addr>",
              remote_desktop_addr
          );
-@@ -1505,7 +1509,7 @@
+@@ -1506,7 +1510,7 @@
          DirScanner dirscan(path);
          while (dirscan.scan(filename)) {
              if (strstr(filename.c_str(), "trickle_down")) {
diff --git a/debian/patches/more_clang_warnings.patch b/debian/patches/more_clang_warnings.patch
index c5c1a64..e0f9893 100644
--- a/debian/patches/more_clang_warnings.patch
+++ b/debian/patches/more_clang_warnings.patch
@@ -1,6 +1,6 @@
 --- a/client/app_control.cpp
 +++ b/client/app_control.cpp
-@@ -589,8 +589,8 @@
+@@ -590,8 +590,8 @@
      } else {
          x = y;
      }
@@ -11,7 +11,7 @@
      strip_whitespace(buf);
      fclose(f);
      return true;
-@@ -1421,13 +1421,13 @@
+@@ -1431,13 +1431,13 @@
      FILE* f = fopen(path, "r");
      if (!f) return;
      buf[0] = 0;
@@ -72,7 +72,7 @@
  }
 --- a/lib/diagnostics.cpp
 +++ b/lib/diagnostics.cpp
-@@ -607,7 +607,7 @@
+@@ -608,7 +608,7 @@
      size = backtrace (array, 64);
  //  Anything that calls malloc here (i.e *printf()) will probably fail
  //  so we'll do it the hard way.
@@ -81,7 +81,7 @@
      char mbuf[10];
      char *p=mbuf+9;
      int i=size;
-@@ -616,10 +616,10 @@
+@@ -617,10 +617,10 @@
        *(p--)=i%10+'0';
        i/=10;
      }
@@ -97,7 +97,7 @@
  
 --- a/client/hostinfo_unix.cpp
 +++ b/client/hostinfo_unix.cpp
-@@ -1236,11 +1236,12 @@
+@@ -1242,11 +1242,12 @@
  #endif
          fd = popen(cmd, "r");
          if (fd) {
@@ -173,7 +173,7 @@
                  final_retval = retval;
 --- a/client/log_flags.cpp
 +++ b/client/log_flags.cpp
-@@ -509,7 +509,10 @@
+@@ -519,7 +519,10 @@
  #ifdef _WIN32
              _chdir(config.data_dir);
  #else
@@ -187,7 +187,7 @@
      } else {
 --- a/client/switcher.cpp
 +++ b/client/switcher.cpp
-@@ -46,6 +46,8 @@
+@@ -47,6 +47,8 @@
      char            newlibs[256];
      char            *projectDirName;
  
@@ -196,7 +196,7 @@
      strcpy(user_name, "boinc_project");
      strcpy(group_name, "boinc_project");
  
-@@ -73,12 +75,16 @@
+@@ -74,12 +76,16 @@
      // We are running setuid root, so setgid() sets real group ID,
      // effective group ID and saved set_group-ID for this process
      grp = getgrnam(group_name);
@@ -215,7 +215,7 @@
  
      // For unknown reasons, the LD_LIBRARY_PATH and DYLD_LIBRARY_PATH
      // environment variables are not passed in to switcher, though all
-@@ -125,7 +131,8 @@
+@@ -126,7 +132,8 @@
  
      execv(argv[1], argv+2);
  
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index 2a3b85b..da7ffe5 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -15,7 +15,7 @@
  }
 --- a/lib/diagnostics.cpp
 +++ b/lib/diagnostics.cpp
-@@ -305,7 +305,7 @@
+@@ -306,7 +306,7 @@
  
      // Store various pieces of inforation for future use.
      if (flags & BOINC_DIAG_BOINCAPPLICATION) {
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index 6b9d097..b8bfeb5 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -3,7 +3,7 @@ Description: int may not be enough (theoretically) for large files.
 
 --- a/sched/file_upload_handler.cpp
 +++ b/sched/file_upload_handler.cpp
-@@ -137,13 +137,13 @@
+@@ -138,13 +138,13 @@
      bytes_left = nbytes - offset;
  
      while (bytes_left > 0) {
@@ -19,7 +19,7 @@ Description: int may not be enough (theoretically) for large files.
  
          // delay opening the file until we've done the first socket read
          // to avoid filesystem lockups (WCG, possible paranoia)
-@@ -209,7 +209,7 @@
+@@ -210,7 +210,7 @@
  
          // try to write n bytes to file
          //
diff --git a/debian/patches/sched_driver_char_buffers.patch b/debian/patches/sched_driver_char_buffers.patch
index dc07f86..8a0f85c 100644
--- a/debian/patches/sched_driver_char_buffers.patch
+++ b/debian/patches/sched_driver_char_buffers.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller
 Description: Allowing descriptions of hosts, vendor or model that are larger than a SMS.
 --- a/sched/sched_driver.cpp
 +++ b/sched/sched_driver.cpp
-@@ -52,9 +52,9 @@
+@@ -53,9 +53,9 @@
  using std::vector;
  
  struct HOST_DESC{
diff --git a/debian/patches/sched_driver_f_free.patch b/debian/patches/sched_driver_f_free.patch
index 815424f..d1645f6 100644
--- a/debian/patches/sched_driver_f_free.patch
+++ b/debian/patches/sched_driver_f_free.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller <moeller at debian.org>
 Description: Increased buffers and eliminated memory sink.
 --- a/sched/sched_driver.cpp
 +++ b/sched/sched_driver.cpp
-@@ -62,7 +62,7 @@
+@@ -63,7 +63,7 @@
  double max_time = 1;
  
  void read_hosts() {
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index bee0ad9..32b2f99 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1,3 +1,4 @@
+clientgui/res/PutInTrash.icns
 locale/ar/BOINC-Client.mo
 locale/ar/BOINC-Manager.mo
 locale/ar/BOINC-Web.mo
@@ -10,6 +11,7 @@ locale/bg/BOINC-Web.mo
 locale/ca/BOINC-Client.mo
 locale/ca/BOINC-Manager.mo
 locale/ca/wxstd.mo
+locale/ca/BOINC-Setup.mo
 locale/ca/BOINC-Web.mo
 locale/cs/BOINC-Client.mo
 locale/cs/BOINC-Manager.mo
@@ -26,6 +28,7 @@ locale/de/BOINC-Client.mo
 locale/de/BOINC-Manager.mo
 locale/de/wxstd.mo
 locale/de/BOINC-Web.mo
+locale/de/BOINC-Setup.mo
 locale/el/BOINC-Client.mo
 locale/el/BOINC-Manager.mo
 locale/el/BOINC-Web.mo
@@ -39,6 +42,7 @@ locale/fa/BOINC-Web.mo
 locale/fi/BOINC-Client.mo
 locale/fi/BOINC-Manager.mo
 locale/fi/BOINC-Web.mo
+locale/fi/BOINC-Setup.mo
 locale/fr/BOINC-Client.mo
 locale/fr/BOINC-Manager.mo
 locale/fr/wxstd.mo
@@ -56,16 +60,18 @@ locale/hu/BOINC-Client.mo
 locale/hu/BOINC-Manager.mo
 locale/hu/wxstd.mo
 locale/hu/BOINC-Web.mo
-locale/it/BOINC-Client.mo
-locale/it/BOINC-Manager.mo
-locale/it/wxstd.mo
-locale/it/BOINC-Web.mo
+locale/it_IT/BOINC-Client.mo
+locale/it_IT/BOINC-Manager.mo
+locale/it_IT/wxstd.mo
+locale/it_IT/BOINC-Web.mo
+locale/it_IT/BOINC-Setup.mo
 locale/ja/BOINC-Client.mo
 locale/ja/BOINC-Manager.mo
 locale/ja/BOINC-Web.mo
 locale/ko/BOINC-Client.mo
 locale/ko/BOINC-Manager.mo
 locale/ko/BOINC-Web.mo
+locale/ko/BOINC-Setup.mo
 locale/lt/BOINC-Client.mo
 locale/lt/BOINC-Manager.mo
 locale/lt/BOINC-Web.mo
@@ -79,6 +85,7 @@ locale/nl/BOINC-Client.mo
 locale/nl/BOINC-Manager.mo
 locale/nl/wxstd.mo
 locale/nl/BOINC-Web.mo
+locale/nl/BOINC-Setup.mo
 locale/nn/BOINC-Client.mo
 locale/nn/BOINC-Manager.mo
 locale/nn/BOINC-Web.mo
@@ -91,6 +98,7 @@ locale/pt_BR/BOINC-Web.mo
 locale/pt_PT/BOINC-Client.mo
 locale/pt_PT/BOINC-Manager.mo
 locale/pt_PT/BOINC-Web.mo
+locale/pt_PT/BOINC-Setup.mo
 locale/ro/BOINC-Client.mo
 locale/ro/BOINC-Manager.mo
 locale/ro/BOINC-Web.mo
@@ -98,6 +106,7 @@ locale/ru/BOINC-Client.mo
 locale/ru/BOINC-Manager.mo
 locale/ru/wxstd.mo
 locale/ru/BOINC-Web.mo
+locale/ru/BOINC-Setup.mo
 locale/sk/BOINC-Client.mo
 locale/sk/BOINC-Manager.mo
 locale/sk/BOINC-Web.mo
@@ -114,13 +123,27 @@ locale/tr/BOINC-Web.mo
 locale/uk/BOINC-Client.mo
 locale/uk/BOINC-Manager.mo
 locale/uk/BOINC-Web.mo
+locale/uk/BOINC-Setup.mo
 locale/zh_CN/BOINC-Client.mo
 locale/zh_CN/BOINC-Manager.mo
 locale/zh_CN/wxstd.mo
+locale/zh_CN/BOINC-Setup.mo
 locale/zh_CN/BOINC-Web.mo
 locale/zh_TW/BOINC-Client.mo
 locale/zh_TW/BOINC-Manager.mo
 locale/zh_TW/BOINC-Web.mo
+locale/zh_TW/BOINC-Setup.mo
+android/BOINC/res/drawable-hdpi/helpw.png
+android/BOINC/res/drawable-hdpi/infow.png
+android/BOINC/res/drawable-hdpi/refreshw.png
+android/BOINC/res/drawable-ldpi/helpw.png
+android/BOINC/res/drawable-ldpi/infow.png
+android/BOINC/res/drawable-ldpi/refreshw.png
+android/BOINC/res/drawable-mdpi/helpw.png
+android/BOINC/res/drawable-mdpi/infow.png
+android/BOINC/res/drawable-mdpi/refreshw.png
+android/BOINC/res/drawable/infob48.png
+android/BOINC/res/drawable/retry.png
 debian/icons/hicolor/16x16/apps/boincmgr.png
 debian/icons/hicolor/32x32/apps/boincmgr.png
 debian/icons/hicolor/48x48/apps/boincmgr.png

-- 
BOINC packaging

More information about the pkg-boinc-commits mailing list