[SCM] BOINC packaging branch, master, updated. debian/7.0.65+dfsg-3-8-gdff001d

Gianfranco Costamagna costamagnagianfranco at yahoo.it
Fri May 17 20:53:05 UTC 2013


The following commit has been merged in the master branch:
commit dff001d403d5375f86ed05cf9a4b7b8a4f944a2d
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri May 17 22:52:55 2013 +0200

    Patch refresh

diff --git a/debian/patches/fopen_closing.patch b/debian/patches/fopen_closing.patch
index 8e0ffa4..45af6ac 100644
--- a/debian/patches/fopen_closing.patch
+++ b/debian/patches/fopen_closing.patch
@@ -1,7 +1,5 @@
-Index: boinc_debian/lib/crypt_prog.cpp
-===================================================================
---- boinc_debian.orig/lib/crypt_prog.cpp
-+++ boinc_debian/lib/crypt_prog.cpp
+--- a/lib/crypt_prog.cpp
++++ b/lib/crypt_prog.cpp
 @@ -152,6 +152,8 @@
          if (!fpub) die("fopen");
          print_key_hex(fpriv, (KEY*)&private_key, sizeof(private_key));
@@ -61,10 +59,8 @@ Index: boinc_debian/lib/crypt_prog.cpp
              }
          }
      } else {
-Index: boinc_debian/lib/mfile.cpp
-===================================================================
---- boinc_debian.orig/lib/mfile.cpp
-+++ boinc_debian/lib/mfile.cpp
+--- a/lib/mfile.cpp
++++ b/lib/mfile.cpp
 @@ -38,13 +38,14 @@
  MFILE::MFILE() {
      buf = (char*)malloc(64*1024);
@@ -127,10 +123,8 @@ Index: boinc_debian/lib/mfile.cpp
      int n = (int)strlen(p);
      buf = (char*)realloc_aux(buf, len+n+1);
      if (!buf) {
-Index: boinc_debian/lib/parse_test.cpp
-===================================================================
---- boinc_debian.orig/lib/parse_test.cpp
-+++ boinc_debian/lib/parse_test.cpp
+--- a/lib/parse_test.cpp
++++ b/lib/parse_test.cpp
 @@ -52,6 +52,7 @@
          exit(1);
      }
@@ -139,10 +133,8 @@ Index: boinc_debian/lib/parse_test.cpp
  }
  
  /* try it with something like:
-Index: boinc_debian/lib/mfile.h
-===================================================================
---- boinc_debian.orig/lib/mfile.h
-+++ boinc_debian/lib/mfile.h
+--- a/lib/mfile.h
++++ b/lib/mfile.h
 @@ -37,12 +37,12 @@
  public:
      MFILE();
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index 53e6d59..b3bb650 100644
--- a/debian/patches/investigate_boinc_api.patch
+++ b/debian/patches/investigate_boinc_api.patch
@@ -1,7 +1,5 @@
-Index: boinc_debian/api/boinc_api.cpp
-===================================================================
---- boinc_debian.orig/api/boinc_api.cpp
-+++ boinc_debian/api/boinc_api.cpp
+--- a/api/boinc_api.cpp
++++ b/api/boinc_api.cpp
 @@ -331,7 +331,7 @@
  
      if (standalone) return true;
diff --git a/debian/patches/lib_cppcheck.patch b/debian/patches/lib_cppcheck.patch
index 56ac006..8ff014e 100644
--- a/debian/patches/lib_cppcheck.patch
+++ b/debian/patches/lib_cppcheck.patch
@@ -1,7 +1,5 @@
-Index: boinc_debian/lib/unix_util.cpp
-===================================================================
---- boinc_debian.orig/lib/unix_util.cpp
-+++ boinc_debian/lib/unix_util.cpp
+--- a/lib/unix_util.cpp
++++ b/lib/unix_util.cpp
 @@ -61,7 +61,13 @@
              }
              if (i!=envstrings.end()) {

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list