[boinc] 03/03: New upstream release, upload to experimental

Mon Jun 16 12:10:14 UTC 2014

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

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

commit c354d1b6a524f52dd5dcfce993ac00e5b8ad0ae2
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jun 16 12:42:16 2014 +0200

    New upstream release, upload to experimental
---
 debian/changelog                                          |  3 ++-
 debian/patches/addressing_addional_html_dirs.patch        |  4 ++--
 debian/patches/disable_silent_rules.patch                 |  2 +-
 debian/patches/file_upload_handler_in_sched_linking.patch |  4 ++--
 debian/patches/investigate_boinc_api.patch                | 12 ++++++------
 debian/patches/libnotify-0.7.patch                        |  4 ++--
 debian/patches/slot_dir_source_trace.patch                | 10 +++++-----
 debian/patches/upstream_sztaki_configureEval.patch        |  2 +-
 8 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50691c2..63897f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-boinc (7.3.19+dfsg-3exp2) UNRELEASED; urgency=medium
+boinc (7.4.1+dfsg-1exp1) experimental; urgency=medium
 
+  * New upstream release, some api changes, patch refresh
   * d/r: Removing some buildflags includes.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 11 Jun 2014 12:25:03 +0200
diff --git a/debian/patches/addressing_addional_html_dirs.patch b/debian/patches/addressing_addional_html_dirs.patch
index 7858890..c1affca 100644
--- a/debian/patches/addressing_addional_html_dirs.patch
+++ b/debian/patches/addressing_addional_html_dirs.patch
@@ -4,5 +4,5 @@
  htmldir=$(DESTDIR)/$(prefix)/share/boinc-server-maker/html
  install-data-local:
  	mkdir -p $(htmldir)
--	cp -r inc languages ops user $(htmldir)
-+	cp -r bt drupal inc languages ops project.sample queue user $(htmldir)
+-	cp -r $(srcdir)/inc $(srcdir)/languages $(srcdir)/ops $(srcdir)/user $(htmldir)
++	cp -r $(srcdir)/bt $(srcdir)/drupal $(srcdir)/inc $(srcdir)/languages $(srcdir)/ops $(srcdir)/project.sample $(srcdir)/queue $(srcdir)/user $(htmldir)
diff --git a/debian/patches/disable_silent_rules.patch b/debian/patches/disable_silent_rules.patch
index eb805ae..a42cb60 100644
--- a/debian/patches/disable_silent_rules.patch
+++ b/debian/patches/disable_silent_rules.patch
@@ -1,7 +1,7 @@
 Description: Disabled silent rules, for buildlog check to work.
 --- a/configure.ac
 +++ b/configure.ac
-@@ -22,7 +22,7 @@
+@@ -28,7 +28,7 @@
  
  AM_INIT_AUTOMAKE(dist-zip)
  
diff --git a/debian/patches/file_upload_handler_in_sched_linking.patch b/debian/patches/file_upload_handler_in_sched_linking.patch
index e9e59f6..f8be7bf 100644
--- a/debian/patches/file_upload_handler_in_sched_linking.patch
+++ b/debian/patches/file_upload_handler_in_sched_linking.patch
@@ -1,6 +1,6 @@
 --- a/sched/Makefile.am
 +++ b/sched/Makefile.am
-@@ -265,7 +265,7 @@
+@@ -267,7 +267,7 @@
  update_stats_LDADD = $(SERVERLIBS)
  
  file_upload_handler_SOURCES = file_upload_handler.cpp
@@ -9,7 +9,7 @@
  
  make_work_SOURCES = make_work.cpp
  make_work_LDADD = $(SERVERLIBS)
-@@ -307,7 +307,7 @@
+@@ -309,7 +309,7 @@
      sched_config.cpp \
      sched_msgs.cpp 
  fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index 59c37d3..b6f29b3 100644
--- a/debian/patches/investigate_boinc_api.patch
+++ b/debian/patches/investigate_boinc_api.patch
@@ -20,7 +20,7 @@
      s->no_heartbeat = boinc_status.no_heartbeat;
      s->suspended = boinc_status.suspended;
      s->quit_request = boinc_status.quit_request;
-@@ -820,7 +824,7 @@
+@@ -823,7 +827,7 @@
  int boinc_parse_init_data_file() {
      FILE* f;
      int retval;
@@ -29,7 +29,7 @@
  
      if (aid.project_preferences) {
          free(aid.project_preferences);
-@@ -872,15 +876,15 @@
+@@ -875,15 +879,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;
-@@ -975,7 +979,7 @@
+@@ -978,7 +982,7 @@
  }
  
  static void handle_upload_file_status() {
@@ -57,7 +57,7 @@
      std::string filename;
      int status;
  
-@@ -1190,7 +1194,7 @@
+@@ -1193,7 +1197,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
          );
-@@ -1198,7 +1202,7 @@
+@@ -1201,7 +1205,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
          );
-@@ -1442,7 +1446,7 @@
+@@ -1445,7 +1449,7 @@
          DirScanner dirscan(path);
          while (dirscan.scan(filename)) {
              if (strstr(filename.c_str(), "trickle_down")) {
diff --git a/debian/patches/libnotify-0.7.patch b/debian/patches/libnotify-0.7.patch
index d764b7d..3d11a60 100644
--- a/debian/patches/libnotify-0.7.patch
+++ b/debian/patches/libnotify-0.7.patch
@@ -23,7 +23,7 @@ Disclaimer: For backports, this patch needs to be disabled.
  	grep '#define.*BOINC.*VERSION' $^ > $@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -887,14 +887,12 @@
+@@ -893,14 +893,12 @@
  
  dnl ---------- libNotify --------------------------------------------------
  if test "${enable_manager}" = yes ; then
@@ -43,7 +43,7 @@ Disclaimer: For backports, this patch needs to be disabled.
  fi
  
  dnl ---------- Sqlite3 ----------------------------------------------------
-@@ -1051,7 +1049,7 @@
+@@ -1057,7 +1055,7 @@
     ],
    [enable_wx_debug="no"])
  
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index e47edb8..7f38c55 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -305,15 +305,15 @@
 @@ -769,7 +769,7 @@
  }
  
- #if defined(_WIN32) && !(defined(WXDEBUG) || defined(WXNDEBUG))
+ #if defined(_WIN32)
 -int boinc_allocate_file(const char* path, double size) {
 +int boinc_allocate_file(const char* const path, double size) {
      int retval = 0;
-     HANDLE h = CreateFile(
+     HANDLE h = CreateFileA(
          path,
-@@ -831,7 +831,7 @@
-         total_space = (double)dwTotalClusters * dwSectPerClust * dwBytesPerSect;
-     }
+@@ -819,7 +819,7 @@
+     total_space = uMB * 1024.0 * 1024.0;
+ 
  #else
 -int get_filesystem_info(double &total_space, double &free_space, char* path) {
 +int get_filesystem_info(double &total_space, double &free_space, const char* const path) {
diff --git a/debian/patches/upstream_sztaki_configureEval.patch b/debian/patches/upstream_sztaki_configureEval.patch
index 87e83f1..9e22b89 100644
--- a/debian/patches/upstream_sztaki_configureEval.patch
+++ b/debian/patches/upstream_sztaki_configureEval.patch
@@ -1,7 +1,7 @@
 Author: Unknown
 --- a/configure.ac
 +++ b/configure.ac
-@@ -305,6 +305,20 @@
+@@ -311,6 +311,20 @@
  
  AC_SUBST([TOP_BUILD_DIR], [`pwd`])
  

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

