fixeria has submitted this change. (
https://gerrit.osmocom.org/c/python/osmo-python-tests/+/41053?usp=email )
Change subject: debian: add python3-osmopy-{libs,utils}.install
......................................................................
debian: add python3-osmopy-{libs,utils}.install
Add debian/*.install files to avoid the need to override Debian's
dh_auto_install or other debhelper rules. This also provides
a cleaner way to install miscellaneous files (e.g. config examples
and systemd unit files) and simplifies maintenance of the packaging.
Change-Id: I94b940789e138341792f40eedeedb73d4e4d421e
---
A debian/python3-osmopy-libs.install
A debian/python3-osmopy-utils.install
D debian/python3-osmopy-utils.osmo-trap2cgi.service
M debian/rules
4 files changed, 3 insertions(+), 12 deletions(-)
Approvals:
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/debian/python3-osmopy-libs.install
b/debian/python3-osmopy-libs.install
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/python3-osmopy-libs.install
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/python3-osmopy-utils.install
b/debian/python3-osmopy-utils.install
new file mode 100644
index 0000000..af0ad3d
--- /dev/null
+++ b/debian/python3-osmopy-utils.install
@@ -0,0 +1,2 @@
+usr/bin/*.py
+contrib/systemd/osmo-trap2cgi.service lib/systemd/system/
diff --git a/debian/python3-osmopy-utils.osmo-trap2cgi.service
b/debian/python3-osmopy-utils.osmo-trap2cgi.service
deleted file mode 120000
index f1cd169..0000000
--- a/debian/python3-osmopy-utils.osmo-trap2cgi.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-trap2cgi.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 84ef719..641186e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,3 @@
%:
dh $@ --with python3 --buildsystem=pybuild
-
-override_dh_auto_install:
- python3 setup.py install --install-layout=deb
--root=$(CURDIR)/debian/python3-osmopy-libs
- rm -rf $(CURDIR)/debian/python3-osmopy-libs/usr/bin
- python3 setup.py install --install-layout=deb
--root=$(CURDIR)/debian/python3-osmopy-utils
- rm -rf $(CURDIR)/debian/python3-osmopy-utils/usr/lib
-
-override_dh_installinit:
- # Install service file with different name than package name:
- #
https://unix.stackexchange.com/questions/306234/is-it-possible-to-install-two-services-for-one-package-using-dh-installinit-how
- dh_installinit --name=osmo-trap2cgi
--
To view, visit
https://gerrit.osmocom.org/c/python/osmo-python-tests/+/41053?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: python/osmo-python-tests
Gerrit-Branch: master
Gerrit-Change-Id: I94b940789e138341792f40eedeedb73d4e4d421e
Gerrit-Change-Number: 41053
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-CC: osmith <osm...@sysmocom.de>
