summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-06-15 14:59:29 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-06-15 14:59:41 +0200
commitd9cf98ea39cb47ddfed448e98c4ae9d54ea76660 (patch)
tree33e52bff8c7fd0e38d13f579576806a8d3608e3c
parent0c315cf49cce41935ce1761cba23f1e34b29589b (diff)
downloadtde-packaging-d9cf98ea39cb47ddfed448e98c4ae9d54ea76660.tar.gz
tde-packaging-d9cf98ea39cb47ddfed448e98c4ae9d54ea76660.zip
DEB tde-guidance: Prefer dh_python2 before dh_pysupport.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 4db7858385faebfeb51db85ca4a4fd64028b08b3)
-rwxr-xr-xdebian/_base/applications/tde-guidance/debian/rules2
-rwxr-xr-x[-rw-r--r--]ubuntu/_base/applications/tde-guidance/debian/rules2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/_base/applications/tde-guidance/debian/rules b/debian/_base/applications/tde-guidance/debian/rules
index 656eac6d4..b4a195a5c 100755
--- a/debian/_base/applications/tde-guidance/debian/rules
+++ b/debian/_base/applications/tde-guidance/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport)
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
DEB_PYTHON2_MODULE_PACKAGES=tde-guidance-trinity guidance-backends-trinity
PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
diff --git a/ubuntu/_base/applications/tde-guidance/debian/rules b/ubuntu/_base/applications/tde-guidance/debian/rules
index 656eac6d4..b4a195a5c 100644..100755
--- a/ubuntu/_base/applications/tde-guidance/debian/rules
+++ b/ubuntu/_base/applications/tde-guidance/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport)
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
DEB_PYTHON2_MODULE_PACKAGES=tde-guidance-trinity guidance-backends-trinity
PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity