[neon/extras/kphotoalbum/Neon/unstable] debian: kf6ify

[Carlos De Maine]

Git commit 06d6c9a1bc499027e2b45766ec6f26d727cef0ac by Carlos De Maine.
Committed on 18/11/2024 at 02:50.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/.gitattributes
M  +24   -25   debian/control
M  +3    -7    debian/rules
D  +0    -6    debian/salsa-ci.yml

https://invent.kde.org/neon/extras/kphotoalbum/-/commit/06d6c9a1bc499027e2b45766ec6f26d727cef0ac

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/control b/debian/control
index 4b160e6..3d6eb52 100644
--- a/debian/control
+++ b/debian/control
@@ -3,35 +3,34 @@ Section: graphics
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>
-Build-Depends: cmake (>= 3.16.0~),
+Build-Depends: cmake,
                debhelper-compat (= 13),
-               extra-cmake-modules,
                gettext,
-               libexiv2-dev (>= 0.19),
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kcompletion-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kjobwidgets-dev,
+               kf6-kkdcraw-dev,
+               kf6-kkio-dev,
+               kf6-kpurpose-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kxmlgui-dev,
+               libexiv2-dev,
                libjpeg-dev,
-               libkf5archive-dev (>= 5.44.0),
-               libkf5completion-dev (>= 5.44.0),
-               libkf5config-dev (>= 5.44.0),
-               libkf5coreaddons-dev (>= 5.44.0),
-               libkf5doctools-dev (>= 5.44.0),
-               libkf5i18n-dev (>= 5.44.0),
-               libkf5iconthemes-dev (>= 5.44.0),
-               libkf5jobwidgets-dev (>= 5.44.0),
-               libkf5kdcraw-dev,
-               libkf5kio-dev (>= 5.44.0),
-               libkf5purpose-dev,
-               libkf5textwidgets-dev (>= 5.44.0),
-               libkf5widgetsaddons-dev (>= 5.44.0),
-               libkf5xmlgui-dev (>= 5.44.0),
                libmarble-dev,
-               libphonon4qt5-dev,
-               libphonon4qt5experimental-dev,
                libvlc-dev,
-               pkg-config,
-               pkg-kde-tools (>= 0.15.16),
-               qtbase5-dev (>= 5.10.0~),
-               qtwebengine5-dev
-Standards-Version: 4.6.1
+               pkgconf,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-phonon-dev,
+               qt6-webengine-dev,
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://kphotoalbum.org
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/kphotoalbum
@@ -54,4 +53,4 @@ Description: tool for indexing, searching and viewing images by keywords for KDE
  KPhotoAlbum can also make use of the KIPI image handling plugins to extend its
  capabilities. The kipi-plugins package contains many useful extensions. Among
  others, it contains extensions for photo manipulation, importing, exporting
- and batch processing.
\ No newline at end of file
+ and batch processing.
diff --git a/debian/rules b/debian/rules
index 8589d82..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5
-
-execute_before_dh_auto_build:
-	# force generation of version.h, to avoid races later on
-	dh_auto_build --no-parallel -- UpdateVersion
-
-.PHONY: override_dh_auto_test
+	dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index 31e31c9..0000000
--- a/debian/salsa-ci.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-variables:
-  SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
-  SALSA_CI_DISABLE_RC_BUGS: 'no'