[neon/kde/k3b/Neon/unstable_jammy] debian: kf6ify
Carlos De Maine
null at kde.org
Wed Jul 3 15:53:09 BST 2024
Git commit 0cf68f8f090dd7d281a7e710d550b5d384d33a87 by Carlos De Maine.
Committed on 03/07/2024 at 14:52.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.
kf6ify
(cherry picked from commit fadfc11de6ca05b5498a404111e7ef66f0f6dd8f)
D +0 -1 debian/compat
M +23 -28 debian/control
M +2 -2 debian/k3b-data.install
D +0 -1 debian/k3b-i18n.install
M +16 -16 debian/libk3b8-extracodecs.install
M +3 -3 debian/libk3b8.install
M +4 -6 debian/rules
https://invent.kde.org/neon/kde/k3b/-/commit/0cf68f8f090dd7d281a7e710d550b5d384d33a87
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index e4d9b1e..f362c98 100644
--- a/debian/control
+++ b/debian/control
@@ -7,46 +7,43 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
Michael Meskes <meskes at debian.org>,
Mark Purcell <msp at debian.org>
Build-Depends: cmake,
- cmake-data,
- debhelper (>= 9),
- extra-cmake-modules,
+ debhelper-compat (= 13),
+ kf6-extra-cmake-modules,
+ kf6-karchive-dev,
+ kf6-kconfig-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kdoctools-dev,
+ kf6-kfilemetadata-dev,
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kjobwidgets-dev,
+ kf6-kcmutils-dev,
+ kf6-kio-dev,
+ kf6-knewstuff-dev,
+ kf6-knotifications-dev,
+ kf6-knotifyconfig-dev,
+ kf6-kservice-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kxmlgui-dev,
+ kf6-solid-dev,
libavformat-dev,
libcam-dev [kfreebsd-any],
libdvdread-dev,
libflac++-dev,
libflac-dev,
libfuzzer-14-dev,
- libkf5archive-dev,
- libkf5cddb-dev,
- libkf5config-dev,
- libkf5coreaddons-dev,
- libkf5doctools-dev,
- libkf5filemetadata-dev,
- libkf5i18n-dev,
- libkf5iconthemes-dev,
- libkf5jobwidgets-dev,
- libkf5kcmutils-dev,
- libkf5kio-dev,
- libkf5newstuff-dev,
- libkf5notifications-dev,
- libkf5notifyconfig-dev,
- libkf5service-dev,
- libkf5solid-dev,
- libkf5widgetsaddons-dev,
- libkf5xmlgui-dev,
+ libkcddb6-dev,
libmad0-dev,
libmp3lame-dev,
libmpcdec-dev,
libmusicbrainz5-dev,
- libqt5webkit5-dev,
libsamplerate0-dev,
libsndfile1-dev,
libtag1-dev,
libvorbis-dev,
- pkg-kde-tools (>= 0.9.0),
- qtbase5-dev,
- shared-mime-info
-Standards-Version: 3.9.8
+ pkg-kde-tools-neon,
+ qt6-base-dev,
+Standards-Version: 4.6.2
Homepage: http://www.k3b.org
Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/k3b
Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/k3b
@@ -74,8 +71,6 @@ Description: Sophisticated CD/DVD burning application
Package: k3b-data
Architecture: all
Depends: ${misc:Depends}
-Breaks: k3b-i18n (<< 20.08.2)
-Conflicts: k3b-i18n (<< 20.08.2)
Description: Sophisticated CD/DVD burning application - data files
K3b provides a comfortable user interface to perform most CD/DVD burning
tasks. While the experienced user can take influence in all steps
diff --git a/debian/k3b-data.install b/debian/k3b-data.install
index 3350421..9b52545 100644
--- a/debian/k3b-data.install
+++ b/debian/k3b-data.install
@@ -6,10 +6,10 @@ usr/share/icons/hicolor
usr/share/k3b/cdi/
usr/share/k3b/extra/
usr/share/k3b/icons/hicolor/
-usr/share/knotifications5/
+usr/share/knotifications6/
usr/share/knsrcfiles/k3btheme.knsrc
usr/share/konqsidebartng/
usr/share/locale
usr/share/mime/packages/x-k3b.xml
usr/share/polkit-1/actions/org.kde.k3b.policy
-usr/share/qlogging-categories5/k3b.categories
+usr/share/qlogging-categories6/k3b.categories
diff --git a/debian/k3b-i18n.install b/debian/k3b-i18n.install
deleted file mode 100644
index 8b13789..0000000
--- a/debian/k3b-i18n.install
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/libk3b8-extracodecs.install b/debian/libk3b8-extracodecs.install
index 34d6b6a..6589c3c 100644
--- a/debian/libk3b8-extracodecs.install
+++ b/debian/libk3b8-extracodecs.install
@@ -1,16 +1,16 @@
-usr/lib/*/qt5/plugins/k3b_plugins/k3bexternalencoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3bflacdecoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3blameencoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3blameencoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3blibsndfiledecoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3bmaddecoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3bmpcdecoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3boggvorbisdecoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3boggvorbisencoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3bsoxencoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3bwavedecoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/kcms/kcm_k3bexternalencoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/kcms/kcm_k3blameencoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/kcms/kcm_k3boggvorbisencoder.so
-usr/lib/*/qt5/plugins/k3b_plugins/kcms/kcm_k3bsoxencoder.so
-usr/lib/*/qt5/plugins/kf5/kio/videodvd.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3bexternalencoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3bflacdecoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3blameencoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3blameencoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3blibsndfiledecoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3bmaddecoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3bmpcdecoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3boggvorbisdecoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3boggvorbisencoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3bsoxencoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3bwavedecoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/kcms/kcm_k3bexternalencoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/kcms/kcm_k3blameencoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/kcms/kcm_k3boggvorbisencoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/kcms/kcm_k3bsoxencoder.so
+usr/lib/*/qt6/plugins/kf5/kio/videodvd.so
diff --git a/debian/libk3b8.install b/debian/libk3b8.install
index 1a580b0..a162564 100644
--- a/debian/libk3b8.install
+++ b/debian/libk3b8.install
@@ -1,5 +1,5 @@
usr/lib/*/libk3bdevice.so.8*
usr/lib/*/libk3blib.so.8*
-usr/lib/*/qt5/plugins/k3b_plugins/k3baudiometainforenamerplugin.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3baudioprojectcddbplugin.so
-usr/lib/*/qt5/plugins/k3b_plugins/k3bffmpegdecoder.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3baudiometainforenamerplugin.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3baudioprojectcddbplugin.so
+usr/lib/*/qt6/plugins/k3b_plugins/k3bffmpegdecoder.so
diff --git a/debian/rules b/debian/rules
index 07854e5..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-
-override_dh_strip:
- $(overridden_command) --dbgsym-migration='k3b-dbg (<= 17.08.0-0~~)'
-
-.PHONY: override_dh_auto_test
+%:
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list