[neon/kde/kate/Neon/unstable] debian: Revert "Revert "modernise and clean kf5 suggests & runtime depends""

Carlos De Maine null at kde.org
Fri Jul 28 00:08:22 BST 2023


Git commit 9dc62049b16d402a638bd3c148db31258f61e6f5 by Carlos De Maine.
Committed on 28/07/2023 at 01:08.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "Revert "modernise and clean kf5 suggests & runtime depends""

This reverts commit a22fae31d5f55b8e38439875d85123d57db446e5.

D  +0    -1    debian/compat
M  +12   -23   debian/control
D  +0    -1    debian/kate.lintian-overrides
M  +0    -1    debian/kwrite.lintian-overrides
M  +6    -16   debian/rules

https://invent.kde.org/neon/kde/kate/-/commit/9dc62049b16d402a638bd3c148db31258f61e6f5

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 c762338..48793d8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Modestas Vainius <modax at debian.org>,
            Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12),
-               debhelper (>= 11~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kactivities-dev,
                kf6-kconfig-dev,
@@ -44,14 +44,13 @@ Package: kate
 Section: editors
 Architecture: any
 Depends: kate6-data (>= ${source:Version}),
-         ktexteditor-katepart,
-         plasma-framework,
-         qml-module-org-kde-kquickcontrolsaddons,
-         qml-module-qtquick-layouts,
-         qml-module-qtquick2,
+         kf6-ktexteditor,
+         kf6-plasma-framework,
+         kf6-kdeclaritive,
+         qt6-declarative,
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: sonnet-plugins
+Recommends: kf6-sonnet
 Suggests: darcs,
           exuberant-ctags,
           git,
@@ -77,11 +76,8 @@ Description: powerful text editor
 Package: kate6-data
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: kate (<< 4:19.04.0),
-          kate-data (<< 4:4.14.3-0ubuntu4),
-          kate5-data,
-          ${kde-l10n:all}
-Breaks: kate (<< 4:19.04.0), kate-data (<< 4:4.14.3-0ubuntu4), kate5-data, ${kde-l10n:all}
+Replaces: kate5-data
+Breaks: kate5-data
 Description: shared data files for Kate text editor
  This package contains the architecture-independent shared data files needed
  for Kate editor
@@ -89,17 +85,10 @@ Description: shared data files for Kate text editor
 Package: kwrite
 Section: editors
 Architecture: any
-Depends: ktexteditor-katepart, ${misc:Depends}, ${shlibs:Depends}
-Breaks: kate5-data (<< 4:17.08.3-3~), ${kde-l10n:all}
-Replaces: kate5-data (<< 4:17.08.3-3~), ${kde-l10n:all}
+Depends: kf6-ktexteditor, ${misc:Depends}, ${shlibs:Depends}
+Breaks: kate5-data
+Replaces: kate5-data
 Description: simple text editor
  KWrite is a simple text editor built on the KDE Platform. It uses the Kate
  editor component, so it supports powerful features such as flexible syntax
  highlighting, automatic indentation, and numerous other text tools.
-
-Package: ktexteditorpreviewplugin
-Section: oldlibs
-Architecture: all
-Description: transitional package for KTextEditorPreviewPlugin
- Transitional package, can be safely removed.  The plugin is now part
- of Kate.
diff --git a/debian/kate.lintian-overrides b/debian/kate.lintian-overrides
deleted file mode 100644
index d88736a..0000000
--- a/debian/kate.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kate: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_kate.so
diff --git a/debian/kwrite.lintian-overrides b/debian/kwrite.lintian-overrides
index c2f6530..8ae6176 100644
--- a/debian/kwrite.lintian-overrides
+++ b/debian/kwrite.lintian-overrides
@@ -1,2 +1 @@
 kwrite: binary-without-manpage usr/bin/kwrite
-kwrite: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_kwrite.so
diff --git a/debian/rules b/debian/rules
index 46804bd..df4c088 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +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-6~
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
-
-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,pkgkde-symbolshelper
-
-override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
-
-override_dh_install:
-	$(overridden_command)
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='kate-dbg (<= 4:15.12.1-1~~)'
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
\ No newline at end of file



More information about the Neon-commits mailing list