[neon/kde/print-manager/Neon/unstable] debian: kf6ify

Scarlett Moore null at kde.org
Thu Sep 28 16:41:12 BST 2023


Git commit 1a8416894008a9fb20e2d52672ea2283d066e9d3 by Scarlett Moore.
Committed on 28/09/2023 at 17:40.
Pushed by scarlettmoore into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +18   -20   debian/control
M  +3    -11   debian/rules

https://invent.kde.org/neon/kde/print-manager/-/commit/1a8416894008a9fb20e2d52672ea2283d066e9d3

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 f66bb78..258ce2e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,26 +6,26 @@ Uploaders: Maximiliano Curia <maxy at debian.org>,
            Scarlett Moore <sgmoore at kde.org>,
            Sune Vuorela <sune at debian.org>,
 Build-Depends: cmake (>= 3.1~),
-               debhelper (>= 11),
-               extra-cmake-modules (>= 1.3.0),
+               debhelper-compat (= 12),
+               kf6-extra-cmake-modules,
                libcups2-dev (>= 1.5),
-               libkf5config-dev  (>= 5.42.0~),
-               libkf5configwidgets-dev (>= 5.42.0~),
-               libkf5coreaddons-dev (>= 5.42.0~),
-               libkf5dbusaddons-dev (>= 5.42.0~),
-               libkf5i18n-dev (>= 5.42.0~),
-               libkf5iconthemes-dev (>= 5.42.0~),
-               libkf5kcmutils-dev (>= 5.42.0~),
-               libkf5kio-dev (>= 5.42.0~),
-               libkf5notifications-dev (>= 5.42.0~),
-               libkf5plasma-dev (>= 5.42.0~),
-               libkf5widgetsaddons-dev (>= 5.42.0~),
-               libkf5windowsystem-dev (>= 5.42.0~),
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kdbusaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kkcmutils-dev,
+               kf6-kkio-dev,
+               kf6-knotifications-dev,
+               libkf6plasma-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
                pkg-config,
-               pkg-kde-tools (>> 0.15.15),
-               qtbase5-dev (>= 5.9.0~),
-               qtdeclarative5-dev (>= 5.9.0~),
-               qttools5-dev (>= 5.9),
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-tools-dev,
 Standards-Version: 4.3.0
 Homepage: http://www.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/print-manager
@@ -35,8 +35,6 @@ Package: print-manager
 Architecture: any
 Depends: plasma-framework, ${misc:Depends}, ${shlibs:Depends}
 Recommends: cups, system-config-printer-common, system-config-printer-udev, smbclient
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: printer configuration and monitoring tools
  This package provides a KDE configuration module and a Plasma widget for
  installing and configuring printers, and monitoring printers, print jobs and
diff --git a/debian/rules b/debian/rules
index 7ffc9fd..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,6 @@
 #!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-l10npkgs_firstversion_ok := 4:16.04.3-6~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5
-
-override_dh_gencontrol: l10npkgs_firstversion_ok
-	dh_gencontrol
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list