From 34de7371f00209152fbd0934c256528eee992a96 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 14 Jan 2023 16:37:07 +0900 Subject: [PATCH] DEB tdeaddons: drop python2 support. Use dh_python3 to ensure Python dependencies and rewrite shebang in installed scripts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michele Calgaro Signed-off-by: Slávek Banko --- debian/_base/core/tdeaddons/debian/control | 6 +++--- debian/_base/core/tdeaddons/debian/rules | 12 ++++++++---- dilos/core/tdeaddons/debian/control | 6 +++--- dilos/core/tdeaddons/debian/rules | 12 ++++++++---- ubuntu/_base/core/tdeaddons/debian/control | 6 +++--- ubuntu/_base/core/tdeaddons/debian/rules | 12 ++++++++---- 6 files changed, 33 insertions(+), 21 deletions(-) diff --git a/debian/_base/core/tdeaddons/debian/control b/debian/_base/core/tdeaddons/debian/control index aa0c6b78d..3b39d6634 100644 --- a/debian/_base/core/tdeaddons/debian/control +++ b/debian/_base/core/tdeaddons/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, dh-python Standards-Version: 3.8.4 Package: tdeaddons-trinity @@ -152,7 +152,7 @@ Architecture: all Section: tde Replaces: knewsticker-scripts-trinity (<< 4:14.0.0~) Breaks: knewsticker-scripts-trinity (<< 4:14.0.0~) -Depends: ${perl:Depends}, python-all, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl +Depends: ${perl:Depends}, ${python3:Depends}, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl Recommends: knewsticker-trinity Enhances: knewsticker-trinity Description: scripts for KNewsTicker, the Trinity news ticker @@ -171,7 +171,7 @@ Architecture: any Section: tde Replaces: konq-plugins-trinity (<< 4:14.0.0~) Breaks: konq-plugins-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, libjpeg-turbo-progs | libjpeg-progs, python-all, rsync, unison +Depends: ${shlibs:Depends}, ${python3:Depends}, libjpeg-turbo-progs | libjpeg-progs, rsync, unison Recommends: akregator-trinity, ark-trinity, imagemagick Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html Enhances: konqueror-trinity, akregator-trinity diff --git a/debian/_base/core/tdeaddons/debian/rules b/debian/_base/core/tdeaddons/debian/rules index 7cd88847d..9dca91731 100755 --- a/debian/_base/core/tdeaddons/debian/rules +++ b/debian/_base/core/tdeaddons/debian/rules @@ -31,11 +31,15 @@ DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/tdeaddons-tdefile-plugins-trinity:: install -p -D -m644 renamedlgplugins/README \ - debian/tdeaddons-tdefile-plugins-trinity/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins + debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins binary-install/knewsticker-scripts-trinity:: - chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.pl - chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.py + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.pl + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.py + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/knewsticker/scripts binary-install/kate-plugins-trinity:: - chmod 755 debian/kate-plugins-trinity/opt/trinity/share/apps/kate/scripts/html-tidy.sh + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/kate/scripts/html-tidy.sh + +binary-install/konq-plugins-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/imagerotation diff --git a/dilos/core/tdeaddons/debian/control b/dilos/core/tdeaddons/debian/control index abdcef832..fefbc405f 100644 --- a/dilos/core/tdeaddons/debian/control +++ b/dilos/core/tdeaddons/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, libiconv-dev [solaris-any] +Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, dh-python, libiconv-dev [solaris-any] Standards-Version: 3.8.4 Package: tdeaddons-trinity @@ -152,7 +152,7 @@ Architecture: all Section: tde Replaces: knewsticker-scripts-trinity (<< 4:14.0.0~) Breaks: knewsticker-scripts-trinity (<< 4:14.0.0~) -Depends: ${perl:Depends}, python-all, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl +Depends: ${perl:Depends}, ${python3:Depends}, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl Recommends: knewsticker-trinity Enhances: knewsticker-trinity Description: scripts for KNewsTicker, the Trinity news ticker @@ -171,7 +171,7 @@ Architecture: any Section: tde Replaces: konq-plugins-trinity (<< 4:14.0.0~) Breaks: konq-plugins-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, libjpeg-turbo-progs | libjpeg-progs, python-all, rsync, unison +Depends: ${shlibs:Depends}, ${python3:Depends}, libjpeg-turbo-progs | libjpeg-progs, rsync, unison Recommends: akregator-trinity, ark-trinity, imagemagick Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html Enhances: konqueror-trinity, akregator-trinity diff --git a/dilos/core/tdeaddons/debian/rules b/dilos/core/tdeaddons/debian/rules index 4417239b1..7d022babb 100755 --- a/dilos/core/tdeaddons/debian/rules +++ b/dilos/core/tdeaddons/debian/rules @@ -33,11 +33,15 @@ DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/tdeaddons-tdefile-plugins-trinity:: install -p -D -m644 renamedlgplugins/README \ - debian/tdeaddons-tdefile-plugins-trinity/usr/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins + debian/$(cdbs_curpkg)/usr/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins binary-install/knewsticker-scripts-trinity:: - chmod 755 debian/knewsticker-scripts-trinity/usr/share/apps/knewsticker/scripts/*.pl - chmod 755 debian/knewsticker-scripts-trinity/usr/share/apps/knewsticker/scripts/*.py + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/knewsticker/scripts/*.pl + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/knewsticker/scripts/*.py + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/share/apps/knewsticker/scripts binary-install/kate-plugins-trinity:: - chmod 755 debian/kate-plugins-trinity/usr/share/apps/kate/scripts/html-tidy.sh + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/kate/scripts/html-tidy.sh + +binary-install/konq-plugins-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/share/apps/imagerotation diff --git a/ubuntu/_base/core/tdeaddons/debian/control b/ubuntu/_base/core/tdeaddons/debian/control index 41a690e2a..41b68349b 100644 --- a/ubuntu/_base/core/tdeaddons/debian/control +++ b/ubuntu/_base/core/tdeaddons/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin -Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, dh-python Standards-Version: 3.8.4 Package: tdeaddons-trinity @@ -152,7 +152,7 @@ Architecture: all Section: tde Replaces: knewsticker-scripts-kde3 (<< 4:14.0.0~), knewsticker-scripts-trinity (<< 4:14.0.0~) Breaks: knewsticker-scripts-kde3 (<< 4:14.0.0~), knewsticker-scripts-trinity (<< 4:14.0.0~) -Depends: ${perl:Depends}, python-all, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl +Depends: ${perl:Depends}, ${python3:Depends}, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl Recommends: knewsticker-trinity Enhances: knewsticker-trinity Description: scripts for KNewsTicker, the Trinity news ticker @@ -171,7 +171,7 @@ Architecture: any Section: tde Replaces: konq-plugins-kde3 (<< 4:14.0.0~), konq-plugins-trinity (<< 4:14.0.0~) Breaks: konq-plugins-kde3 (<< 4:14.0.0~), konq-plugins-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, libjpeg-turbo-progs | libjpeg-progs, python-all, rsync, unison +Depends: ${shlibs:Depends}, ${python3:Depends}, libjpeg-turbo-progs | libjpeg-progs, rsync, unison Recommends: akregator-trinity, ark-trinity, imagemagick Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html Enhances: konqueror-trinity, akregator-trinity diff --git a/ubuntu/_base/core/tdeaddons/debian/rules b/ubuntu/_base/core/tdeaddons/debian/rules index 76d43dd46..dceaa1982 100755 --- a/ubuntu/_base/core/tdeaddons/debian/rules +++ b/ubuntu/_base/core/tdeaddons/debian/rules @@ -22,11 +22,15 @@ DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/tdeaddons-tdefile-plugins-trinity:: install -p -D -m644 renamedlgplugins/README \ - debian/tdeaddons-tdefile-plugins-trinity/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins + debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins binary-install/knewsticker-scripts-trinity:: - chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.pl - chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.py + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.pl + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.py + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/knewsticker/scripts binary-install/kate-plugins-trinity:: - chmod 755 debian/kate-plugins-trinity/opt/trinity/share/apps/kate/scripts/html-tidy.sh + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/kate/scripts/html-tidy.sh + +binary-install/konq-plugins-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/imagerotation