[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-314-gccecfd3

Sat Oct 8 16:43:46 UTC 2011

The following commit has been merged in the master branch:
commit 735fc68ec4ec796425ce411a3f2004e05c1a6901
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Oct 8 14:33:32 2011 +0200

    Adjusted patches.

diff --git a/debian/patches/Makefile_subdirs.patch b/debian/patches/Makefile_subdirs.patch
index 7314161..21f70d6 100644
--- a/debian/patches/Makefile_subdirs.patch
+++ b/debian/patches/Makefile_subdirs.patch
@@ -1,19 +1,17 @@
 Index: boinc/Makefile.am
 ===================================================================
---- boinc.orig/Makefile.am	2011-04-27 22:39:13.000000000 +0200
-+++ boinc/Makefile.am	2011-04-27 22:45:42.000000000 +0200
-@@ -21,10 +21,10 @@
- endif
+--- boinc.orig/Makefile.am	2011-10-08 14:11:56.000000000 +0200
++++ boinc/Makefile.am	2011-10-08 14:32:51.000000000 +0200
+@@ -22,9 +22,9 @@
  
  if ENABLE_MANAGER
--	CLIENTGUI_SUBDIRS = clientgui clientgui/res locale
--	if BUILD_X11_SCREENSAVER
--		CLIENTGUI_SUBDIRS += clientscr
--	endif 
-+CLIENTGUI_SUBDIRS = clientgui clientgui/res locale
-+##if BUILD_X11_SCREENSAVER
-+##	CLIENTGUI_SUBDIRS += clientscr
-+##endif 
+    CLIENTGUI_SUBDIRS = clientgui clientgui/res locale
+-if BUILD_X11_SCREENSAVER
+-   CLIENTGUI_SUBDIRS += clientscr
+-endif
++#if BUILD_X11_SCREENSAVER
++#   CLIENTGUI_SUBDIRS += clientscr
++#endif
  endif
  
  # ORDER MATTERS below.  One must build dependencies FIRST, then things
diff --git a/debian/patches/file_upload_handler_permission.patch b/debian/patches/file_upload_handler_permission.patch
index 11a58d7..dda13af 100644
--- a/debian/patches/file_upload_handler_permission.patch
+++ b/debian/patches/file_upload_handler_permission.patch
@@ -6,9 +6,9 @@ Disclaimer: This patch aims at being adopted by upstream. It may
 
 Index: boinc/sched/file_upload_handler.cpp
 ===================================================================
---- boinc.orig/sched/file_upload_handler.cpp	2011-07-24 19:39:10.000000000 +0200
-+++ boinc/sched/file_upload_handler.cpp	2011-07-24 22:58:24.000000000 +0200
-@@ -159,7 +159,7 @@
+--- boinc.orig/sched/file_upload_handler.cpp	2011-10-08 14:11:57.000000000 +0200
++++ boinc/sched/file_upload_handler.cpp	2011-10-08 14:32:58.000000000 +0200
+@@ -119,7 +119,7 @@
      //
      int fd = open(path,
          O_WRONLY|O_CREAT,
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index d2b974c..2f0e096 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -1,8 +1,8 @@
 Index: boinc/sched/file_upload_handler.cpp
 ===================================================================
---- boinc.orig/sched/file_upload_handler.cpp	2011-07-24 22:59:07.000000000 +0200
-+++ boinc/sched/file_upload_handler.cpp	2011-07-24 23:05:51.000000000 +0200
-@@ -209,17 +209,17 @@
+--- boinc.orig/sched/file_upload_handler.cpp	2011-10-08 14:32:58.000000000 +0200
++++ boinc/sched/file_upload_handler.cpp	2011-10-08 14:33:04.000000000 +0200
+@@ -169,17 +169,17 @@
  
      while (bytes_left > 0) {
  
@@ -23,7 +23,7 @@ Index: boinc/sched/file_upload_handler.cpp
          while (to_write > 0) {
              ssize_t ret = write(fd, buf+n-to_write, to_write);
              if (ret < 0) {
-@@ -273,7 +273,7 @@
+@@ -233,7 +233,7 @@
      unsigned char buf[BLOCK_SIZE];
  
      while (1) {
diff --git a/debian/patches/pythonPath.patch b/debian/patches/pythonPath.patch
deleted file mode 100644
index ec177be..0000000
--- a/debian/patches/pythonPath.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: boinc/tools/appmgr
-===================================================================
---- boinc.orig/tools/appmgr	2011-06-20 21:38:42.000000000 +0200
-+++ boinc/tools/appmgr	2011-07-24 22:46:49.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python
- #
- # Written by Gabor Gombas <gombasg at sztaki.hu>
- # Licensed under the same terms as the rest of BOINC.
-Index: boinc/tools/dbcheck_files_exist
-===================================================================
---- boinc.orig/tools/dbcheck_files_exist	2011-06-20 21:38:42.000000000 +0200
-+++ boinc/tools/dbcheck_files_exist	2011-07-24 22:46:49.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- 
- import os, re, boinc_path_config
- from Boinc import database, db_mid, boinc_db, configxml
-Index: boinc/tools/make_project
-===================================================================
---- boinc.orig/tools/make_project	2011-07-24 19:39:10.000000000 +0200
-+++ boinc/tools/make_project	2011-07-24 22:46:49.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- 
- # $Id: make_project 23509 2011-05-06 12:33:12Z davea $
- # Creates a new BOINC project.
-Index: boinc/tools/parse_config
-===================================================================
---- boinc.orig/tools/parse_config	2011-06-20 21:38:42.000000000 +0200
-+++ boinc/tools/parse_config	2011-07-24 22:46:49.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- 
- # -*- mode: python; python-indent: 4; -*-
- 
-Index: boinc/tools/upgrade
-===================================================================
---- boinc.orig/tools/upgrade	2011-07-24 19:39:10.000000000 +0200
-+++ boinc/tools/upgrade	2011-07-24 22:46:49.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- 
- # $Id: upgrade 23358 2011-04-09 03:10:29Z davea $
- 
-Index: boinc/tools/xadd
-===================================================================
---- boinc.orig/tools/xadd	2011-06-20 21:38:42.000000000 +0200
-+++ boinc/tools/xadd	2011-07-24 22:46:49.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- 
- # $Id: xadd 18374 2009-06-11 15:38:48Z davea $
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2ddabee..0bb6b52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 stripchart_debian.patch
 upstream_sztaki_configureEval.patch
-pythonPath.patch
 generate_less.patch
 texfont_removal.patch
 Makefile_subdirs.patch

-- 
BOINC packaging

