[SCM] BOINC packaging branch, master, updated. upstream/7.0.27+dfsg-444-g77c654b

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 77c654bd8ff842e349bb6d66baf82089d64f613f
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sat May 19 12:19:44 2012 +0200

    Adjusted debian/changelog for 7.0.28
    
    And refreshed patches. Removed patch increasing buffer sizes.

diff --git a/debian/changelog b/debian/changelog
index 8d964c5..744016a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.28+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Steffen Moeller <moeller at debian.org>  Sat, 19 May 2012 12:19:25 +0200
+
 boinc (7.0.27+dfsg-4) UNRELEASED; urgency=low
 
   * Preparing for screen saver
diff --git a/debian/patches/api_NULL_not_defined.patch b/debian/patches/api_NULL_not_defined.patch
index 066f789..c57ef00 100644
--- a/debian/patches/api_NULL_not_defined.patch
+++ b/debian/patches/api_NULL_not_defined.patch
@@ -1,7 +1,7 @@
 Index: boinc/api/boinc_api.h
 ===================================================================
---- boinc.orig/api/boinc_api.h	2012-05-03 13:31:53.445255219 +0200
-+++ boinc/api/boinc_api.h	2012-05-03 13:32:10.805017260 +0200
+--- boinc.orig/api/boinc_api.h	2012-05-18 14:36:50.000000000 +0200
++++ boinc/api/boinc_api.h	2012-05-19 12:21:09.620351315 +0200
 @@ -83,7 +83,7 @@
  
  extern int boinc_init(void);
diff --git a/debian/patches/clang_incompatibilities.patch b/debian/patches/clang_incompatibilities.patch
index aff7fee..fed9602 100644
--- a/debian/patches/clang_incompatibilities.patch
+++ b/debian/patches/clang_incompatibilities.patch
@@ -2,8 +2,8 @@ Author: Steffen Moeller <steffen.moeller at uk-sh.de>
 Description: Tested compatibility with clang.
 Index: boinc/lib/Makefile.am
 ===================================================================
---- boinc.orig/lib/Makefile.am	2012-03-31 23:50:52.780651101 +0200
-+++ boinc/lib/Makefile.am	2012-03-31 23:58:18.698533236 +0200
+--- boinc.orig/lib/Makefile.am	2012-05-19 12:21:48.983806017 +0200
++++ boinc/lib/Makefile.am	2012-05-19 12:22:11.987487371 +0200
 @@ -147,13 +147,13 @@
  libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
  libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -22,8 +22,8 @@ Index: boinc/lib/Makefile.am
  if ENABLE_FCGI
 Index: boinc/lib/util.cpp
 ===================================================================
---- boinc.orig/lib/util.cpp	2012-03-31 23:42:04.779899659 +0200
-+++ boinc/lib/util.cpp	2012-03-31 23:46:22.976354118 +0200
+--- boinc.orig/lib/util.cpp	2012-05-19 12:21:48.983806017 +0200
++++ boinc/lib/util.cpp	2012-05-19 12:22:11.991487316 +0200
 @@ -310,7 +310,7 @@
  #ifdef _WIN32
      DebugBreak();
@@ -35,10 +35,10 @@ Index: boinc/lib/util.cpp
  
 Index: boinc/sched/make_work.cpp
 ===================================================================
---- boinc.orig/sched/make_work.cpp	2012-03-31 13:44:26.739115369 +0200
-+++ boinc/sched/make_work.cpp	2012-04-01 00:57:02.846130700 +0200
-@@ -175,9 +175,6 @@
-     char keypath[256];
+--- boinc.orig/sched/make_work.cpp	2012-05-19 12:21:48.983806017 +0200
++++ boinc/sched/make_work.cpp	2012-05-19 12:22:11.999487205 +0200
+@@ -176,9 +176,6 @@
+     char keypath[MAXPATHLEN];
      char buf[BLOB_SIZE];
      R_RSA_PRIVATE_KEY key;
 -    int nwu_names = wu_names.size();
@@ -47,7 +47,7 @@ Index: boinc/sched/make_work.cpp
      static int index=0;
  
      retval = config.parse_file();
-@@ -192,8 +189,11 @@
+@@ -193,8 +190,11 @@
          exit(1);
      }
  
@@ -61,7 +61,7 @@ Index: boinc/sched/make_work.cpp
          sprintf(buf, "where name='%s'", wu_names[i].c_str());
          retval = wu.lookup(buf);
          if (retval) {
-@@ -264,6 +264,8 @@
+@@ -265,6 +265,8 @@
  
          wait_for_results(new_wu_id);
      }
diff --git a/debian/patches/series b/debian/patches/series
index 62a531e..8588534 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,7 +22,7 @@ stripchart_security.patch
 #andYetMorePatches04.patch
 redundant_i.patch
 cppcheck_realloc.patch
-cwd_handling.patch
+#convinceDavid#cwd_handling.patch
 parse_issues.patch
 client_stream_realloc.patch
 # --- A
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index eb920f4..ef3a04c 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -1,8 +1,8 @@
 Index: boinc/tools/dir_hier_path.cpp
 ===================================================================
---- boinc.orig/tools/dir_hier_path.cpp	2012-04-06 20:32:38.470898177 +0200
-+++ boinc/tools/dir_hier_path.cpp	2012-04-06 20:32:43.646826925 +0200
-@@ -41,8 +41,8 @@
+--- boinc.orig/tools/dir_hier_path.cpp	2012-05-19 12:21:46.779836547 +0200
++++ boinc/tools/dir_hier_path.cpp	2012-05-19 12:22:34.799171401 +0200
+@@ -42,8 +42,8 @@
      int retval;
  
      if ( (argc == 1) ||  !strcmp(argv[1], "-h")  || !strcmp(argv[1],"--help") || (argc != 2) ) {
@@ -15,8 +15,8 @@ Index: boinc/tools/dir_hier_path.cpp
      retval = config.parse_file();
 Index: boinc/tools/dir_hier_move.cpp
 ===================================================================
---- boinc.orig/tools/dir_hier_move.cpp	2012-04-06 20:32:38.470898177 +0200
-+++ boinc/tools/dir_hier_move.cpp	2012-04-06 20:32:43.650826870 +0200
+--- boinc.orig/tools/dir_hier_move.cpp	2012-05-19 12:21:46.779836547 +0200
++++ boinc/tools/dir_hier_move.cpp	2012-05-19 12:22:34.803171345 +0200
 @@ -42,15 +42,15 @@
      int retval;
      
@@ -39,8 +39,8 @@ Index: boinc/tools/dir_hier_move.cpp
      DirScanner scanner(src_dir);
 Index: boinc/clientgui/sg_ProjectPanel.cpp
 ===================================================================
---- boinc.orig/clientgui/sg_ProjectPanel.cpp	2012-04-06 20:32:38.470898177 +0200
-+++ boinc/clientgui/sg_ProjectPanel.cpp	2012-04-06 20:32:43.654826815 +0200
+--- boinc.orig/clientgui/sg_ProjectPanel.cpp	2012-05-19 12:21:46.779836547 +0200
++++ boinc/clientgui/sg_ProjectPanel.cpp	2012-05-19 12:22:34.807171290 +0200
 @@ -387,22 +387,22 @@
  
  

-- 
BOINC packaging