[neon/kde/khelpcenter/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Sat Jun 3 05:08:46 BST 2023


Git commit fdf4fff0da99bac98e3a5b07add0c3e753f0e982 by Carlos De Maine.
Committed on 03/06/2023 at 04:08.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

D  +0    -1    debian/compat
M  +15   -19   debian/control
M  +6    -8    debian/rules

https://invent.kde.org/neon/kde/khelpcenter/-/commit/fdf4fff0da99bac98e3a5b07add0c3e753f0e982

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 d2f319d..be3615e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,27 +3,25 @@ Section: doc
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12),
-               debhelper (>= 11~),
-               extra-cmake-modules (>= 5.20.0~),
-               kinit-dev (>= 5.20.0~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                libgrantlee5-dev,
                libgumbo-dev,
-               libkf5archive-dev (>= 5.20.0~),
-               libkf5bookmarks-dev (>= 5.20.0~),
-               libkf5config-dev (>= 5.20.0~),
-               libkf5coreaddons-dev (>= 5.20.0~),
-               libkf5dbusaddons-dev (>= 5.20.0~),
-               libkf5doctools-dev (>= 5.20.0~),
-               libkf5i18n-dev (>= 5.20.0~),
-               libkf5khtml-dev (>= 5.20.0~),
-               libkf5service-dev (>= 5.20.0~),
-               libkf5windowsystem-dev (>= 5.20.0~),
                libxapian-dev,
                libxml2-dev,
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kbookmarks-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kservice-dev,
+               kf6-kwindowsystem-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.15.18~),
-               qtbase5-dev (>= 5.4.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 4.1.4
 Homepage: https://projects.kde.org/projects/kde/workspace/khelpcenter
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/khelpcenter
@@ -31,10 +29,8 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/khelpcenter.git
 
 Package: khelpcenter
 Architecture: any
-Depends: kdoctools5, kinit, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Depends: kdoctools6, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Recommends: man-db
-Breaks: khelpcenter4 (<< 4:5.0.0), ${kde-l10n:all}
-Replaces: khelpcenter4 (<< 4:5.0.0), ${kde-l10n:all}
 Description: KDE documentation viewer
  KHelpCenter uses meta data files which describe the documentation
  available in the system. Each document is represented by a meta data
diff --git a/debian/rules b/debian/rules
index 74ea24f..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
-# Add kde-l10n:all substvar
-l10npkgs_firstversion_ok := 4:16.04.3-7~
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='khelpcenter-dbg (<= 4:5.5.5-1~~)'
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/


More information about the Neon-commits mailing list