From cbf387ed87f29478ec9c30c82533a866c9bc67fa Mon Sep 17 00:00:00 2001
From: Georg Brandl <g.brandl@fz-juelich.de>
Date: Thu, 24 Jul 2025 22:25:18 +0200
Subject: [PATCH] install systemd units to /usr/lib

Change-Id: I3c7cbeda67f84008a29ae9f77f4086aaf3143090
---
 debian/control             |  1 -
 debian/frappy-core.install |  4 ++--
 debian/rules               | 16 +++++-----------
 etc/frappy-generator       |  2 +-
 setup.py                   |  7 +++----
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index a623c9c5..8b56892d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: debhelper-compat (= 13),
  python3-setuptools,
  python3-docutils,
  python3-sphinx,
- python3-sip-dev,
  python3-pyqt5,
  python3-mlzlog,
  python3-numpy,
diff --git a/debian/frappy-core.install b/debian/frappy-core.install
index 655b5ba3..6a991ba9 100644
--- a/debian/frappy-core.install
+++ b/debian/frappy-core.install
@@ -10,6 +10,6 @@ usr/lib/python3.*/dist-packages/frappy/protocol
 usr/lib/python3.*/dist-packages/frappy_core-*
 usr/lib/python3.*/dist-packages/frappy/RELEASE-VERSION
 usr/lib/python3.*/dist-packages/frappy_demo
-lib/systemd
+usr/lib/systemd
 var/log/frappy
-etc/frappy/generalConfig.cfg
+etc/generalConfig.cfg etc/frappy/generalConfig.cfg
diff --git a/debian/rules b/debian/rules
index f68c4a36..606fdd80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,13 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export PYBUILD_NAME=frappy
-export PYBUILD_TEST_PYTEST=1
-
-override_dh_install:
-	rmdir debian/tmp
-	mv debian/python3-frappy debian/tmp
-
-	install -m644 -Dt debian/tmp/etc/frappy etc/generalConfig.cfg
-	dh_install -i -O--buildsystem=pybuild
-	dh_missing --fail-missing
+# needed for bookworm compatibility!
+override_dh_installsystemd:
+	ln -s usr/lib debian/frappy-core/lib
+	dh_installsystemd
+	rm debian/frappy-core/lib
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
diff --git a/etc/frappy-generator b/etc/frappy-generator
index fd47e4de..0b044d78 100755
--- a/etc/frappy-generator
+++ b/etc/frappy-generator
@@ -35,7 +35,7 @@ def main():
     generalConfig.init()
     config_dir = generalConfig['confdir']
 
-    frappy_unit = '/lib/systemd/system/frappy@.service'
+    frappy_unit = '/usr/lib/systemd/system/frappy@.service'
     wants_dir = normal_dir + '/frappy.target.wants'
 
     all_servers = [base[:-4] if base.endswith('_cfg') else base for (base, ext) in
diff --git a/setup.py b/setup.py
index e005d36e..613aac4a 100755
--- a/setup.py
+++ b/setup.py
@@ -60,10 +60,9 @@ setup(
     ],
 
     data_files=[
-        ('/lib/systemd/system-generators', ['etc/frappy-generator']),
-        ('/lib/systemd/system', ['etc/frappy@.service',
-                                 'etc/frappy.target',
-                                 ]),
+        ('/usr/lib/systemd/system-generators', ['etc/frappy-generator']),
+        ('/usr/lib/systemd/system', ['etc/frappy@.service',
+                                     'etc/frappy.target']),
         ('/var/log/frappy', []),
     ],
     scripts=scripts,