r602 - in /branches/experimental/boinc: client/ debian/
debian/patches/ lib/
fst-guest at users.alioth.debian.org
fst-guest at users.alioth.debian.org
Fri Mar 16 18:22:22 CET 2007
Author: fst-guest
Date: Fri Mar 16 17:22:20 2007
New Revision: 602
URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=602
Log:
* Changed from dpatch to the quilt patch system.
* Added debian/patches/README.patches which I've taken from the gquilt package.
Added:
branches/experimental/boinc/debian/patches/001_amd64_disable_platform_reset.patch
branches/experimental/boinc/debian/patches/002_sched_makefile.am.patch
branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch
branches/experimental/boinc/debian/patches/004_exclude_sea.patch
branches/experimental/boinc/debian/patches/101_gcc_4.3_fixes.patch
branches/experimental/boinc/debian/patches/README.patches
branches/experimental/boinc/debian/patches/series
Removed:
branches/experimental/boinc/client/
branches/experimental/boinc/debian/patches/00list
branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch
branches/experimental/boinc/debian/patches/04_sched-makefile.am.dpatch
branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch
branches/experimental/boinc/debian/patches/10_exclude-sea.dpatch
branches/experimental/boinc/lib/
Modified:
branches/experimental/boinc/debian/changelog
branches/experimental/boinc/debian/control
branches/experimental/boinc/debian/rules
Modified: branches/experimental/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/changelog?rev=602&op=diff
==============================================================================
--- branches/experimental/boinc/debian/changelog (original)
+++ branches/experimental/boinc/debian/changelog Fri Mar 16 17:22:20 2007
@@ -7,7 +7,6 @@
which is required for the bandwith-throttling feature. Also removed the
alternative on libcurl-ssl-dev because this was only added to aid
backporting BOINC to sarge but sarge has only libcurl3-dev/7.13.2.
- - Added XS-Vcs-Browser field to the source stanza.
- Added libxml2-utils to Build-Depends for xmllint which is used in the
unit-test target in debian/rules.
* debian/rules:
@@ -16,8 +15,10 @@
- Since backporting to sarge is not possible any more, also removed the
compatibility code for sarge's version of dpkg-architecture.
* debian/patches/:
- - Updated 01_amd64-disable-platform-reset.dpatch for the new release.
- - Updated 07_use-sensible-browser.dpatch for the new release.
+ - Updated 001_amd64_disable_platform_reset.patch for the new release.
+ - Updated 003_use_sensible-browser.patch for the new release.
+ - Added 101_gcc_4.3_fixes.patch that fixes a FTBFS with GCC 4.3, thanks to
+ Martin Michlmayr <tbm at cyrius.com>. (closes: #413307)
* debian/boinc-dev.{install,links}:
- Don't install lib/error_numbers.h, lib/gui_rpc_client.h,
lib/std_fixes.h, config.h and version.h manually because they are now
@@ -41,11 +42,10 @@
* Added ca-certificates to boinc-client's Depends field and create the
ca-bundle.crt symlink (which points to /etc/ssl/certs/ca-certificates) in
the BOINC data directory in boinc-client.postinst.
- * Fixed FTBFS with GCC 4.3, thanks to Martin Michlmayr <tbm at cyrius.com>.
- (closes: #413307)
* debian/boinc-client.README.Debian: Added paragraph "Mass deployment of
boinc-client that automatically attach to an Account Manager" which points
(at the moment) to T-Bone's post on the pkg-boinc-devel mailing list.
+ * Changed from dpatch to the quilt patch system.
+++ Changes unsuitable for the trunk branch:
@@ -57,7 +57,7 @@
* debian/boinc-server.README.Debian: Added README.Debian which is at the
moment only a pointer to http://wiki.debian.org/BOINC/Server.
- -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 15 Mar 2007 09:37:42 +0100
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Fri, 16 Mar 2007 18:13:27 +0100
boinc (5.4.11-5) unstable; urgency=low
Modified: branches/experimental/boinc/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/control?rev=602&op=diff
==============================================================================
--- branches/experimental/boinc/debian/control (original)
+++ branches/experimental/boinc/debian/control Fri Mar 16 17:22:20 2007
@@ -4,7 +4,7 @@
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <frank at thomas-alfeld.de>, Christoph Martin <christoph.martin at uni-mainz.de>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), dpatch, python-support (>= 0.4.2), po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), libxml2-utils, libmysqlclient15-dev, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.15.5), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), python-support (>= 0.4.2), po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), libxml2-utils, libmysqlclient15-dev, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.15.5), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev
XS-Vcs-Svn: svn://svn.debian.org/pkg-boinc/trunk/boinc/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/
Added: branches/experimental/boinc/debian/patches/001_amd64_disable_platform_reset.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/001_amd64_disable_platform_reset.patch?rev=602&op=file
==============================================================================
--- branches/experimental/boinc/debian/patches/001_amd64_disable_platform_reset.patch (added)
+++ branches/experimental/boinc/debian/patches/001_amd64_disable_platform_reset.patch Fri Mar 16 17:22:20 2007
@@ -1,0 +1,26 @@
+See these mailing lists post for a description of this patch:
+http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2006-August/000352.html
+http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2006-August/000350.html
+
+Index: boinc-5.8.15/client/client_state.C
+===================================================================
+--- boinc-5.8.15.orig/client/client_state.C 2007-03-16 18:07:20.000000000 +0100
++++ boinc-5.8.15/client/client_state.C 2007-03-16 18:08:13.000000000 +0100
+@@ -318,6 +318,9 @@
+ // This could happen e.g. if user copies files from PPC to Intel Mac
+ //
+ if (statefile_platform_name.size() && strcmp(platform_name, statefile_platform_name.c_str())) {
++#ifdef __x86_64__
++ platform_name = strdup(statefile_platform_name.c_str());
++#else
+ msg_printf(NULL, MSG_INFO,
+ "Platform changed from %s to %s - resetting projects",
+ statefile_platform_name.c_str(), platform_name
+@@ -326,6 +329,7 @@
+ p = projects[i];
+ reset_project(p);
+ }
++#endif
+ }
+
+ #if (defined(SANDBOX) && ! defined(_WIN32))
Added: branches/experimental/boinc/debian/patches/002_sched_makefile.am.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/002_sched_makefile.am.patch?rev=602&op=file
==============================================================================
--- branches/experimental/boinc/debian/patches/002_sched_makefile.am.patch (added)
+++ branches/experimental/boinc/debian/patches/002_sched_makefile.am.patch Fri Mar 16 17:22:20 2007
@@ -1,0 +1,14 @@
+Index: boinc-5.8.15/sched/Makefile.am
+===================================================================
+--- boinc-5.8.15.orig/sched/Makefile.am 2007-03-16 18:07:19.000000000 +0100
++++ boinc-5.8.15/sched/Makefile.am 2007-03-16 18:08:15.000000000 +0100
+@@ -2,7 +2,8 @@
+
+ include $(top_srcdir)/Makefile.incl
+
+-noinst_PROGRAMS = \
++scheddir=$(libdir)/BOINC/sched
++sched_PROGRAMS = \
+ cgi \
+ feeder \
+ db_dump \
Added: branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch?rev=602&op=file
==============================================================================
--- branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch (added)
+++ branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch Fri Mar 16 17:22:20 2007
@@ -1,0 +1,17 @@
+This patch is Debian specific. Don't use it for non Debian packages. The
+program "sensible-browser" is part of the essential package debianutils.
+
+Index: boinc-5.8.15/clientgui/hyperlink.cpp
+===================================================================
+--- boinc-5.8.15.orig/clientgui/hyperlink.cpp 2007-03-16 18:07:18.000000000 +0100
++++ boinc-5.8.15/clientgui/hyperlink.cpp 2007-03-16 18:08:16.000000000 +0100
+@@ -171,7 +171,8 @@
+ }
+
+ void wxHyperLink::ExecuteLink (const wxString &strLink) {
+- if (!wxLaunchDefaultBrowser(strLink)) {
++ wxString cmd = wxT("sensible-browser ") + strLink;
++ if (!::wxExecute(cmd, wxEXEC_ASYNC)) {
+ wxString strDialogTitle = wxEmptyString;
+ wxString strDialogMessage = wxEmptyString;
+
Added: branches/experimental/boinc/debian/patches/004_exclude_sea.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/004_exclude_sea.patch?rev=602&op=file
==============================================================================
--- branches/experimental/boinc/debian/patches/004_exclude_sea.patch (added)
+++ branches/experimental/boinc/debian/patches/004_exclude_sea.patch Fri Mar 16 17:22:20 2007
@@ -1,0 +1,13 @@
+Index: boinc-5.8.15/Makefile.am
+===================================================================
+--- boinc-5.8.15.orig/Makefile.am 2007-03-16 18:07:17.000000000 +0100
++++ boinc-5.8.15/Makefile.am 2007-03-16 18:08:16.000000000 +0100
+@@ -17,7 +17,7 @@
+ endif
+
+ if BUILD_CLIENTGUI
+- CLIENTGUI_SUBDIRS = clientgui sea
++ CLIENTGUI_SUBDIRS = clientgui
+ endif
+
+ # ORDER MATTERS below. One must build dependencies FIRST, then things
Added: branches/experimental/boinc/debian/patches/101_gcc_4.3_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/101_gcc_4.3_fixes.patch?rev=602&op=file
==============================================================================
--- branches/experimental/boinc/debian/patches/101_gcc_4.3_fixes.patch (added)
+++ branches/experimental/boinc/debian/patches/101_gcc_4.3_fixes.patch Fri Mar 16 17:22:20 2007
@@ -1,0 +1,24 @@
+Index: boinc-5.8.15/client/client_state.h
+===================================================================
+--- boinc-5.8.15.orig/client/client_state.h 2007-03-16 18:09:44.000000000 +0100
++++ boinc-5.8.15/client/client_state.h 2007-03-16 18:09:54.000000000 +0100
+@@ -21,6 +21,7 @@
+ #define _CLIENT_STATE_
+
+ #ifndef _WIN32
++#include <string>
+ #include <vector>
+ #include <ctime>
+ #endif
+Index: boinc-5.8.15/lib/boinc_cmd.C
+===================================================================
+--- boinc-5.8.15.orig/lib/boinc_cmd.C 2007-03-16 18:09:59.000000000 +0100
++++ boinc-5.8.15/lib/boinc_cmd.C 2007-03-16 18:10:20.000000000 +0100
+@@ -35,6 +35,7 @@
+ #endif
+
+ #include <vector>
++#include <string>
+ using std::vector;
+ using std::string;
+
Added: branches/experimental/boinc/debian/patches/README.patches
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/README.patches?rev=602&op=file
==============================================================================
--- branches/experimental/boinc/debian/patches/README.patches (added)
+++ branches/experimental/boinc/debian/patches/README.patches Fri Mar 16 17:22:20 2007
@@ -1,0 +1,9 @@
+0xx patches are debian-specific build patches, that have not and will
+not be proposed upstream; they don't need to be.
+
+If there are any:
+
+1xx patches have been proposed upstream and accepted; these can safely
+be deleted when updating to a new release.
+
+2xx patches are awaiting the approval of upstream.
Added: branches/experimental/boinc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/series?rev=602&op=file
==============================================================================
--- branches/experimental/boinc/debian/patches/series (added)
+++ branches/experimental/boinc/debian/patches/series Fri Mar 16 17:22:20 2007
@@ -1,0 +1,5 @@
+001_amd64_disable_platform_reset.patch
+002_sched_makefile.am.patch
+003_use_sensible-browser.patch
+004_exclude_sea.patch
+101_gcc_4.3_fixes.patch
Modified: branches/experimental/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/rules?rev=602&op=diff
==============================================================================
--- branches/experimental/boinc/debian/rules (original)
+++ branches/experimental/boinc/debian/rules Fri Mar 16 17:22:20 2007
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
More information about the pkg-boinc-commits
mailing list