[neon/kde/kate/Neon/unstable] debian: merge kf6 experimental branch into unstable

Carlos De Maine null at kde.org
Fri Sep 15 06:08:07 BST 2023


Git commit e898d2583403a1ad6d96a6ec3da20b03d465817d by Carlos De Maine.
Committed on 15/09/2023 at 07:08.
Pushed by carlosdem into branch 'Neon/unstable'.

merge kf6 experimental branch into unstable

D  +0    -1    debian/compat
M  +41   -51   debian/control
M  +1    -1    debian/kate.install
A  +11   -0    debian/kate6-data.install
A  +2    -0    debian/kate6-data.maintscript
M  +0    -1    debian/kwrite.lintian-overrides
M  +6    -13   debian/rules

https://invent.kde.org/neon/kde/kate/-/commit/e898d2583403a1ad6d96a6ec3da20b03d465817d

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 e90fbc1..2f05153 100644
--- a/debian/control
+++ b/debian/control
@@ -5,36 +5,36 @@ 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~),
-               extra-cmake-modules (>= 1.3.0~),
-               kinit-dev (>= 5.6.0~),
-               kuserfeedback-dev,
-               libkf5activities-dev (>= 5.13.0~),
-               libkf5config-dev (>= 5.13.0~),
-               libkf5crash-dev (>= 5.13.0~),
-               libkf5dbusaddons-dev,
-               libkf5doctools-dev (>= 5.10.0~),
-               libkf5guiaddons-dev (>= 5.6.0~),
-               libkf5i18n-dev (>= 5.13.0~),
-               libkf5iconthemes-dev (>= 5.13.0~),
-               libkf5itemmodels-dev,
-               libkf5jobwidgets-dev (>= 5.13.0~),
-               libkf5kio-dev (>= 5.13.0~),
-               libkf5newstuff-dev,
-               libkf5parts-dev (>= 5.13.0~),
-               libkf5plasma-dev,
-               libkf5pty-dev,
-               libkf5syntaxhighlighting-dev,
-               libkf5texteditor-dev (>= 5.13.0~),
-               libkf5threadweaver-dev,
-               libkf5wallet-dev,
-               libkf5windowsystem-dev (>= 5.13.0~),
-               libkf5xmlgui-dev (>= 5.13.0~),
-               libqt5x11extras5-dev,
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kactivities-dev,
+               kf6-kconfig-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-kguiaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kitemmodels-dev,
+               kf6-kjobwidgets-dev,
+               kf6-kio-dev,
+               kf6-knewstuff-dev,
+               kf6-kparts-dev,
+               kf6-plasma-framework-dev,
+               kf6-kpty-dev,
+               kf6-syntax-highlighting-dev,
+               kf6-ktexteditor-dev,
+               kf6-threadweaver-dev,
+               kf6-kwallet-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kf6-kcolorscheme-dev,
+               kf6-kuserfeedback-dev,
+               kf6-kmoretools-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
-               qtbase5-dev (>= 5.4.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 4.2.1
 Homepage: http://kate-editor.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kate
@@ -43,15 +43,14 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kate.git
 Package: kate
 Section: editors
 Architecture: any
-Depends: kate5-data (>= ${source:Version}),
-         ktexteditor-katepart,
-         plasma-framework,
-         qml-module-org-kde-kquickcontrolsaddons,
-         qml-module-qtquick-layouts,
-         qml-module-qtquick2,
+Depends: kate6-data (>= ${source:Version}),
+         kf6-ktexteditor,
+         kf6-plasma-framework,
+         kf6-kdeclarative,
+         qt6-declarative,
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: sonnet-plugins
+Recommends: kf6-sonnet
 Suggests: darcs,
           exuberant-ctags,
           git,
@@ -74,13 +73,11 @@ Description: powerful text editor
   * Symbol viewers for C, C++, and Python
   * XML completion and validation
 
-Package: kate5-data
+Package: kate6-data
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: kate (<< 4:19.04.0),
-          kate-data (<< 4:4.14.3-0ubuntu4),
-          ${kde-l10n:all}
-Breaks: kate (<< 4:19.04.0), kate-data (<< 4:4.14.3-0ubuntu4), ${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
@@ -88,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.install b/debian/kate.install
index a4c0f3e..a38f3ee 100644
--- a/debian/kate.install
+++ b/debian/kate.install
@@ -1,5 +1,5 @@
 usr/bin/kate
 usr/lib/*/libkateprivate.so.2*
-usr/lib/*/qt5/plugins/ktexteditor/
+usr/lib/*/qt6/plugins/
 usr/share/applications/org.kde.kate.desktop
 usr/share/metainfo/org.kde.kate.appdata.xml
diff --git a/debian/kate6-data.install b/debian/kate6-data.install
new file mode 100644
index 0000000..d97d0bb
--- /dev/null
+++ b/debian/kate6-data.install
@@ -0,0 +1,11 @@
+usr/share/doc/HTML/*/kate/
+usr/share/doc/HTML/*/katepart/
+usr/share/icons/hicolor/*/apps/kate.png
+usr/share/icons/hicolor/scalable/apps/kate.svg
+usr/share/kateproject/kateproject.example
+usr/share/katexmltools/
+usr/share/locale/*/LC_MESSAGES/*kate*.mo
+usr/share/locale/*/LC_MESSAGES/ktexteditorpreviewplugin.mo
+usr/share/locale/*/LC_MESSAGES/lspclient.mo
+usr/share/locale/*/LC_MESSAGES/tabswitcherplugin.mo
+usr/share/man/man1/kate.1
diff --git a/debian/kate6-data.maintscript b/debian/kate6-data.maintscript
new file mode 100644
index 0000000..f8ed9b8
--- /dev/null
+++ b/debian/kate6-data.maintscript
@@ -0,0 +1,2 @@
+rm_conffile /etc/xdg/katerc 4:15.12.0-1~~
+rm_conffile /etc/xdg/ktexteditor_codesnippets_core.knsrc 4:15.12.0-1~~
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 24de128..df4c088 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +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
-
-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