[neon/kde/kguiaddons/Neon/release_focal] debian: merge

[Jonathan Esk-Riddell]

Git commit e7b2b871476d0116c22f12bbce623f47d09c4c7b by Jonathan Esk-Riddell.
Committed on 13/06/2022 at 12:00.
Pushed by jriddell into branch 'Neon/release_focal'.

merge

M  +1    -1    debian/control
M  +2    -0    debian/libkf5guiaddons5.install

https://invent.kde.org/neon/kde/kguiaddons/commit/e7b2b871476d0116c22f12bbce623f47d09c4c7b

diff --cc debian/control
index 8b241b1,e3d88a3..0ddb2f1
--- a/debian/control
+++ b/debian/control
@@@ -17,37 -16,15 +17,37 @@@ Build-Depends: cmake (>= 3.16~)
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 plasma-wayland-protocols,
-                qtbase5-dev (>= 5.15.2~),
+                qtbase5-dev (>= 5.8.0~),
                 qtbase5-private-dev,
 +               qttools5-dev,
                 qttools5-dev-tools (>= 5.4),
 -               qtwayland5-dev-tools,
 -               qtwayland5-private-dev
 -Standards-Version: 4.1.4
 -Homepage: http://projects.kde.org/kguiaddons
 +               qtwayland5-dev-tools (>= 5.15.0~) [linux-any]
 +Standards-Version: 4.6.0
 +Homepage: https://invent.kde.org/frameworks/kguiaddons
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kguiaddons
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kguiaddons.git
 +Rules-Requires-Root: no
 +
 +Package: libkf5guiaddons-bin
 +Architecture: any
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Replaces: libkf5guiaddons5 (<< 5.94.0)
 +Breaks: libkf5guiaddons5 (<< 5.94.0)
 +Description: additional addons for QtGui
 + Qt widgets for colours, fonts and text
 + .
 + This package contains kde-geo-uri-handler.
 +
 +Package: libkf5guiaddons-data
 +Architecture: all
 +Multi-Arch: foreign
 +Depends: ${misc:Depends}, ${shlibs:Depends}
 +Breaks: libkf5guiaddons5 (<< 5.94.0)
 +Replaces: libkf5guiaddons5 (<< 5.94.0)
 +Description: additional addons for QtGui
 + Qt widgets for colours, fonts and text
 + .
 + This package contains shared data files.
  
  Package: libkf5guiaddons-dev
  Section: libdevel
diff --cc debian/libkf5guiaddons5.install
index a4c8044,97f1e38..ebad7cd
--- a/debian/libkf5guiaddons5.install
+++ b/debian/libkf5guiaddons5.install
@@@ -1,2 -1,5 +1,4 @@@
 -usr/bin/kde-geo-uri-handler
  usr/lib/*/libKF5GuiAddons.so.5
  usr/lib/*/libKF5GuiAddons.so.5.*
+ usr/share/applications/
+ usr/share/qlogging-categories5/