[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.0-beta3-2-6-g3a0bd7c

[Simon Quigley]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=7940ec5

The following commit has been merged in the experimental branch:
commit 7940ec5952a0ba7d4b32784ca53231831a534bdb
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sat Jun 3 18:12:36 2017 -0500

    Some files were moved around and/or deleted; update the install files to reflect that.
---
 debian/changelog                              | 2 ++
 debian/qml-module-qtquick-sharedimage.install | 4 ++--
 debian/qtdeclarative5-dev.install             | 4 ----
 debian/qtdeclarative5-private-dev.install     | 1 -
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0932194..ea1ff2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtdeclarative-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
   [ Simon Quigley ]
   * New upstream release.
   * Remove qv4isel_always_export.patch as it's reverse-applicable.
+  * Some files were moved around and/or deleted; update the install files to
+    reflect that.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 02 Jun 2017 23:08:37 -0500
 
diff --git a/debian/qml-module-qtquick-sharedimage.install b/debian/qml-module-qtquick-sharedimage.install
index 981123b..db25567 100644
--- a/debian/qml-module-qtquick-sharedimage.install
+++ b/debian/qml-module-qtquick-sharedimage.install
@@ -1,2 +1,2 @@
-usr/lib/*/qt5/qml/QtQuick/SharedImage/libsharedimageplugin.so
-usr/lib/*/qt5/qml/QtQuick/SharedImage/qmldir
+usr/lib/*/qt5/qml/Qt/labs/sharedimage/libsharedimageplugin.so
+usr/lib/*/qt5/qml/Qt/labs/sharedimage/qmldir
diff --git a/debian/qtdeclarative5-dev.install b/debian/qtdeclarative5-dev.install
index 35a4105..e498ae9 100644
--- a/debian/qtdeclarative5-dev.install
+++ b/debian/qtdeclarative5-dev.install
@@ -70,10 +70,6 @@ usr/include/*/qt5/QtQmlDebug/QtQmlDebug
 usr/include/*/qt5/QtQmlDebug/QtQmlDebugDepends
 usr/include/*/qt5/QtQmlDebug/QtQmlDebugVersion
 usr/include/*/qt5/QtQmlDebug/qtqmldebugversion.h
-usr/include/*/qt5/QtQmlDevTools/QtQmlDevTools
-usr/include/*/qt5/QtQmlDevTools/QtQmlDevToolsDepends
-usr/include/*/qt5/QtQmlDevTools/QtQmlDevToolsVersion
-usr/include/*/qt5/QtQmlDevTools/qtqmldevtoolsversion.h
 usr/include/*/qt5/QtQuick/QQuickAsyncImageProvider
 usr/include/*/qt5/QtQuick/QQuickFramebufferObject
 usr/include/*/qt5/QtQuick/QQuickImageProvider
diff --git a/debian/qtdeclarative5-private-dev.install b/debian/qtdeclarative5-private-dev.install
index 58a6d77..e4ad31f 100644
--- a/debian/qtdeclarative5-private-dev.install
+++ b/debian/qtdeclarative5-private-dev.install
@@ -1,7 +1,6 @@
 usr/include/*/qt5/QtPacketProtocol/*/QtPacketProtocol/private/*
 usr/include/*/qt5/QtQml/*/QtQml/private/*.h
 usr/include/*/qt5/QtQmlDebug/*/QtQmlDebug/private/*
-usr/include/*/qt5/QtQmlDevTools/*/QtQmlDevTools/private/*.h
 usr/include/*/qt5/QtQuick/*/QtQuick/private/*.h
 usr/include/*/qt5/QtQuickParticles/*/QtQuickParticles/private/*.h
 usr/include/*/qt5/QtQuickTest/*/QtQuickTest/private/*.h

-- 
qtdeclarative packaging