From 650686542574e609fcf1e7ff16beb13c8e53cc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 17 Jan 2023 01:54:17 +0100 Subject: [PATCH] DEB desktop-effects-tde: Drop python2 support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../misc/desktop-effects-tde/debian/control | 7 +++---- .../applications/misc/desktop-effects-tde/debian/rules | 10 +--------- .../misc/desktop-effects-tde/debian/control | 7 +++---- .../applications/misc/desktop-effects-tde/debian/rules | 10 +--------- 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/control b/debian/_base/applications/misc/desktop-effects-tde/debian/control index 17c5b285b..bdd07df92 100644 --- a/debian/_base/applications/misc/desktop-effects-tde/debian/control +++ b/debian/_base/applications/misc/desktop-effects-tde/debian/control @@ -3,16 +3,15 @@ Section: tde Priority: optional Maintainer: TDE Debian Team Build-Depends-Indep: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, - python-support (>= 0.6) | dh-python, python-all-dev, pytde-dev + dh-python, python3-all-dev, pytde-dev Standards-Version: 3.8.4 -XS-Python-Version: all +X-Python3-Version: all Package: desktop-effects-tde-trinity Architecture: all -Depends: ${python:Depends}, python-pytqt, python-pytde +Depends: ${python3:Depends}, python3-apt, python3-pytqt, python3-pytde Replaces: desktop-effects-kde-trinity (<< 4:14.0.0~) Breaks: desktop-effects-kde-trinity (<< 4:14.0.0~) -XB-Python-Version: ${python:Versions} Description: compiz setup tool for Trinity A simple Compiz configuration tool for Trinity. Installs and sets Compiz as the window manager. diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/rules b/debian/_base/applications/misc/desktop-effects-tde/debian/rules index 5853ba38f..bcea12716 100755 --- a/debian/_base/applications/misc/desktop-effects-tde/debian/rules +++ b/debian/_base/applications/misc/desktop-effects-tde/debian/rules @@ -16,13 +16,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) - -post-patches:: - # make sure that python binary exists - # since the existing code is still dependent on python2 - # and cdbs uses python as the default binary name - test -x /usr/bin/python || ln -s python2 /usr/bin/python - binary-install/desktop-effects-tde-trinity:: - ${DH_PYTHON2} -pdesktop-effects-tde-trinity + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control index 762675323..ded360aa2 100644 --- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control +++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control @@ -3,16 +3,15 @@ Section: tde Priority: optional Maintainer: TDE Debian Team Build-Depends-Indep: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, - python-support (>= 0.6) | dh-python, python-all-dev, pytde-dev + dh-python, python3-all-dev, pytde-dev Standards-Version: 3.8.4 -XS-Python-Version: all +X-Python3-Version: all Package: desktop-effects-tde-trinity Architecture: all -Depends: ${python:Depends}, python-pytqt, python-pytde +Depends: ${python3:Depends}, python3-apt, python3-pytqt, python3-pytde Replaces: desktop-effects-kde-kde3 (<< 4:14.0.0~), desktop-effects-kde-trinity (<< 4:14.0.0~) Breaks: desktop-effects-kde-kde3 (<< 4:14.0.0~), desktop-effects-kde-trinity (<< 4:14.0.0~) -XB-Python-Version: ${python:Versions} Description: compiz setup tool for Trinity A simple Compiz configuration tool for Trinity. Installs and sets Compiz as the window manager. diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules index 5853ba38f..bcea12716 100755 --- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules +++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules @@ -16,13 +16,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DBUILD_ALL="ON" \ -DWITH_ALL_OPTIONS="ON" -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) - -post-patches:: - # make sure that python binary exists - # since the existing code is still dependent on python2 - # and cdbs uses python as the default binary name - test -x /usr/bin/python || ln -s python2 /usr/bin/python - binary-install/desktop-effects-tde-trinity:: - ${DH_PYTHON2} -pdesktop-effects-tde-trinity + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin