229a6300 | 2019-06-15 12:56:46 | Slávek Banko |
DEB pytdeextensions: Prefer dh_python2 before dh_pysupport. Signed-off-by: Slávek Banko <slavek.banko@...> |
||
M debian/_base/libraries/pytdeextensions/debian/rules M ubuntu/_base/libraries/pytdeextensions/debian/rules |
||
debian/_base/libraries/pytdeextensions/debian/rulesdiff --git a/debian/_base/libraries/pytdeextensions/debian/rules b/debian/_base/libraries/pytdeextensions/debian/rules index 188238d..e4c4337 100755 --- a/debian/_base/libraries/pytdeextensions/debian/rules +++ b/debian/_base/libraries/pytdeextensions/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=pytdeextensions-trinity libpythonize0-trinity include /usr/share/cdbs/1/rules/debhelper.mk ubuntu/_base/libraries/pytdeextensions/debian/rulesdiff --git a/ubuntu/_base/libraries/pytdeextensions/debian/rules b/ubuntu/_base/libraries/pytdeextensions/debian/rules index 188238d..e4c4337 100755 --- a/ubuntu/_base/libraries/pytdeextensions/debian/rules +++ b/ubuntu/_base/libraries/pytdeextensions/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=pytdeextensions-trinity libpythonize0-trinity include /usr/share/cdbs/1/rules/debhelper.mk |
||
4db78583 | 2019-06-15 12:59:29 | Slávek Banko |
DEB tde-guidance: Prefer dh_python2 before dh_pysupport. Signed-off-by: Slávek Banko <slavek.banko@...> |
||
M debian/_base/applications/tde-guidance/debian/rules M ubuntu/_base/applications/tde-guidance/debian/rules |
||
debian/_base/applications/tde-guidance/debian/rulesdiff --git a/debian/_base/applications/tde-guidance/debian/rules b/debian/_base/applications/tde-guidance/debian/rules index 656eac6..b4a195a 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 ubuntu/_base/applications/tde-guidance/debian/rulesdiff --git a/ubuntu/_base/applications/tde-guidance/debian/rules b/ubuntu/_base/applications/tde-guidance/debian/rules old mode 100644 new mode 100755 index 656eac6..b4a195a --- 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 |
||
6fd5313a | 2019-06-15 13:01:18 | Slávek Banko |
DEB fusion-icon: Prefer dh_python2 before dh_pysupport. Signed-off-by: Slávek Banko <slavek.banko@...> |
||
M debian/_base/applications/fusion-icon/debian/rules M ubuntu/_base/applications/fusion-icon/debian/rules |
||
debian/_base/applications/fusion-icon/debian/rulesdiff --git a/debian/_base/applications/fusion-icon/debian/rules b/debian/_base/applications/fusion-icon/debian/rules index f1b2fcb..4f2025e 100755 --- a/debian/_base/applications/fusion-icon/debian/rules +++ b/debian/_base/applications/fusion-icon/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) DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity ubuntu/_base/applications/fusion-icon/debian/rulesdiff --git a/ubuntu/_base/applications/fusion-icon/debian/rules b/ubuntu/_base/applications/fusion-icon/debian/rules index f1b2fcb..4f2025e 100755 --- a/ubuntu/_base/applications/fusion-icon/debian/rules +++ b/ubuntu/_base/applications/fusion-icon/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) DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity |
d9cf98ea | 2019-06-15 12:59:41 | Slávek Banko |
DEB tde-guidance: Prefer dh_python2 before dh_pysupport. Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit 4db7858385faebfeb51db85ca4a4fd64028b08b3) |
||
M debian/_base/applications/tde-guidance/debian/rules M ubuntu/_base/applications/tde-guidance/debian/rules |
||
debian/_base/applications/tde-guidance/debian/rulesdiff --git a/debian/_base/applications/tde-guidance/debian/rules b/debian/_base/applications/tde-guidance/debian/rules index 656eac6..b4a195a 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 ubuntu/_base/applications/tde-guidance/debian/rulesdiff --git a/ubuntu/_base/applications/tde-guidance/debian/rules b/ubuntu/_base/applications/tde-guidance/debian/rules old mode 100644 new mode 100755 index 656eac6..b4a195a --- 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 |
||
bc63811e | 2019-06-15 13:01:31 | Slávek Banko |
DEB fusion-icon: Prefer dh_python2 before dh_pysupport. Signed-off-by: Slávek Banko <slavek.banko@...> (cherry picked from commit 6fd5313abbfb2c3d60b2c5ca01815be41bef34a7) |
||
M debian/_base/applications/fusion-icon/debian/rules M ubuntu/_base/applications/fusion-icon/debian/rules |
||
debian/_base/applications/fusion-icon/debian/rulesdiff --git a/debian/_base/applications/fusion-icon/debian/rules b/debian/_base/applications/fusion-icon/debian/rules index f1b2fcb..4f2025e 100755 --- a/debian/_base/applications/fusion-icon/debian/rules +++ b/debian/_base/applications/fusion-icon/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) DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity ubuntu/_base/applications/fusion-icon/debian/rulesdiff --git a/ubuntu/_base/applications/fusion-icon/debian/rules b/ubuntu/_base/applications/fusion-icon/debian/rules index f1b2fcb..4f2025e 100755 --- a/ubuntu/_base/applications/fusion-icon/debian/rules +++ b/ubuntu/_base/applications/fusion-icon/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) DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity |