[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-6-g244f70b

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 244f70bc75470f457c49ed553aa0ce6b04340746
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Wed Aug 22 20:47:59 2012 +0200

    Better clean, Typo in more_maxpathlen.patch, override
    
    Collection of issues prior to upload.

diff --git a/debian/boinc-nvidia-cuda.lintian-overrides b/debian/boinc-nvidia-cuda.lintian-overrides
new file mode 100644
index 0000000..d0a240b
--- /dev/null
+++ b/debian/boinc-nvidia-cuda.lintian-overrides
@@ -0,0 +1,2 @@
+boinc-nvidia-cuda binary: bad-provided-package-name
+# lintian seems behind
diff --git a/debian/changelog b/debian/changelog
index 6663d07..a28b72c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ boinc (7.0.34+dfsg-1) unstable; urgency=low
     - switch from *.txf fonts to TrueType fonts in graphics apps,
       ensuring that all related files have no licensing issues.
   * Helping boinc-nvidia-cuda package towards multi-arch
+  * Help cleaning remnants of packages (temporarily) not in
+    debian/control but in debian/control.in.
+  * Override boinc-nvidia-cuda: bad-provided-package-name libcuda1:i386
 
   [ Guo Yixuan ]
   * Remove broken links from libboinc-app-dev. (Closes: #659845)
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 980e50d..4a0346c 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -1,13 +1,13 @@
 Index: boinc/api/graphics2_util.cpp
 ===================================================================
---- boinc.orig/api/graphics2_util.cpp	2012-03-31 13:44:20.927194759 +0200
-+++ boinc/api/graphics2_util.cpp	2012-08-18 22:06:59.095703443 +0200
+--- boinc.orig/api/graphics2_util.cpp	2012-08-22 20:35:24.792922502 +0200
++++ boinc/api/graphics2_util.cpp	2012-08-22 20:47:47.234849517 +0200
 @@ -35,9 +35,9 @@
  
  #ifdef __EMX__
  static key_t get_shmem_name(const char* prog_name) {
 -    char cwd[256], path[256];
-+    char cwd[MATPATHLEN], path[MATPATHLEN];
++    char cwd[MAXPATHLEN], path[MAXPATHLEN];
      boinc_getcwd(cwd);
 -    sprintf(path, "%s/init_data.xml", cwd);
 +    snprintf(path, sizeof(path), "%s/init_data.xml", cwd);
@@ -27,7 +27,7 @@ Index: boinc/api/graphics2_util.cpp
  #ifdef _WIN32
      HANDLE shmem_handle;
 -    char shmem_name[256];
-+    char shmem_name[MATPATHLEN];
++    char shmem_name[MAXPATHLEN];
      void* p;
      get_shmem_name(prog_name, shmem_name);
      shmem_handle = create_shmem(shmem_name, size, &p);
@@ -36,7 +36,7 @@ Index: boinc/api/graphics2_util.cpp
  #else
      // V6 Unix/Linux/Mac applications always use mmap() shared memory for graphics communication
 -    char shmem_name[256];
-+    char shmem_name[MATPATHLEN];
++    char shmem_name[MAXPATHLEN];
      get_shmem_name(prog_name, shmem_name);
      int retval = create_shmem_mmap(shmem_name, size, &p);
      // Graphics app may be run by a different user & group than worker app
@@ -45,7 +45,7 @@ Index: boinc/api/graphics2_util.cpp
  void* boinc_graphics_get_shmem(const char* prog_name) {
      HANDLE shmem_handle;
 -    char shmem_name[256];
-+    char shmem_name[MATPATHLEN];
++    char shmem_name[MAXPATHLEN];
      void* p;
      get_shmem_name(prog_name, shmem_name);
      shmem_handle = attach_shmem(shmem_name, &p);
@@ -54,14 +54,14 @@ Index: boinc/api/graphics2_util.cpp
  #else
      // V6 Unix/Linux/Mac applications always use mmap() shared memory for graphics communication
 -    char shmem_name[256];
-+    char shmem_name[MATPATHLEN];
++    char shmem_name[MAXPATHLEN];
      get_shmem_name(prog_name, shmem_name);
      retval = attach_shmem_mmap(shmem_name, &p);
  #endif
 Index: boinc/lib/filesys.cpp
 ===================================================================
---- boinc.orig/lib/filesys.cpp	2012-08-18 16:00:23.485826204 +0200
-+++ boinc/lib/filesys.cpp	2012-08-18 22:23:33.110256806 +0200
+--- boinc.orig/lib/filesys.cpp	2012-08-22 20:46:19.264044088 +0200
++++ boinc/lib/filesys.cpp	2012-08-22 20:46:19.528040503 +0200
 @@ -209,7 +209,7 @@
  }
  
@@ -116,8 +116,8 @@ Index: boinc/lib/filesys.cpp
          strcpy(oldpath, newpath);
 Index: boinc/lib/network.cpp
 ===================================================================
---- boinc.orig/lib/network.cpp	2012-08-01 20:52:04.638985631 +0200
-+++ boinc/lib/network.cpp	2012-08-18 22:30:17.052799909 +0200
+--- boinc.orig/lib/network.cpp	2012-08-22 20:35:24.792922502 +0200
++++ boinc/lib/network.cpp	2012-08-22 20:46:19.532040449 +0200
 @@ -70,7 +70,7 @@
      case WSAENOTSOCK:
          return "not a socket";
diff --git a/debian/rules b/debian/rules
index e97a3b7..d1ca61e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -169,7 +169,7 @@ CFGFLAGS_boinc-client = \
 
 override_dh_clean:
 	dh_clean
-	rm -rf debian/boinc-app-examples debian/boinc-server-maker
+	rm -rf debian/boinc-app-examples debian/boinc-server-maker debian/boinc-app-examples.substvars debian/boinc-server-maker.substvars
 	find . -name "Makefile" | grep -v samples | xargs -r rm
 	rm -f configure clientscr/boincscr
 	rm -rf py/lib.linux-*-2.*

-- 
BOINC packaging