[SCM] quassel packaging branch, master, updated. debian/1%0.12.4-2-10-ga4bf6be

Felix Geyer fgeyer at moszumanska.debian.org
Thu Feb 8 20:37:24 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/quassel.git;a=commitdiff;h=b25f675

The following commit has been merged in the master branch:
commit b25f6757f967c733d50d98db6de78b481dac94db
Author: Felix Geyer <fgeyer at debian.org>
Date:   Tue Feb 6 19:37:37 2018 +0100

    Switch to debhelper compat level 10.
---
 debian/changelog | 1 +
 debian/compat    | 2 +-
 debian/control   | 3 +--
 debian/rules     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08fbdff..e4a7b94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ quassel (1:0.12.4-3) UNRELEASED; urgency=medium
   * Fix the OpenSSL detection.
     - Add Fix_the_ssl_check_with_Qt_5.6_and_gcc_5.patch,
       cherry picked from upstream.
+  * Switch to debhelper compat level 10.
 
  -- Felix Geyer <fgeyer at debian.org>  Thu, 20 Oct 2016 20:42:43 +0200
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index c6ad05d..74e3843 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,8 @@ Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>,
            Felix Geyer <fgeyer at debian.org>,
            Scott Kitterman <scott at kitterman.com>
-Build-Depends: debhelper (>= 9.20130504~),
+Build-Depends: debhelper (>= 10~),
                cmake,
-               dh-systemd,
                libqca-qt5-2-dev,
                zlib1g-dev,
                qttools5-dev-tools,
diff --git a/debian/rules b/debian/rules
index 81d41b7..4930330 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 %:
-	dh $@ --parallel --with systemd
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DEMBED_DATA=OFF -DUSE_QT5=ON -DWITH_KDE=ON
@@ -17,7 +17,7 @@ ifneq (,$(filter quassel-data, $(shell dh_listpackages)))
 endif
 
 override_dh_installinit:
-	dh_installinit -r --error-handler=exit --name=quasselcore
+	dh_installinit --no-stop-on-upgrade --no-restart-after-upgrade --error-handler=exit --name=quasselcore
 
 override_dh_systemd_enable:
 	dh_systemd_enable --name=quasselcore

-- 
quassel packaging



More information about the pkg-kde-commits mailing list