From 8ca466da8f319370cb512dba9788ad3e78480817 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 13 Apr 2020 12:05:52 +0200 Subject: [PATCH] debian: use PYBUILD_NAME (#41634) --- debian/combo.install | 2 -- debian/python3-combo.install | 1 - debian/rules | 5 +++++ 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 debian/python3-combo.install diff --git a/debian/combo.install b/debian/combo.install index d5b58cbc..39d10002 100644 --- a/debian/combo.install +++ b/debian/combo.install @@ -1,6 +1,4 @@ -debian/combo.service /lib/systemd/system debian/combo-manage /usr/bin debian/settings.py /etc/combo debian/uwsgi.ini /etc/combo debian/debian_config.py /usr/lib/combo -usr/bin/manage.py /usr/lib/combo diff --git a/debian/python3-combo.install b/debian/python3-combo.install deleted file mode 100644 index 8e72dc99..00000000 --- a/debian/python3-combo.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python3.* diff --git a/debian/rules b/debian/rules index 56d08732..40350b1b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,12 @@ #!/usr/bin/make -f # -*- makefile -*- +export PYBUILD_NAME=combo export PYBUILD_DISABLE=test %: dh $@ --with python3,systemd --buildsystem=pybuild + +override_dh_install: + dh_install + mv $(CURDIR)/debian/python3-combo/usr/bin/manage.py $(CURDIR)/debian/combo/usr/lib/combo/manage.py -- 2.24.0