[neon/kde/dolphin-plugins/Neon/unstable] debian: Revert "Revert "kf6ify""

Carlos De Maine null at kde.org
Fri Jul 28 00:03:23 BST 2023


Git commit 8edf4413876708fea1de29b1615e9bed908c1200 by Carlos De Maine.
Committed on 28/07/2023 at 01:02.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "Revert "kf6ify""

This reverts commit 2b87cda73edc11db4f0d7c4f6a35849dde3e3d01.

D  +0    -1    debian/compat
M  +12   -15   debian/control
M  +4    -4    debian/rules

https://invent.kde.org/neon/kde/dolphin-plugins/-/commit/8edf4413876708fea1de29b1615e9bed908c1200

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 7ac3eac..9a32ccf 100644
--- a/debian/control
+++ b/debian/control
@@ -6,19 +6,18 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Modestas Vainius <modax at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 11~),
-               extra-cmake-modules (>= 0.0.11~),
-               libdolphinvcs-dev (>= 4:18.08.0~),
-               libkf5i18n-dev (>= 5.0.0~),
-               libkf5kdelibs4support-dev (>= 5.0.0~),
-               libkf5kio-dev (>= 5.0.0~),
-               libkf5syntaxhighlighting-dev,
-               libkf5texteditor-dev,
-               libkf5xmlgui-dev (>= 5.0.0~),
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.0.0~)
-Standards-Version: 4.2.1
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               libdolphinvcs-dev,
+               kf6-extra-cmake-modules,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-ktexteditor-dev,
+               kf6-kxmlgui-dev,
+               kf6-syntax-highlighting-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev
+Standards-Version: 4.6.2
 Homepage: http://www.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/dolphin-plugins
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/dolphin-plugins.git
@@ -28,8 +27,6 @@ Architecture: any
 Section: devel
 Depends: dolphin, ${misc:Depends}, ${shlibs:Depends}
 Enhances: dolphin
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: plugins for Dolphin
  This package contains plugins for Dolphin that enhance its functionalities.
  .
diff --git a/debian/rules b/debian/rules
index 827bfa3..d2bfa94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/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:16.04.3-5~
-
-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
 
 override_dh_auto_install:
 	$(overridden_command) --destdir=debian/dolphin-plugins



More information about the Neon-commits mailing list