[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-233-gb79d0db
Steffen Moeller
moeller at debian.org
Fri May 27 21:08:54 UTC 2011
The following commit has been merged in the master branch:
commit f0b3812498e167041916031386250aca47df7c6f
Author: Steffen Moeller <moeller at debian.org>
Date: Wed Apr 27 22:47:00 2011 +0200
Refreshments.
diff --git a/debian/patches/AdvancedFrame_const.patch b/debian/patches/AdvancedFrame_const.patch
index 3f5a0b3..3e2fe16 100644
--- a/debian/patches/AdvancedFrame_const.patch
+++ b/debian/patches/AdvancedFrame_const.patch
@@ -1,7 +1,7 @@
Index: boinc/clientgui/AdvancedFrame.cpp
===================================================================
---- boinc.orig/clientgui/AdvancedFrame.cpp 2011-04-25 18:41:15.000000000 +0200
-+++ boinc/clientgui/AdvancedFrame.cpp 2011-04-25 18:43:41.000000000 +0200
+--- boinc.orig/clientgui/AdvancedFrame.cpp 2011-04-27 22:39:12.000000000 +0200
++++ boinc/clientgui/AdvancedFrame.cpp 2011-04-27 22:45:42.000000000 +0200
@@ -1492,14 +1492,14 @@
int prog;
#endif
diff --git a/debian/patches/FlatBookStaticChar.patch b/debian/patches/FlatBookStaticChar.patch
index f6ecf6c..548b031 100644
--- a/debian/patches/FlatBookStaticChar.patch
+++ b/debian/patches/FlatBookStaticChar.patch
@@ -1,7 +1,7 @@
Index: boinc/clientgui/common/wxFlatNotebookImages.h
===================================================================
---- boinc.orig/clientgui/common/wxFlatNotebookImages.h 2011-01-03 01:00:53.000000000 +0100
-+++ boinc/clientgui/common/wxFlatNotebookImages.h 2011-01-03 01:01:48.000000000 +0100
+--- boinc.orig/clientgui/common/wxFlatNotebookImages.h 2011-04-27 22:39:13.000000000 +0200
++++ boinc/clientgui/common/wxFlatNotebookImages.h 2011-04-27 22:45:42.000000000 +0200
@@ -25,7 +25,7 @@
// Images used by the control
////////////////////////////////////////////////////////////
diff --git a/debian/patches/MakefileWrapper.patch b/debian/patches/MakefileWrapper.patch
index c6f797e..e0387c5 100644
--- a/debian/patches/MakefileWrapper.patch
+++ b/debian/patches/MakefileWrapper.patch
@@ -1,7 +1,7 @@
Index: boinc/samples/wrapper/Makefile
===================================================================
---- boinc.orig/samples/wrapper/Makefile 2011-01-02 23:44:30.000000000 +0100
-+++ boinc/samples/wrapper/Makefile 2011-01-03 00:26:15.000000000 +0100
+--- boinc.orig/samples/wrapper/Makefile 2011-04-27 22:39:13.000000000 +0200
++++ boinc/samples/wrapper/Makefile 2011-04-27 22:45:42.000000000 +0200
@@ -1,30 +1,43 @@
# This should work on Linux. Modify as needed for other platforms.
@@ -57,8 +57,8 @@ Index: boinc/samples/wrapper/Makefile
- g++ $(CXXFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
Index: boinc/samples/sleeper/Makefile
===================================================================
---- boinc.orig/samples/sleeper/Makefile 2011-01-02 23:46:05.000000000 +0100
-+++ boinc/samples/sleeper/Makefile 2011-01-03 00:26:20.000000000 +0100
+--- boinc.orig/samples/sleeper/Makefile 2011-04-27 22:39:13.000000000 +0200
++++ boinc/samples/sleeper/Makefile 2011-04-27 22:45:42.000000000 +0200
@@ -1,29 +1,43 @@
# This should work on Linux. Modify as needed for other platforms.
diff --git a/debian/patches/Makefile_subdirs.patch b/debian/patches/Makefile_subdirs.patch
index 71a2e51..7314161 100644
--- a/debian/patches/Makefile_subdirs.patch
+++ b/debian/patches/Makefile_subdirs.patch
@@ -1,7 +1,7 @@
Index: boinc/Makefile.am
===================================================================
---- boinc.orig/Makefile.am 2010-12-12 01:18:18.000000000 +0100
-+++ boinc/Makefile.am 2010-12-12 01:20:09.000000000 +0100
+--- 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
diff --git a/debian/patches/advanced_link_image_const.patch b/debian/patches/advanced_link_image_const.patch
index bbdb5d5..84fbd9d 100644
--- a/debian/patches/advanced_link_image_const.patch
+++ b/debian/patches/advanced_link_image_const.patch
@@ -1,7 +1,7 @@
Index: boinc/clientgui/res/skins/default/graphic/advanced_link_image.xpm
===================================================================
---- boinc.orig/clientgui/res/skins/default/graphic/advanced_link_image.xpm 2011-04-09 16:01:00.000000000 +0200
-+++ boinc/clientgui/res/skins/default/graphic/advanced_link_image.xpm 2011-04-09 16:01:15.000000000 +0200
+--- boinc.orig/clientgui/res/skins/default/graphic/advanced_link_image.xpm 2011-04-27 22:39:12.000000000 +0200
++++ boinc/clientgui/res/skins/default/graphic/advanced_link_image.xpm 2011-04-27 22:45:43.000000000 +0200
@@ -1,5 +1,5 @@
/* XPM */
-static char *advanced_link_image_xpm[] = {
diff --git a/debian/patches/calculate_credit_multiplier.patch b/debian/patches/calculate_credit_multiplier.patch
index a62d227..2c30503 100644
--- a/debian/patches/calculate_credit_multiplier.patch
+++ b/debian/patches/calculate_credit_multiplier.patch
@@ -1,7 +1,7 @@
Index: boinc/tools/calculate_credit_multiplier
===================================================================
---- boinc.orig/tools/calculate_credit_multiplier 2010-12-25 16:24:34.000000000 +0100
-+++ boinc/tools/calculate_credit_multiplier 2010-12-25 16:41:50.000000000 +0100
+--- boinc.orig/tools/calculate_credit_multiplier 2011-04-27 22:39:13.000000000 +0200
++++ boinc/tools/calculate_credit_multiplier 2011-04-27 22:45:42.000000000 +0200
@@ -23,7 +23,7 @@
MYSQL="mysql -D $dbname -h $dbhost -u $dbuser -N -B"
MYSQL_R="mysql -D $dbname -h $replica_dbhost -u $dbuser -N -B"
diff --git a/debian/patches/csh2tcsh.patch b/debian/patches/csh2tcsh.patch
index 95f6634..6d8736a 100644
--- a/debian/patches/csh2tcsh.patch
+++ b/debian/patches/csh2tcsh.patch
@@ -1,7 +1,7 @@
Index: boinc/tools/db_query
===================================================================
---- boinc.orig/tools/db_query 2011-03-05 21:39:34.000000000 +0100
-+++ boinc/tools/db_query 2011-03-05 21:40:59.000000000 +0100
+--- boinc.orig/tools/db_query 2011-04-27 22:39:13.000000000 +0200
++++ boinc/tools/db_query 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
-#! /bin/csh
+#!/usr/bin/tcsh
@@ -10,8 +10,8 @@ Index: boinc/tools/db_query
set UNIXDATE = `perl -e 'print time()'`
Index: boinc/tools/watch_tcp
===================================================================
---- boinc.orig/tools/watch_tcp 2011-03-05 21:38:57.000000000 +0100
-+++ boinc/tools/watch_tcp 2011-03-05 21:40:49.000000000 +0100
+--- boinc.orig/tools/watch_tcp 2011-04-27 22:39:13.000000000 +0200
++++ boinc/tools/watch_tcp 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
-#! /bin/csh
+#!/usr/bin/tcsh
diff --git a/debian/patches/generate_less.patch b/debian/patches/generate_less.patch
index bbf3d09..f488682 100644
--- a/debian/patches/generate_less.patch
+++ b/debian/patches/generate_less.patch
@@ -1,7 +1,7 @@
Index: boinc/generate_svn_version.sh
===================================================================
---- boinc.orig/generate_svn_version.sh 2010-12-11 22:41:48.000000000 +0100
-+++ boinc/generate_svn_version.sh 2010-12-11 22:44:17.000000000 +0100
+--- boinc.orig/generate_svn_version.sh 2011-04-27 22:39:13.000000000 +0200
++++ boinc/generate_svn_version.sh 2011-04-27 22:45:42.000000000 +0200
@@ -7,7 +7,9 @@
echo "#define SVN_VERSION_H" >> $TMPFILE
echo "" >> $TMPFILE
diff --git a/debian/patches/pythonPath.patch b/debian/patches/pythonPath.patch
index 0d258ea..80edcff 100644
--- a/debian/patches/pythonPath.patch
+++ b/debian/patches/pythonPath.patch
@@ -1,7 +1,7 @@
Index: boinc/tools/appmgr
===================================================================
---- boinc.orig/tools/appmgr 2011-03-23 11:50:28.293709114 +0100
-+++ boinc/tools/appmgr 2011-03-23 11:51:30.149568157 +0100
+--- boinc.orig/tools/appmgr 2011-04-27 22:39:14.000000000 +0200
++++ boinc/tools/appmgr 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/python
@@ -10,8 +10,8 @@ Index: boinc/tools/appmgr
# Licensed under the same terms as the rest of BOINC.
Index: boinc/tools/dbcheck_files_exist
===================================================================
---- boinc.orig/tools/dbcheck_files_exist 2011-03-23 11:51:46.363434196 +0100
-+++ boinc/tools/dbcheck_files_exist 2011-03-23 11:51:50.766854645 +0100
+--- boinc.orig/tools/dbcheck_files_exist 2011-04-27 22:39:14.000000000 +0200
++++ boinc/tools/dbcheck_files_exist 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
@@ -20,8 +20,8 @@ Index: boinc/tools/dbcheck_files_exist
from Boinc import database, db_mid, boinc_db, configxml
Index: boinc/tools/make_project
===================================================================
---- boinc.orig/tools/make_project 2011-03-23 11:52:00.281602372 +0100
-+++ boinc/tools/make_project 2011-03-23 11:52:04.853000712 +0100
+--- boinc.orig/tools/make_project 2011-04-27 22:39:14.000000000 +0200
++++ boinc/tools/make_project 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
@@ -30,8 +30,8 @@ Index: boinc/tools/make_project
# Creates a new BOINC project.
Index: boinc/tools/parse_config
===================================================================
---- boinc.orig/tools/parse_config 2011-03-23 11:52:12.456000045 +0100
-+++ boinc/tools/parse_config 2011-03-23 11:52:16.171511029 +0100
+--- boinc.orig/tools/parse_config 2011-04-27 22:39:14.000000000 +0200
++++ boinc/tools/parse_config 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
@@ -40,8 +40,8 @@ Index: boinc/tools/parse_config
Index: boinc/tools/update_versions
===================================================================
---- boinc.orig/tools/update_versions 2011-03-23 11:53:02.237448031 +0100
-+++ boinc/tools/update_versions 2011-03-23 11:53:09.988427873 +0100
+--- boinc.orig/tools/update_versions 2011-04-27 22:39:14.000000000 +0200
++++ boinc/tools/update_versions 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
@@ -50,8 +50,8 @@ Index: boinc/tools/update_versions
Index: boinc/tools/upgrade
===================================================================
---- boinc.orig/tools/upgrade 2011-03-23 11:53:16.515568789 +0100
-+++ boinc/tools/upgrade 2011-03-23 11:53:19.887125036 +0100
+--- boinc.orig/tools/upgrade 2011-04-27 22:39:14.000000000 +0200
++++ boinc/tools/upgrade 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
@@ -60,8 +60,8 @@ Index: boinc/tools/upgrade
Index: boinc/tools/xadd
===================================================================
---- boinc.orig/tools/xadd 2011-03-23 11:53:24.670495479 +0100
-+++ boinc/tools/xadd 2011-03-23 11:53:35.349090101 +0100
+--- boinc.orig/tools/xadd 2011-04-27 22:39:14.000000000 +0200
++++ boinc/tools/xadd 2011-04-27 22:45:42.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
diff --git a/debian/patches/texfont_removal.patch b/debian/patches/texfont_removal.patch
index ef62a1f..ec66b37 100644
--- a/debian/patches/texfont_removal.patch
+++ b/debian/patches/texfont_removal.patch
@@ -1,7 +1,7 @@
Index: boinc/api/Makefile.am
===================================================================
---- boinc.orig/api/Makefile.am 2010-07-18 22:04:47.000000000 +0200
-+++ boinc/api/Makefile.am 2010-07-18 22:09:39.000000000 +0200
+--- boinc.orig/api/Makefile.am 2011-04-27 22:39:13.000000000 +0200
++++ boinc/api/Makefile.am 2011-04-27 22:45:42.000000000 +0200
@@ -16,12 +16,12 @@
gutil.cpp \
gutil_text.cpp \
@@ -19,8 +19,8 @@ Index: boinc/api/Makefile.am
graphics2_files += macglutfix.m
Index: boinc/api/txf_util.cpp
===================================================================
---- boinc.orig/api/txf_util.cpp 2010-07-18 22:03:58.000000000 +0200
-+++ boinc/api/txf_util.cpp 2010-07-18 22:08:53.000000000 +0200
+--- boinc.orig/api/txf_util.cpp 2011-04-27 22:39:13.000000000 +0200
++++ boinc/api/txf_util.cpp 2011-04-27 22:45:42.000000000 +0200
@@ -26,14 +26,15 @@
#include "filesys.h"
#include "boinc_api.h"
@@ -41,8 +41,8 @@ Index: boinc/api/txf_util.cpp
//
Index: boinc/api/txf_util.h
===================================================================
---- boinc.orig/api/txf_util.h 2010-07-18 22:07:21.000000000 +0200
-+++ boinc/api/txf_util.h 2010-07-18 22:07:36.000000000 +0200
+--- boinc.orig/api/txf_util.h 2011-04-27 22:39:13.000000000 +0200
++++ boinc/api/txf_util.h 2011-04-27 22:45:42.000000000 +0200
@@ -21,6 +21,8 @@
#ifndef _TXF_UTIL_
#define _TXF_UTIL_
diff --git a/debian/patches/wrapperURL.patch b/debian/patches/wrapperURL.patch
index c6a327c..57913fc 100644
--- a/debian/patches/wrapperURL.patch
+++ b/debian/patches/wrapperURL.patch
@@ -1,7 +1,7 @@
Index: boinc/samples/wrapper/wrapper.cpp
===================================================================
---- boinc.orig/samples/wrapper/wrapper.cpp 2011-01-01 14:39:08.000000000 +0100
-+++ boinc/samples/wrapper/wrapper.cpp 2011-01-01 14:39:24.000000000 +0100
+--- boinc.orig/samples/wrapper/wrapper.cpp 2011-04-27 22:39:13.000000000 +0200
++++ boinc/samples/wrapper/wrapper.cpp 2011-04-27 22:45:42.000000000 +0200
@@ -25,7 +25,7 @@
// - checkpointing
// (at the level of task; or potentially within task)
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list