[neon/qt/qtbase/Neon/testing] debian: files moved in debian merge

[Jonathan Riddell]

Git commit f07b71c1e51a7fef8e857ec506ff1ca05f50b5b7 by Jonathan Riddell.
Committed on 21/10/2020 at 15:27.
Pushed by jriddell into branch 'Neon/testing'.

files moved in debian merge

M  +2    -2    debian/control
M  +0    -4    debian/qtbase5-dev.install

https://invent.kde.org/neon/qt/qtbase/commit/f07b71c1e51a7fef8e857ec506ff1ca05f50b5b7

diff --git a/debian/control b/debian/control
index 707972f..45c2f6a 100644
--- a/debian/control
+++ b/debian/control
@@ -390,8 +390,8 @@ Depends: libfontconfig1-dev,
          libxkbcommon-dev,
          qtbase5-dev (= ${binary:Version}),
          ${misc:Depends}
-Breaks: qt5-qmake (<< 5.11.3+dfsg-3~), qtbase5-dev (<< 5.11.2+dfsg-4~)
-Replaces: qt5-qmake (<< 5.11.3+dfsg-3~), qtbase5-dev (<< 5.11.2+dfsg-4~)
+Breaks: qt5-qmake (<< 5.11.3+dfsg-3~), qtbase5-dev (<< 5.15.1)
+Replaces: qt5-qmake (<< 5.11.3+dfsg-3~), qtbase5-dev (<< 5.15.1)
 Description: Qt 5 base private development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/qtbase5-dev.install b/debian/qtbase5-dev.install
index 8c4f252..dd9736e 100755
--- a/debian/qtbase5-dev.install
+++ b/debian/qtbase5-dev.install
@@ -1630,10 +1630,6 @@ usr/include/*/qt5/QtWidgets/qwhatsthis.h
 usr/include/*/qt5/QtWidgets/qwidget.h
 usr/include/*/qt5/QtWidgets/qwidgetaction.h
 usr/include/*/qt5/QtWidgets/qwizard.h
-usr/include/*/qt5/QtXkbCommonSupport/QtXkbCommonSupportDepends
-usr/include/*/qt5/QtXkbCommonSupport/QtXkbCommonSupportVersion
-usr/include/*/qt5/QtXkbCommonSupport/QtXkbCommonSupport
-usr/include/*/qt5/QtXkbCommonSupport/qtxkbcommonsupportversion.h
 usr/include/*/qt5/QtXml/QDomAttr
 usr/include/*/qt5/QtXml/QDomCDATASection
 usr/include/*/qt5/QtXml/QDomCharacterData