[neon/neon/settings/Neon/release-lts] debian: move to compat 12 and new compat system

[Harald Sitter]

Git commit 2ee305b2c9440bfdef46597a51030d35b8ae82ce by Harald Sitter.
Committed on 09/10/2020 at 12:43.
Pushed by sitter into branch 'Neon/release-lts'.

move to compat 12 and new compat system

rewrite rules for changed behavior wrt systemd.

dh_inistallinit no longer handles systemd in compat>10
there's a new installsystemd which merges the previous _enable and
_start scripts

D  +0    -1    debian/compat
M  +4    -2    debian/control
M  +8    -17   debian/rules

https://invent.kde.org/neon/neon/settings/commit/2ee305b2c9440bfdef46597a51030d35b8ae82ce

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 199d367..33dc9b7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: neon-settings
 Section: kde
 Priority: optional
 Maintainer: KDE neon <neon at kde.org>
-Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.9.2ubuntu14)
+Build-Depends: debhelper (>= 9),
+               debhelper-compat (= 12),
+               pkg-kde-tools (>= 0.9.2ubuntu14)
 Standards-Version: 3.9.7
 Vcs-Browser: http://packaging.neon.kde.org/cgit/neon/settings.git/
 Vcs-Git: git://packaging.neon.kde.org/neon/settings
@@ -27,7 +29,7 @@ Description: Settings and artwork for KDE neon Korean Edition
 
 Package: neon-settings-pinebook
 Architecture: all
-Depends: neon-settings-2, acpid, python3
+Depends: acpid, neon-settings-2, python3
 Description: Settings and artwork for KDE neon Pinebook
  This package contains settings used by KDE neon Pinebook.
 
diff --git a/debian/rules b/debian/rules
index 98d690c..2fe9fa9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,24 +6,15 @@
 export DH_VERBOSE=1
 
 %:
-	dh $@ --with systemd
+	dh $@
 
 override_dh_usrlocal:
 	true
 
-override_dh_systemd_enable:
-	dh_systemd_enable --name neon-update-calamares-groups
-	dh_systemd_enable --name neon-flathub
-	dh_systemd_enable --name neon-packagekit-offline-update-policy
-	dh_systemd_enable --name neon-packagekit-online-update-policy
-
-override_dh_systemd_start:
-	dh_systemd_start --no-start neon-update-calamares-groups.service
-	dh_systemd_start --no-start neon-flathub.service
-	dh_systemd_start --no-start neon-packagekit-offline-update-policy.service
-	dh_systemd_start --no-start neon-packagekit-online-update-policy.service
-
-override_dh_installinit:
-	dh_installinit --noscripts --name neon-update-calamares-groups
-	dh_installinit --noscripts --name neon-packagekit-offline-update-policy
-	dh_installinit --noscripts --name neon-packagekit-online-update-policy
+override_dh_installsystemd:
+	dh_installsystemd --no-start --name=neon-update-calamares-groups
+	# restart to ensure flathub is enabled if applicable since we updated there
+	# should be a network connection right now
+	dh_installsystemd --no-start --restart-after-upgrade --name=neon-flathub
+	dh_installsystemd --no-start --name=neon-packagekit-offline-update-policy
+	dh_installsystemd --no-start --name=neon-packagekit-online-update-policy