[boinc] 03/03: Upload of 7.2.27 to experimental

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository boinc.

commit 40b0eaff5f023d39f96daa95682d5cd092247e27
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue Nov 5 21:09:00 2013 +0100

    Upload of 7.2.27 to experimental
---
 debian/changelog                           |    7 ++++++
 debian/control.in                          |    2 +-
 debian/patches/series                      |    3 ++-
 debian/patches/slot_dir_source_trace.patch |   36 +++++++++++++++++-----------
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 665df3c..f6ca2ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (7.2.27+dfsg-1exp1) experimental; urgency=low
+
+  * New upstream version, with server packages.
+  * Bumped policy to 3.9.5 - no changes required
+
+ -- Steffen Moeller <moeller at debian.org>  Tue, 05 Nov 2013 21:03:04 +0100
+
 boinc (7.2.22+dfsg-1exp1) experimental; urgency=low
 
   * Same as -1, with server packages.
diff --git a/debian/control.in b/debian/control.in
index e7071d9..2d0b583 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,7 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
  Rene Mayorga <rmayorga at debian.org>,
  Daniel Hahler <ubuntu at thequod.de>,
  Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9), po-debconf, pkg-config,
  dpkg-dev (>= 1.16.1.1),
  libtool, autoconf, autotools-dev, automake, gettext,
diff --git a/debian/patches/series b/debian/patches/series
index cf4d089..0a26b0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -60,7 +60,8 @@ lib_cppcheck.patch
 fopen_closing.patch
 rrsim_iterator_cppcheck.patch
 filesys_error_message.patch
-de.po.patch
+#clashes with 7.2.27 - we should not waste our time on this here
+#de.po.patch
 more_clang_warnings.patch
 #mmap_mem_only.patch
 add-ldflags.patch
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index d677b9a..aebe3f7 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,6 +1,8 @@
---- a/client/app.cpp
-+++ b/client/app.cpp
-@@ -423,8 +423,8 @@
+Index: boinc/client/app.cpp
+===================================================================
+--- boinc.orig/client/app.cpp
++++ boinc/client/app.cpp
+@@ -436,8 +436,8 @@
      char new_path[MAXPATHLEN], old_path[MAXPATHLEN];
      int retval;
  
@@ -11,7 +13,7 @@
          "%s/trickle_up_%s_%d.xml",
          result->project->project_dir(), result->name, (int)time(0)
      );
-@@ -459,7 +459,7 @@
+@@ -472,7 +472,7 @@
      return 0;
  }
  
@@ -20,7 +22,7 @@
      unsigned int i;
      for (i=0; i<active_tasks.size(); i++) {
          if (active_tasks[i]->slot == slot) {
-@@ -469,7 +469,7 @@
+@@ -482,7 +482,7 @@
      return false;
  }
  
@@ -29,8 +31,8 @@
      char path[MAXPATHLEN];
      unsigned int i;
      for (i=0; i<active_tasks.size(); i++) {
-@@ -510,7 +510,7 @@
- #endif
+@@ -533,7 +533,7 @@
+     return 0;
  }
  
 -bool ACTIVE_TASK_SET::slot_taken(int slot) {
@@ -38,7 +40,7 @@
      unsigned int i;
      for (i=0; i<active_tasks.size(); i++) {
          if (active_tasks[i]->slot == slot) return true;
-@@ -622,7 +622,7 @@
+@@ -645,7 +645,7 @@
  #endif
  
  int ACTIVE_TASK::parse(XML_PARSER& xp) {
@@ -47,8 +49,10 @@
      int n, dummy;
      unsigned int i;
      PROJECT* project=0;
---- a/client/app.h
-+++ b/client/app.h
+Index: boinc/client/app.h
+===================================================================
+--- boinc.orig/client/app.h
++++ boinc/client/app.h
 @@ -48,6 +48,7 @@
  typedef int PROCESS_ID;
  
@@ -97,8 +101,10 @@
      void get_memory_usage();
  
      void process_control_poll();
---- a/lib/filesys.cpp
-+++ b/lib/filesys.cpp
+Index: boinc/lib/filesys.cpp
+===================================================================
+--- boinc.orig/lib/filesys.cpp
++++ boinc/lib/filesys.cpp
 @@ -86,7 +86,7 @@
  
  // routines for enumerating the entries in a directory
@@ -320,8 +326,10 @@
  #ifdef STATFS
      struct STATFS fs_info;
  
---- a/lib/filesys.h
-+++ b/lib/filesys.h
+Index: boinc/lib/filesys.h
+===================================================================
+--- boinc.orig/lib/filesys.h
++++ boinc/lib/filesys.h
 @@ -43,30 +43,30 @@
  #ifdef __cplusplus
  extern "C" {

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