[game-data-packager] 01/11: Use debhelper compat level 11

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository game-data-packager.

commit 7e2e64430997cde028d0b05fe7af112764033fd1
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Dec 31 12:06:38 2017 +0000

    Use debhelper compat level 11
    
    * Override dh_installsystemd instead of dh_installinit,
      dh_systemd_enable and dh_systemd_start
    * Rely on dh_installsystemd to install instanced systemd units
    
    Signed-off-by: Simon McVittie <smcv at debian.org>
---
 debian/changelog             |  4 ++++
 debian/compat                |  2 +-
 debian/control               |  2 +-
 debian/quake-server.install  |  1 -
 debian/quake2-server.install |  1 -
 debian/quake3-server.install |  1 -
 debian/rules                 | 13 ++++---------
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 343cab2..9b0b012 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,10 @@ game-data-packager (56) UNRELEASED; urgency=medium
       files from which the template was produced are not available [smcv]
   * Internal changes:
     - Declare compliance with Debian Policy 4.1.3 [smcv]
+    - Use debhelper compat level 11 [smcv]
+      + Override dh_installsystemd instead of dh_installinit,
+        dh_systemd_enable and dh_systemd_start
+      + Rely on dh_installsystemd to install instanced systemd units
 
  -- Simon McVittie <smcv at debian.org>  Thu, 21 Dec 2017 22:43:38 +0100
 
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 5851f1d..11512f3 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Uploaders:
 Build-Depends:
  bash-completion,
  dbus,
- debhelper (>= 10~),
+ debhelper (>= 11~),
  dh-apparmor,
  dh-python,
  imagemagick,
diff --git a/debian/quake-server.install b/debian/quake-server.install
index d096a4d..320919c 100644
--- a/debian/quake-server.install
+++ b/debian/quake-server.install
@@ -1,4 +1,3 @@
-debian/quake-server at .service lib/systemd/system
 debian/q1/server.cfg /etc/quake-server
 usr/games/quake-server
 usr/share/games/game-data-packager-runtime/launch-quake-server.json
diff --git a/debian/quake2-server.install b/debian/quake2-server.install
index 5e1181c..5cb8075 100644
--- a/debian/quake2-server.install
+++ b/debian/quake2-server.install
@@ -1,6 +1,5 @@
 debian/q2/debian_server.cfg      /etc/quake2-server
 debian/q2/demo/debian_server.cfg /etc/quake2-server/demo
-debian/quake2-server at .service lib/systemd/system
 usr/games/quake2-server
 usr/share/games/game-data-packager-runtime/launch-quake2-server.json
 usr/share/games/quake2/gdp_launcher_version.py
diff --git a/debian/quake3-server.install b/debian/quake3-server.install
index 843eb8d..edda235 100644
--- a/debian/quake3-server.install
+++ b/debian/quake3-server.install
@@ -1,5 +1,4 @@
 debian/q3/server.cfg etc/quake3-server
-debian/quake3-server at .service lib/systemd/system
 usr/games/quake3-server
 usr/share/games/game-data-packager-runtime/launch-quake3-server.json
 usr/share/games/quake3/gdp_launcher_version.py
diff --git a/debian/rules b/debian/rules
index 8f3a7d1..c1720fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,15 +62,10 @@ override_dh_install:
 override_dh_installdocs:
 	dh_installdocs -XTODO
 
-override_dh_installinit:
-	dh_installinit -pquake4-server --noscripts
-	dh_installinit -petqw-server --noscripts
-	dh_installinit --remaining-packages
-
-override_dh_systemd_enable:
-	dh_systemd_enable -pquake4-server --no-enable
-	dh_systemd_enable -petqw-server --no-enable
-	dh_systemd_enable --remaining-packages
+override_dh_installsystemd:
+	dh_installsystemd -pquake4-server --no-enable --no-start
+	dh_installsystemd -petqw-server --no-enable --no-start
+	dh_installsystemd --remaining-packages
 
 override_dh_python3:
 	dh_python3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git