[neon/qt/qtbase/Neon/experimental] debian: merge master

[Jonathan Riddell]

Git commit 6fccf1ccdbbefe1d9a1142e1d77b854cb1254b0d by Jonathan Riddell.
Committed on 21/10/2020 at 09:39.
Pushed by jriddell into branch 'Neon/experimental'.

merge master

M  +137  -16   debian/changelog
A  +1    -1    debian/compat
M  +12   -6    debian/control
M  +3    -5    debian/patches/gnukfreebsd.diff
M  +20   -21   debian/qtbase5-dev.install
M  +61   -17   debian/qtbase5-private-dev.install
M  +6    -2    debian/rules

https://invent.kde.org/neon/qt/qtbase/commit/6fccf1ccdbbefe1d9a1142e1d77b854cb1254b0d

diff --cc debian/compat
index f599e28,0000000..48082f7
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 10
++12
diff --cc debian/control
index dbf2cbd,2bbf559..69ff956
--- a/debian/control
+++ b/debian/control
@@@ -31,8 -32,9 +32,10 @@@ Build-Depends: debhelper-compat (= 12)
                 libicu-dev,
                 libinput-dev [linux-any],
                 libjpeg-dev,
+                libkrb5-dev,
+                libmd4c-dev,
                 libmtdev-dev [linux-any],
 +	       libmysqlclient-dev,
                 libpcre2-dev,
                 libpng-dev,
                 libpq-dev,
@@@ -82,11 -85,13 +87,11 @@@ Package: libqt5core5
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
- Provides: qtbase-abi-5-13-2
- Depends: ${misc:Depends}, ${shlibs:Depends}
+ Provides: qtbase-abi-5-14-2
+ Depends: shared-mime-info, ${misc:Depends}, ${shlibs:Depends}
  Recommends: qttranslations5-l10n
  Suggests: libthai0
 -Breaks: libqt5scintilla2-12v5 (<< 2.9.2+dfsg-2~),
 -        libqtcore4 (<< 4:4.8.7+dfsg-20~)
 -Replaces: libqtcore4 (<< 4:4.8.7+dfsg-20~)
 +Breaks: libqt5scintilla2-12v5 (<< 2.9.2+dfsg-2~)
  Description: Qt 5 core module
   Qt is a cross-platform C++ application framework. Qt's primary feature
   is its rich set of widgets that provide standard GUI functionality.
diff --cc debian/qtbase5-dev.install
index bec4ff7,14e62fb..8c4f252
--- a/debian/qtbase5-dev.install
+++ b/debian/qtbase5-dev.install
@@@ -26,15 -22,9 +26,12 @@@
  [linux-any] usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake
  [linux-any] usr/lib/*/cmake/Qt5Gui/Qt5Gui_QLibInputPlugin.cmake
  [linux-any] usr/lib/*/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
 +[linux-any] usr/lib/*/cmake/Qt5KmsSupport/Qt5KmsSupportConfig.cmake
 +[linux-any] usr/lib/*/cmake/Qt5KmsSupport/Qt5KmsSupportConfigVersion.cmake
  [linux-any] usr/lib/*/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake
  [linux-any] usr/lib/*/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake
- [linux-any] usr/lib/*/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig.cmake
- [linux-any] usr/lib/*/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfigVersion.cmake
- [linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_input_support_private.pri
  [linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri
 +[linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri
  usr/include/*/qt5/QtConcurrent/QtConcurrent
  usr/include/*/qt5/QtConcurrent/QtConcurrentDepends
  usr/include/*/qt5/QtConcurrent/QtConcurrentFilter
diff --cc debian/qtbase5-private-dev.install
index 3350b82,6444e7f..acf25b1
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@@ -30,12 -29,10 +29,12 @@@
  [linux-any] usr/include/*/qt5/QtVulkanSupport/QtVulkanSupportDepends
  [linux-any] usr/include/*/qt5/QtVulkanSupport/QtVulkanSupportVersion
  [linux-any] usr/include/*/qt5/QtVulkanSupport/qtvulkansupportversion.h
- [linux-any] usr/lib/*/libQt5InputSupport.a
- [linux-any] usr/lib/*/libQt5InputSupport.prl
+ [linux-any] usr/lib/*/cmake/Qt5VulkanSupport/Qt5VulkanSupportConfig.cmake
+ [linux-any] usr/lib/*/cmake/Qt5VulkanSupport/Qt5VulkanSupportConfigVersion.cmake
  [linux-any] usr/lib/*/libQt5VulkanSupport.a
  [linux-any] usr/lib/*/libQt5VulkanSupport.prl
 +[linux-any] usr/lib/*/libQt5XkbCommonSupport.a 
 +[linux-any] usr/lib/*/libQt5XkbCommonSupport.prl
  usr/include/*/qt5/QtAccessibilitySupport/5.*/*
  usr/include/*/qt5/QtAccessibilitySupport/QtAccessibilitySupport
  usr/include/*/qt5/QtAccessibilitySupport/QtAccessibilitySupportDepends