Install only upstream systemd unit

diff --git a/debian/autorandr.service b/debian/autorandr.service
deleted file mode 100644 (file)
index 4fef1c6..0000000
--- a/debian/autorandr.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=autorandr execution hook
-After=sleep.target
-StartLimitIntervalSec=5
-StartLimitBurst=1
-
-[Service]
-ExecStart=/usr/bin/autorandr --batch --change --default default
-Type=oneshot
-RemainAfterExit=false
-
-[Install]
-WantedBy=sleep.target

diff --git a/debian/changelog b/debian/changelog
index 6a09d9fe34a775354a2ac88f38fdd42b3f1147e4..936d137fee468e28d0d253e169119023d27d96e8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,13 @@ autorandr (1.13.3-1) unstable; urgency=medium
   * Use StartLimitIntervalSec again, as even oldoldstable has systemd >>
     230
   * Install things from contrib as examples
+  * Add dependencies on pkgconf and systemd-dev so the unit file location
+    can be guessed by default.
 
- -- Don Armstrong <don@debian.org>  Fri, 28 Apr 2023 16:26:14 -0700
+  [Helmut Grohne]
+  * Install systemd unit only once. (Closes: #1054477)
+
+ -- Don Armstrong <don@debian.org>  Fri, 27 Oct 2023 21:11:41 -0700
 
 autorandr (1.12.1-1) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index a399484ad571d09abf3ace8d3ce23d71df136259..f091eb8738d6456d166034f7cfd32c7cd7b8f271 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: autorandr
 Section: x11
 Priority: optional
 Maintainer: Don Armstrong <don@debian.org>
-Build-Depends: debhelper-compat (= 13), dh-python, python3-all, python3-setuptools, desktop-file-utils
+Build-Depends: debhelper-compat (= 13), dh-python, python3-all, python3-setuptools, desktop-file-utils, systemd-dev, pkgconf
 Standards-Version: 4.6.1
 Homepage: https://github.com/phillipberndt/autorandr
 Vcs-Git: https://salsa.debian.org/debian/autorandr.git

diff --git a/debian/rules b/debian/rules
index f7d7e4c365ad72b81f760e4e72a15b5569c7ed49..5eee5ead4d0049526d3d22c0d00ff4721dcc5177 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,13 +5,11 @@
 
 override_dh_auto_build:
        dh_auto_build -- UDEV_RULES_DIR=/lib/udev/rules.d \
-               SYSTEMD_UNIT_DIR=/lib/systemd/system \
                BASH_COMPLETIONS_DIR=/usr/share/bash-completion/completions \
                PM_SLEEPHOOKS_DIR=/etc/pm/sleep.d/
 
 override_dh_auto_install:
        dh_auto_install -- UDEV_RULES_DIR=/lib/udev/rules.d \
-               SYSTEMD_UNIT_DIR=/lib/systemd/system \
                BASH_COMPLETIONS_DIR=/usr/share/bash-completion/completions \
                PM_SLEEPHOOKS_DIR=/etc/pm/sleep.d/
        install -D -m 755 contrib/pm-utils/40autorandr debian/autorandr/etc/pm/sleep.d/40autorandr