[SCM] BOINC packaging branch, master, updated. upstream/7.0.47+dfsg-643-ge971682
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Sun Feb 3 13:27:30 UTC 2013
The following commit has been merged in the master branch:
commit e9716826cf222e50e19717f7f565b24fce9f7dcd
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sun Feb 3 14:27:10 2013 +0100
Trying to fix debian bug 646583
diff --git a/debian/changelog b/debian/changelog
index 9556442..8ced4ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
boinc (7.0.47+dfsg-1) UNRELEASED; urgency=low
* New upstream release, l10n updated
+ * Adding path to some files (Closes: #646583 lp: #347651)
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Thu, 31 Jan 2013 22:09:35 +0100
@@ -42,7 +43,8 @@ boinc (7.0.42+dfsg-1) UNRELEASED; urgency=low
boinc (7.0.40+dfsg-1) UNRELEASED; urgency=low
* New upstream release
- * Dropped mac_addresses_cores_in_kfreebsd.patch (file to patch deleted upstream) and ensure_there_is_no_newline_in_passwd.patch (applied upstream)
+ * Dropped mac_addresses_cores_in_kfreebsd.patch (file to patch deleted upstream)
+ and ensure_there_is_no_newline_in_passwd.patch (applied upstream)
* Revised slot_dir_source_trace.patch
* Removed some old patches
@@ -51,7 +53,8 @@ boinc (7.0.40+dfsg-1) UNRELEASED; urgency=low
boinc (7.0.39+dfsg-1) UNRELEASED; urgency=low
* New upstram release
- * Dropped add-missing-test-files.patch and add-missing-stripchart-samples.patch patch already applied upstream
+ * Dropped add-missing-test-files.patch and add-missing-stripchart-samples.patch patch
+ already applied upstream
* Added link time optimisation
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Mon, 26 Nov 2012 00:11:23 +0100
diff --git a/debian/patches/fix-for-debian-bug-646583.patch b/debian/patches/fix-for-debian-bug-646583.patch
new file mode 100644
index 0000000..5b17012
--- /dev/null
+++ b/debian/patches/fix-for-debian-bug-646583.patch
@@ -0,0 +1,28 @@
+Description: This patch claims to fix a bug in boinc-launching from different directories than /var/lib/boinc-client
+Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+---
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug-Debian: http://bugs.debian.org/646583
+Bug-Ubuntu: https://launchpad.net/bugs/347651
+Forwarded: not-needed
+Last-Update: <2013-02-03>
+
+--- boinc-7.0.47+dfsg.orig/lib/common_defs.h
++++ boinc-7.0.47+dfsg/lib/common_defs.h
+@@ -221,11 +221,11 @@ struct VERSION_INFO {
+ };
+
+ #define RUN_MUTEX "BoincSingleInstance"
+-#define CLIENT_AUTH_FILENAME "client_auth.xml"
+-#define LOCK_FILE_NAME "lockfile"
+-#define GRAPHICS_APP_FILENAME "graphics_app"
+-#define GUI_RPC_PASSWD_FILE "gui_rpc_auth.cfg"
+-#define SS_CONFIG_FILE "ss_config.xml"
++#define CLIENT_AUTH_FILENAME "/var/lib/boinc-client/client_auth.xml"
++#define LOCK_FILE_NAME "/var/lib/boinc-client/lockfile"
++#define GRAPHICS_APP_FILENAME "/var/lib/boinc-client/graphics_app"
++#define GUI_RPC_PASSWD_FILE "/var/lib/boinc-client/gui_rpc_auth.cfg"
++#define SS_CONFIG_FILE "/var/lib/boinc-client/ss_config.xml"
+
+ #ifdef _WIN32
+ #define DEFAULT_SS_EXECUTABLE "boincscr.exe"
diff --git a/debian/patches/series b/debian/patches/series
index c732fbb..ee1c8cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -60,3 +60,4 @@ dynamic_libboinc.patch
Missing_libSched.patch
fix-add-exclusive-app.patch
zip_only_built_with_server.patch
+fix-for-debian-bug-646583.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list