[boinc] 04/05: Patch refresh
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue May 3 18:41:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc.
commit 846cb4a783a94119c6fd54706c7f4e46a1ff3cf4
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue May 3 19:56:12 2016 +0200
Patch refresh
---
debian/changelog | 5 +++-
debian/patches/MainDocumentWarnings.patch | 6 ++---
.../dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch | 30 ----------------------
debian/patches/series | 1 -
4 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9bc21a9..096dd4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,7 @@
-boinc (7.6.31+dfsg-6exp2) experimental; urgency=medium
+boinc (7.6.32+dfsg-1) unstable; urgency=medium
+
+ [ Gianfranco Costamagna ]
+ * New upstream release.
[ Steffen Moeller ]
* Drop debug packages.
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index d93eeb4..828a1fa 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
-@@ -1667,7 +1667,6 @@
+@@ -1658,7 +1658,6 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -10,7 +10,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
char currentDir[1024];
char thePIDbuf[20];
int id, iRetVal;
-@@ -1675,12 +1674,13 @@
+@@ -1666,12 +1665,13 @@
if (g_use_sandbox) {
snprintf(thePIDbuf, sizeof(thePIDbuf), "%d", pid);
@@ -30,7 +30,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1690,6 +1690,10 @@
+@@ -1681,6 +1681,10 @@
0,
id
);
diff --git a/debian/patches/dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch b/debian/patches/dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch
deleted file mode 100644
index 1186a1d..0000000
--- a/debian/patches/dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From dcd9eb3c2ec1f729b12983bf5ee6395565871a22 Mon Sep 17 00:00:00 2001
-From: Christian Beer <christian.beer at aei.mpg.de>
-Date: Tue, 5 Apr 2016 07:43:22 +0200
-Subject: [PATCH] Client: fix nvidia_driver_version dlopen()
-
-On Debian only the versioned object can be opened. It usually is a symlink to the actual file.
----
- client/gpu_nvidia.cpp | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/client/gpu_nvidia.cpp b/client/gpu_nvidia.cpp
-index 5ca1640..b7a8f52 100644
---- a/client/gpu_nvidia.cpp
-+++ b/client/gpu_nvidia.cpp
-@@ -105,8 +105,13 @@ static int nvidia_driver_version() {
- void *handle = NULL;
- char driver_string[81];
-
-- handle = dlopen("libnvidia-ml.so", RTLD_NOW);
-- if (!handle) goto end;
-+ handle = dlopen("libnvidia-ml.so.1", RTLD_NOW);
-+ if (!handle) {
-+ handle = dlopen("libnvidia-ml.so", RTLD_NOW);
-+ if (!handle) {
-+ goto end;
-+ }
-+ }
-
- nvml_driver = (int(*)(char *, unsigned int)) dlsym(handle, "nvmlSystemGetDriverVersion");
- nvml_init = (int(*)(void)) dlsym(handle, "nvmlInit");
diff --git a/debian/patches/series b/debian/patches/series
index bd4df55..a08c437 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,5 +29,4 @@ file_upload_handler_in_sched_linking.patch
disable_silent_rules.patch
envargs.patch
fix-underlinking.patch
-dcd9eb3c2ec1f729b12983bf5ee6395565871a22.patch
static_scientific_apps.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list