[neon/forks/kdenlive/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Tue Mar 12 09:36:00 GMT 2024


Git commit 3ddddaa2e85f37de43b8f92bbc79207950fb3d89 by Carlos De Maine.
Committed on 12/03/2024 at 09:35.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +37   -44   debian/control
M  +2    -2    debian/kdenlive-data.install
M  +4    -21   debian/rules

https://invent.kde.org/neon/forks/kdenlive/-/commit/3ddddaa2e85f37de43b8f92bbc79207950fb3d89

diff --git a/debian/control b/debian/control
index 39f7f75..79b6e6f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,60 +3,55 @@ Section: video
 Priority: optional
 Maintainer: Patrick Matthäi <pmatthaei at debian.org>
 Homepage: https://kdenlive.org/
-Standards-Version: 4.1.2
+Standards-Version: 4.6.2
 Build-Depends: cmake,
-               debhelper (>= 10),
-               extra-cmake-modules,
+               debhelper-compat (= 13),
                ffmpeg,
-               libkf5archive-dev,
-               libkf5bookmarks-dev,
-               libkf5config-dev,
-               libkf5configwidgets-dev,
-               libkf5coreaddons-dev,
-               libkf5crash-dev,
-               libkf5dbusaddons-dev,
-               libkf5declarative-dev,
-               libkf5doctools-dev,
-               libkf5filemetadata-dev,
-               libkf5guiaddons-dev,
-               libkf5iconthemes-dev,
-               libkf5kio-dev,
-               libkf5newstuff-dev,
-               libkf5notifications-dev,
-               libkf5notifyconfig-dev,
-               libkf5plotting-dev,
-               libkf5purpose-dev,
-               libkf5textwidgets-dev,
-               libkf5widgetsaddons-dev,
-               libkf5xmlgui-dev,
-               libmlt++-dev (>= 0.9.8),
-               libmlt-dev (>= 0.9.8),
-               libqt5networkauth5-dev,
-               libqt5opengl5-dev,
-               libqt5svg5-dev,
-               libqt5webkit5-dev,
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kbookmarks-dev,
+               kf6-kcodecs-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdeclarative-dev,
+               kf6-kdoctools-dev,
+               kf6-kfilemetadata-dev,
+               kf6-kguiaddons-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-knewstuff-dev,
+               kf6-knotifications-dev,
+               kf6-knotifyconfig-dev,
+               kf6-kplotting-dev,
+               kf6-purpose-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kxmlgui-dev,
+               libmlt++-dev,
+               libmlt-dev,
                libv4l-dev,
                pkg-config,
-               pkg-kde-tools,
-               qtdeclarative5-dev,
-               qtmultimedia5-dev,
-               qtquickcontrols2-5-dev,
-               qtscript5-dev,
-               qttools5-dev
-
+               pkg-kde-tools-neons,
+               qt6-declarative-dev,
+               qt6-multimedia-dev,
+               qt6-svg-dev,
+               qt6-tools-dev,
+               qt6-webkit-dev,
 Package: kdenlive
 Architecture: any
 Depends: ffmpeg,
          frei0r-plugins,
-         kded5,
+         kded6,
          kdenlive-data (= ${source:Version}),
-         kinit,
          kio,
          mediainfo,
          melt,
-         qml-module-qtquick-controls,
-         qml-module-qtquick-shapes,
-         qml-module-qtquick2,
+         qml6-module-qtquick-controls,
+         qml6-module-qtquick-shapes,
+         qml6-module-qtquick,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: breeze-icon-theme,
@@ -80,8 +75,6 @@ Package: kdenlive-data
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: kdenlive
-Breaks: kdenlive (<= 0.7.2.1), ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: non-linear video editor (data files)
  Kdenlive is a non-linear video editing suite, which supports DV, HDV and many
  more formats.
diff --git a/debian/kdenlive-data.install b/debian/kdenlive-data.install
index b86e9eb..452f0ae 100644
--- a/debian/kdenlive-data.install
+++ b/debian/kdenlive-data.install
@@ -2,10 +2,10 @@ usr/share/config.kcfg
 usr/share/doc
 usr/share/icons
 usr/share/kdenlive
-usr/share/knotifications5
+usr/share/knotifications6
 usr/share/knsrcfiles/
 usr/share/locale
 usr/share/man
 usr/share/metainfo
 usr/share/mime
-usr/share/qlogging-categories5/kdenlive.categories
+usr/share/qlogging-categories6/kdenlive.categories
diff --git a/debian/rules b/debian/rules
index d17c967..901a7ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,9 @@
 #!/usr/bin/make -f
-
-l10npkgs_firstversion_ok := 4:16.04.3-4~
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-EXTRAFLAGS :=
-ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
-	EXTRAFLAGS := -DNO_JOGSHUTTLE=YES
-endif
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(EXTRAFLAGS)
-
-override_dh_compress:
-	dh_compress -X.docbook
-
-override_dh_install:
-	dh_install --list-missing
-
-override_dh_gencontrol: l10npkgs_firstversion_ok
-	dh_gencontrol
+	dh_auto_configure -- -DBUILD_WITH_QT6=ON -DBUILD_QCH=ON -DBUILD_DESIGNERPLUGIN=ON


More information about the Neon-commits mailing list