From 756f8faf83b450f97b636184daa54c196eb5fd03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 18 Jan 2023 14:53:26 +0100 Subject: [PATCH] DEB amarok: Drop python2 support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../applications/multimedia/amarok/debian/control | 10 +++++----- .../_base/applications/multimedia/amarok/debian/rules | 6 ++++++ .../applications/multimedia/amarok/debian/control | 10 +++++----- .../_base/applications/multimedia/amarok/debian/rules | 6 ++++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/debian/_base/applications/multimedia/amarok/debian/control b/debian/_base/applications/multimedia/amarok/debian/control index 162ac86df..6341db84b 100644 --- a/debian/_base/applications/multimedia/amarok/debian/control +++ b/debian/_base/applications/multimedia/amarok/debian/control @@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, bzip2, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev, - ruby, ruby-dev + ruby, ruby-dev, dh-python Standards-Version: 3.8.4 Homepage: http://amarok.kde.org @@ -21,7 +21,7 @@ Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${so Replaces: amarok-trinity (<< 4:14.0.0~) Breaks: amarok-trinity (<< 4:14.0.0~) Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser, - python3-all | python-all, python3-pytqt | python-pytqt, libqt0-ruby-trinity, libvisual-0.4-plugins + python3-all, python3-pytqt, libqt0-ruby-trinity, libvisual-0.4-plugins Description: versatile and easy to use audio player for Trinity Amarok tries to be a little different, providing a simple drag and drop interface that really makes playlist handling easy. @@ -57,18 +57,18 @@ Description: base library for Amarok [Trinity] Package: amarok-common-trinity Architecture: all -Depends: ruby +Depends: ruby, ${python3:Depends} Replaces: amarok-common-trinity (<< 4:14.0.0~) Breaks: amarok-common-trinity (<< 4:14.0.0~) Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby-trinity, python3-all | python-all, python3-pytqt | python-pytqt +Suggests: libqt0-ruby-trinity, python3-all, python3-pytqt Description: architecture independent files for Amarok [Trinity] This package contains architecture independent files needed for Amarok to run properly. It also provides Amarok documentation. Therefore, unless you have 'amarok' package installed, you will hardly find this package useful. . You need to install Python if you intend to use Zeroconf support, WebControl - and/or playlist2html scripts. You will also need python-pytqt for the + and/or playlist2html scripts. You will also need python3-pytqt for the WebControl script. Package: amarok-konqsidebar-trinity diff --git a/debian/_base/applications/multimedia/amarok/debian/rules b/debian/_base/applications/multimedia/amarok/debian/rules index 55c147b76..09544563a 100755 --- a/debian/_base/applications/multimedia/amarok/debian/rules +++ b/debian/_base/applications/multimedia/amarok/debian/rules @@ -17,3 +17,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_YAUAP="OFF" \ -DWITH_IFP="OFF" + +binary-install/amarok-common-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \ + /opt/trinity/share/apps/amarok/scripts/playlist2html + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \ + /opt/trinity/share/apps/amarok/scripts/webcontrol diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control index 67e9ce687..4f20c5065 100644 --- a/ubuntu/_base/applications/multimedia/amarok/debian/control +++ b/ubuntu/_base/applications/multimedia/amarok/debian/control @@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, bzip2, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev, - ruby, ruby-dev + ruby, ruby-dev, dh-python Standards-Version: 3.8.4 Homepage: http://amarok.kde.org @@ -21,7 +21,7 @@ Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${so Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~) Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~) Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser, - python3-all | python-all, python3-pytqt | python-pytqt, libqt0-ruby-trinity, libvisual-0.4-plugins + python3-all, python3-pytqt, libqt0-ruby-trinity, libvisual-0.4-plugins Description: versatile and easy to use audio player for Trinity Amarok tries to be a little different, providing a simple drag and drop interface that really makes playlist handling easy. @@ -57,18 +57,18 @@ Description: base library for Amarok [Trinity] Package: amarok-common-trinity Architecture: all -Depends: ruby +Depends: ruby, ${python3:Depends} Replaces: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~) Breaks: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~) Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby-trinity, python3-all | python-all, python3-pytqt | python-pytqt +Suggests: libqt0-ruby-trinity, python3-all, python3-pytqt Description: architecture independent files for Amarok [Trinity] This package contains architecture independent files needed for Amarok to run properly. It also provides Amarok documentation. Therefore, unless you have 'amarok' package installed, you will hardly find this package useful. . You need to install Python if you intend to use Zeroconf support, WebControl - and/or playlist2html scripts. You will also need python-pytqt for the + and/or playlist2html scripts. You will also need python3-pytqt for the WebControl script. Package: amarok-konqsidebar-trinity diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules index 55c147b76..09544563a 100755 --- a/ubuntu/_base/applications/multimedia/amarok/debian/rules +++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules @@ -17,3 +17,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_YAUAP="OFF" \ -DWITH_IFP="OFF" + +binary-install/amarok-common-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \ + /opt/trinity/share/apps/amarok/scripts/playlist2html + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \ + /opt/trinity/share/apps/amarok/scripts/webcontrol