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

[Carlos De Maine]

Git commit 5c63fa90addf2c9dcb48ac6881965faeba2ba76b by Carlos De Maine.
Committed on 11/01/2024 at 06:46.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +18   -32   debian/control
M  +3    -15   debian/rules
D  +0    -6    debian/salsa-ci.yml

https://invent.kde.org/neon/extras/kdiff3/-/commit/5c63fa90addf2c9dcb48ac6881965faeba2ba76b

diff --git a/debian/control b/debian/control
index 099c514..69608bc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,24 +3,24 @@ Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Eike Sauer <eike at debian.org>, Pino Toscano <pino at debian.org>
 Section: kde
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
- pkg-kde-tools,
- gettext,
- cmake (>= 3.8~),
- extra-cmake-modules (>= 5.10.0~),
- qtbase5-dev (>= 5.8.0~),
- libkf5config-dev (>= 5.37.0~),
- libkf5coreaddons-dev (>= 5.37.0~),
- libkf5crash-dev (>= 5.37.0~),
- libkf5doctools-dev (>= 5.37.0~),
- libkf5i18n-dev (>= 5.37.0~),
- libkf5kio-dev (>= 5.37.0~),
- libkf5parts-dev (>= 5.37.0~),
- libkf5widgetsaddons-dev (>= 5.37.0~),
- libboost-dev (>= 1.66.0~),
- xauth <!nocheck>,
- xvfb <!nocheck>,
-Standards-Version: 4.6.1
+Build-Depends: cmake (>= 3.8~),
+			   debhelper-compat (= 13),
+			   gettext,
+			   kf6-extra-cmake-modules,
+			   kf6-kconfig-dev,
+			   kf6-kcoreaddons-dev,
+			   kf6-kcrash-dev,
+			   kf6-kdoctools-dev,
+			   kf6-ki18n-dev,
+			   kf6-kio-dev,
+			   kf6-kparts-dev,
+			   kf6-kwidgetsaddons-dev,
+			   libboost-dev (>= 1.66.0~),
+			   pkg-kde-tools-neon,
+			   qt6-base-dev,
+			   xauth <!nocheck>,
+			   xvfb <!nocheck>,
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://kde.org/applications/development/kdiff3
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/kdiff3
@@ -30,8 +30,6 @@ Package: kdiff3
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: kdiff3-doc
-Breaks: kdiff3-qt (<<1.0)
-Replaces: kdiff3-qt (<<1.0)
 Description: compares and merges 2 or 3 files or directories
  KDiff3 compares two or three input files and shows the differences
  line by line and character by character. It provides an automatic
@@ -40,24 +38,12 @@ Description: compares and merges 2 or 3 files or directories
  merging as well. KDiff3 also has KIO support, so it can access to
  remote files and compressed archives.
 
-Package: kdiff3-qt
-Architecture: all
-Multi-Arch: foreign
-Depends: kdiff3 (>= ${source:Version}), ${misc:Depends}
-Section: oldlibs
-Description: transistional package for kdiff3
- This is a transitional package. It can safely be removed.
- .
- This version of KDiff3 is not developed anymore, replaced by kdiff3.
-
 Package: kdiff3-doc
 Architecture: all
 Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Recommends: kdiff3
-Breaks: kdiff3 (<= 1.7.90-1)
-Replaces: kdiff3 (<= 1.7.90-1)
 Description: documentation for KDiff3
  KDiff3 compares two or three input files and shows the differences
  line by line and character by character.
diff --git a/debian/rules b/debian/rules
index 4ab1f08..49552b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,6 @@
 #!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-archs_that_need_atomic = armel m68k mipsel powerpc sh4
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(archs_that_need_atomic)))
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed
-endif
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5
-
-override_dh_auto_test:
-	xvfb-run -a dh_auto_test
-
-execute_after_dh_auto_install:
-	# drop translations of Windows-only component
-	rm debian/tmp/usr/share/locale/*/LC_MESSAGES/diff_ext.mo
+	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'