[neon/kde/juk/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Thu Jan 4 14:36:09 GMT 2024


Git commit dc7b0a4c1fe381ae6ef5c92f17c7e2fc022a3066 by Carlos De Maine.
Committed on 04/01/2024 at 15:36.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +2    -2    debian/changelog
D  +0    -1    debian/compat
M  +24   -26   debian/control
M  +1    -0    debian/juk.lintian-overrides
M  +4    -4    debian/rules

https://invent.kde.org/neon/kde/juk/-/commit/dc7b0a4c1fe381ae6ef5c92f17c7e2fc022a3066

diff --git a/debian/changelog b/debian/changelog
index 4e925cc..0f49d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -158,7 +158,7 @@ juk (4:21.04.2-0neon) focal; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Fri, 11 Jun 2021.12.01:06 +0000
+ -- Neon CI <neon at kde.org>  Fri, 11 Jun 2021 12:01:06 +0000
 
 juk (4:21.04.1-0neon) focal; urgency=medium
 
@@ -188,7 +188,7 @@ juk (4:20.12.1-0neon) focal; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021.12.23:59 +0000
+ -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021 12:23:59 +0000
 
 juk (4:20.12.0-0neon) focal; urgency=medium
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 93f9fe9..9f37f4b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,32 +6,32 @@ Uploaders: Pino Toscano <pino at debian.org>,
            Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
-               debhelper (>= 11~),
-               extra-cmake-modules (>= 5.35.0~),
-               libkf5completion-dev (>= 5.35.0~),
-               libkf5config-dev (>= 5.35.0~),
-               libkf5coreaddons-dev (>= 5.35.0~),
-               libkf5crash-dev (>= 5.35.0~),
-               libkf5doctools-dev (>= 5.35.0~),
-               libkf5globalaccel-dev (>= 5.35.0~),
-               libkf5i18n-dev (>= 5.35.0~),
-               libkf5iconthemes-dev (>= 5.35.0~),
-               libkf5itemmodels-dev (>= 5.35.0~),
-               libkf5jobwidgets-dev (>= 5.35.0~),
-               libkf5kio-dev (>= 5.35.0~),
-               libkf5notifications-dev (>= 5.35.0~),
-               libkf5textwidgets-dev (>= 5.35.0~),
-               libkf5wallet-dev (>= 5.35.0~),
-               libkf5widgetsaddons-dev (>= 5.35.0~),
-               libkf5windowsystem-dev (>= 5.35.0~),
-               libkf5xmlgui-dev (>= 5.35.0~),
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kcompletion-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdoctools-dev,
+               kf6-kglobalaccel-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kitemmodels-dev,
+               kf6-kjobwidgets-dev,
+               kf6-kio-dev,
+               kf6-knotifications-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwallet-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
                libopusfile-dev,
-               libqt5svg5-dev (>= 5.6.0~),
                libtag1-dev (>= 1.6),
-               pkg-kde-tools (>= 0.15.16),
-               qtbase5-dev (>= 5.6.0~),
-               qt5-phonon-dev,
-Standards-Version: 4.2.1
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-phonon-dev,
+               qt6-svg-dev,
+Standards-Version: 4.6.2
 Homepage: http://www.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/juk
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/juk.git
@@ -41,8 +41,6 @@ Section: sound
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: k3b
-Breaks: kdemultimedia-dev (<< 4:4.10), ${kde-l10n:all}
-Replaces: kdemultimedia-dev (<< 4:4.10), ${kde-l10n:all}
 Description: music jukebox / music player
  JuK is a powerful music player capable of managing a large music collection.
  .
diff --git a/debian/juk.lintian-overrides b/debian/juk.lintian-overrides
index 6cb05db..bf35cd4 100644
--- a/debian/juk.lintian-overrides
+++ b/debian/juk.lintian-overrides
@@ -1 +1,2 @@
 juk: binary-without-manpage usr/bin/juk
+juk: executable-not-elf-or-script usr/share/kio/servicemenus/jukservicemenu.desktop
diff --git a/debian/rules b/debian/rules
index 4f561f1..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-l10npkgs_firstversion_ok := 4:17.08.3-4~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+%:
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list