[neon/neon-packaging/ktextaddons/Neon/unstable] debian: Merge branch 'Neon/stable' into Neon/unstable

[Rik Mills]

Git commit ab9b3504d3df9942eebebbdbbb9e8982dc6627c2 by Rik Mills.
Committed on 07/09/2023 at 17:36.
Pushed by rikmills into branch 'Neon/unstable'.

Merge branch 'Neon/stable' into Neon/unstable

M  +124  -68   debian/control
M  +2    -2    debian/libkf5ktextaddons-dev.install

https://invent.kde.org/neon/neon-packaging/ktextaddons/-/commit/ab9b3504d3df9942eebebbdbbb9e8982dc6627c2

diff --cc debian/control
index 51e7143,ea03db7..eee3609
--- a/debian/control
+++ b/debian/control
@@@ -2,23 -2,23 +2,24 @@@ Source: ktextaddon
  Section: kde
  Priority: optional
  Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
- Build-Depends: cmake,
+ Build-Depends: cmake (>= 3.16~),
                 debhelper-compat (= 13),
-                extra-cmake-modules,
+                extra-cmake-modules (>= 5.105.0~),
 +               gettext,
-                libkf5archive-dev,
-                libkf5configwidgets-dev,
-                libkf5coreaddons-dev,
-                libkf5kio-dev,
-                libkf5i18n-dev,
-                libkf5sonnet-dev,
-                libkf5syntaxhighlighting-dev,
-                libkf5xmlgui-dev,
+                libkf5archive-dev (>= 5.105.0~),
+                libkf5configwidgets-dev (>= 5.105.0~),
+                libkf5coreaddons-dev (>= 5.105.0~),
+                libkf5i18n-dev (>= 5.105.0~),
+                libkf5kio-dev (>= 5.105.0~),
+                libkf5sonnet-dev (>= 5.105.0~),
+                libkf5syntaxhighlighting-dev (>= 5.105.0~),
+                libkf5xmlgui-dev (>= 5.105.0~),
                 libqt5texttospeech5-dev,
                 pkg-kde-tools,
-                qt5keychain-dev,
-                qtbase5-dev,
-                qttools5-dev
+                qtbase5-dev (>= 5.15.2~),
+                qtkeychain-qt5-dev,
+                qttools5-dev,
+                qttools5-dev-tools,
  Standards-Version: 4.5.0
  Homepage: https://invent.kde.org/libraries/ktextaddons
  
@@@ -122,20 -167,14 +169,29 @@@ Description: KDE text handling addons 
  Package: libkf5textutils1
  Architecture: any
  Multi-Arch: same
- Depends: ${misc:Depends}, ${shlibs:Depends}
+ Depends: ktextaddons (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
  Breaks: ktextaddons (<< 1.3.2)
  Replaces: ktextaddons (<< 1.3.2)
- Description: Text processing library from KDE - addon text utilities
+ Description: KDE text handling addons - text utils library
+  KTextAddons is a collection of text addons libraries developed by the KDE
+  community.
   .
-  This package is part of the KDE libraries module.
- 
+  This collection of libraries provide functionalities such as autocorrection,
+  text to speak, grammar checking, text translator or emoticon support.
+  .
+  This package provides the text utils library.
 +
 +Package: libkf5textspeechtotext1
 +Architecture: any
 +Multi-Arch: same
- Depends: ${misc:Depends}, ${shlibs:Depends}
++Depends: ktextaddons (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends
 +Breaks: ktextaddons (<< 1.5.0)
 +Replaces: ktextaddons (<< 1.5.0)
- Description: Text processing library from KDE - text to speech features
++Description: KDE text handling addons - textospeech library
++ KTextAddons is a collection of text addons libraries developed by the KDE
++ community.
++ .
++ This collection of libraries provide functionalities such as autocorrection,
++ text to speak, grammar checking, text translator or emoticon support.
 + .
-  This package is part of the KDE libraries module.
++ This package provides the texttospeech library.
diff --cc debian/libkf5ktextaddons-dev.install
index bc5dce7,f6c221a..6737a51
--- a/debian/libkf5ktextaddons-dev.install
+++ b/debian/libkf5ktextaddons-dev.install
@@@ -1,9 -1,8 +1,9 @@@
  usr/include/
+ usr/lib/*/cmake/KF5TextAddonsWidgets/
  usr/lib/*/cmake/KF5TextAutoCorrectionCore/
  usr/lib/*/cmake/KF5TextAutoCorrectionWidgets/
- usr/lib/*/cmake/KF5TextAddonsWidgets/
  usr/lib/*/cmake/KF5TextCustomEditor/
 +usr/lib/*/cmake/KF5TextSpeechToText/
  usr/lib/*/cmake/KF5TextEditTextToSpeech/
  usr/lib/*/cmake/KF5TextEmoticonsCore/
  usr/lib/*/cmake/KF5TextEmoticonsWidgets/