install systemd units to /usr/lib

Change-Id: I3c7cbeda67f84008a29ae9f77f4086aaf3143090
This commit is contained in:
Georg Brandl
2025-07-24 22:25:18 +02:00
committed by Markus Zolliker
parent 96ef11ef84
commit cbf387ed87
5 changed files with 11 additions and 19 deletions

1
debian/control vendored
View File

@@ -9,7 +9,6 @@ Build-Depends: debhelper-compat (= 13),
python3-setuptools, python3-setuptools,
python3-docutils, python3-docutils,
python3-sphinx, python3-sphinx,
python3-sip-dev,
python3-pyqt5, python3-pyqt5,
python3-mlzlog, python3-mlzlog,
python3-numpy, python3-numpy,

View File

@@ -10,6 +10,6 @@ usr/lib/python3.*/dist-packages/frappy/protocol
usr/lib/python3.*/dist-packages/frappy_core-* usr/lib/python3.*/dist-packages/frappy_core-*
usr/lib/python3.*/dist-packages/frappy/RELEASE-VERSION usr/lib/python3.*/dist-packages/frappy/RELEASE-VERSION
usr/lib/python3.*/dist-packages/frappy_demo usr/lib/python3.*/dist-packages/frappy_demo
lib/systemd usr/lib/systemd
var/log/frappy var/log/frappy
etc/frappy/generalConfig.cfg etc/generalConfig.cfg etc/frappy/generalConfig.cfg

16
debian/rules vendored
View File

@@ -1,19 +1,13 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
export PYBUILD_NAME=frappy # needed for bookworm compatibility!
export PYBUILD_TEST_PYTEST=1 override_dh_installsystemd:
ln -s usr/lib debian/frappy-core/lib
override_dh_install: dh_installsystemd
rmdir debian/tmp rm debian/frappy-core/lib
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
%: %:
dh $@ --with python3 --buildsystem=pybuild dh $@ --with python3 --buildsystem=pybuild

View File

@@ -35,7 +35,7 @@ def main():
generalConfig.init() generalConfig.init()
config_dir = generalConfig['confdir'] 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' wants_dir = normal_dir + '/frappy.target.wants'
all_servers = [base[:-4] if base.endswith('_cfg') else base for (base, ext) in all_servers = [base[:-4] if base.endswith('_cfg') else base for (base, ext) in

View File

@@ -60,10 +60,9 @@ setup(
], ],
data_files=[ data_files=[
('/lib/systemd/system-generators', ['etc/frappy-generator']), ('/usr/lib/systemd/system-generators', ['etc/frappy-generator']),
('/lib/systemd/system', ['etc/frappy@.service', ('/usr/lib/systemd/system', ['etc/frappy@.service',
'etc/frappy.target', 'etc/frappy.target']),
]),
('/var/log/frappy', []), ('/var/log/frappy', []),
], ],
scripts=scripts, scripts=scripts,