[boinc] 01/03: Some tweaks, fixing lintian warnings/errors and two bugs

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to annotated tag debian/7.4.22+dfsg-2
in repository boinc.

commit 4e5300d990d29d40e85cc78254b6ffbb79405981
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Sep 29 17:21:44 2014 +0200

    Some tweaks, fixing lintian warnings/errors and two bugs
---
 debian/boinc-client.init                                    |  2 +-
 debian/changelog                                            | 13 +++++++++++++
 debian/control.in                                           |  4 ++--
 ...tml_dirs.patch => addressing_additional_html_dirs.patch} |  0
 debian/patches/series                                       |  2 +-
 debian/rules                                                | 11 ++++++++---
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/debian/boinc-client.init b/debian/boinc-client.init
index 89ccc5b..517ae1e 100644
--- a/debian/boinc-client.init
+++ b/debian/boinc-client.init
@@ -1,7 +1,7 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          boinc boinc-client
-# Required-Start:    $all
+# Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Should-Start:      x11-common network-manager x-display-manager gdm kdm xdm wdm ldm sdm nodm dbus lightdm
 # Should-Stop:       x11-common
diff --git a/debian/changelog b/debian/changelog
index 30bf5a1..4d11174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+boinc (7.4.22+dfsg-2) unstable; urgency=medium
+
+  * Build with NDEBUG to disable massive debug output
+    in ~/.BOINC/stderrgui.txt file (Closes: #763113)
+  * Fix some entries in copyright file for lintian happyness.
+  * Don't require all facilities in boinc-client start,
+    making lintian happy again.
+  [ mdt ]
+  * Add dh-python as B-D
+  * Add libcudart6.0 compatibility
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sun, 28 Sep 2014 18:19:17 +0200
+
 boinc (7.4.22+dfsg-1exp1) experimental; urgency=low
 
   * Upload to experimental, with the boinc-server-* packages.
diff --git a/debian/control.in b/debian/control.in
index cd9ac40..07ade4d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>,
            Guo Yixuan (郭溢譞) <culu.gyx at gmail.com>,
            Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Build-Depends: autoconf,
                automake,
                autotools-dev,
@@ -66,7 +66,7 @@ Package: boinc
 @Section: contrib/net
 @Priority: extra
 @Depends: ${misc:Depends}
- at Recommends: libcuda1 | libcuda-5.0-1 | libcuda-5.5-1 | nvidia-173 | nvidia-current | nvidia-current-updates | nvidia-304 | nvidia-304-updates | nvidia-310 | nvidia-310-updates | nvidia-313-updates | nvidia-319 | nvidia-319-updates | nvidia-331 | nvidia-331-updates | libcuda1-304 | libcuda1-304-updates | libcuda1-331 | libcuda1-331-updates,
+ at Recommends: libcuda1 | libcuda-5.0-1 | libcuda-5.5-1 | libcuda-6.0-1 | libcuda-6.5-1 | nvidia-173 | nvidia-current | nvidia-current-updates | nvidia-304 | nvidia-304-updates | nvidia-310 | nvidia-310-updates | nvidia-313-updates | nvidia-319 | nvidia-319-updates | nvidia-331 | nvidia-331-updates | libcuda1-304 | libcuda1-304-updates | libcuda1-331 | libcuda1-331-updates,
 @            libcudart4 | libcudart5.0 | libcudart5.5 | libcudart6.0
 @Description: metapackage for CUDA-savvy BOINC client and manager
 @ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
diff --git a/debian/patches/addressing_addional_html_dirs.patch b/debian/patches/addressing_additional_html_dirs.patch
similarity index 100%
rename from debian/patches/addressing_addional_html_dirs.patch
rename to debian/patches/addressing_additional_html_dirs.patch
diff --git a/debian/patches/series b/debian/patches/series
index b8d3ceb..cbf0b25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,7 +28,7 @@ de.po.patch
 more_clang_warnings.patch
 #mmap_mem_only.patch
 add-ldflags.patch
-addressing_addional_html_dirs.patch
+addressing_additional_html_dirs.patch
 gui_urls_xml_added_to_Makefile.patch
 file_upload_handler_in_sched_linking.patch
 disable_silent_rules.patch
diff --git a/debian/rules b/debian/rules
index 158676c..1ee69ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,11 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 # Set default flags with dpkg-buildflags
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# Disable WXDEBUG assertions (avoiding e.g. https://bugs.debian.org/763113) -
+# with -DNDEBUG these are quietly dealt with like they were with wx2.8.
+export DEB_CPPFLAGS_MAINT_APPEND := -DNDEBUG
+
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   TYPE_FLAGS = --build $(DEB_HOST_GNU_TYPE)
 else
@@ -354,7 +359,7 @@ override_dh_auto_clean:
 SAMPLES=samples/sleeper/sleeper samples/worker/worker samples/example_app/uc2 samples/wrapper/wrapper
 
 override_dh_auto_install: update-boinc-applinks.1
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	dh_auto_install
 ifeq (,$(ENABLE_SERVER_TEST))
 	echo "I: Installing example scientific applications"
 	mkdir -p $(CURDIR)/debian/tmp/samples
@@ -375,8 +380,8 @@ override_dh_install:
 	dh_install
 
 override_dh_strip:
-	[ -d debian/boinc-dbg ] && dh_strip -a --no-package=-boinc-server-dbg --no-package=boinc-server-maker --no-package=boinc-app-examples --dbg-package=boinc-dbg || true
-	[ -d debian/boinc-server-dbg ] && dh_strip -a -Nboinc -Nlibboinc7 -Nboinc-nvidia-cuda -Nboinc-amd-opencl -Nboinc-client -Nboinc-manager -Nboinc-dev -Nlibboinc-app-dev -Nlib --dbg-package=boinc-server-dbg || true
+	dh_strip -pboinc-server-maker -pboinc-app-examples -pboinc-cgi-stripchart --dbg-package=boinc-server-dbg || true
+	dh_strip --dbg-package=boinc-dbg
 
 override_dh_fixperms:
 	dh_fixperms

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git