[SCM] qtquick1 packaging branch, experimental, updated. debian/5.2.1-3-5-g47ae535

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit dc1f452e37eedc74cf243f2be80eb875b2e5f24e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu May 29 15:48:32 2014 -0300

    Move headers, -dev m-a: same.
---
 debian/changelog                      |   2 +
 debian/control                        |   1 +
 debian/qtquick1-5-dev.install         | 102 +++++++++++++++++-----------------
 debian/qtquick1-5-private-dev.install |   2 +-
 4 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b54f12d..bcdc848 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtquick1-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Bump Qt build dependencies.
+  * Move headers to their new m-a path. Mark development package as
+    Multi-Arch: same.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2014 15:37:13 -0300
 
diff --git a/debian/control b/debian/control
index 24a5558..d288d53 100644
--- a/debian/control
+++ b/debian/control
@@ -84,6 +84,7 @@ Description: Qt Quick 1 tools
 
 Package: qtquick1-5-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libqt5declarative5 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
 Description: Qt Quick 1 development files
diff --git a/debian/qtquick1-5-dev.install b/debian/qtquick1-5-dev.install
index d1e8785..d5e4c3d 100644
--- a/debian/qtquick1-5-dev.install
+++ b/debian/qtquick1-5-dev.install
@@ -1,54 +1,54 @@
-usr/include/qt5/QtDeclarative/QDeclarativeAttachedPropertiesFunc
-usr/include/qt5/QtDeclarative/QDeclarativeComponent
-usr/include/qt5/QtDeclarative/QDeclarativeContext
-usr/include/qt5/QtDeclarative/QDeclarativeDebuggingEnabler
-usr/include/qt5/QtDeclarative/QDeclarativeEngine
-usr/include/qt5/QtDeclarative/QDeclarativeError
-usr/include/qt5/QtDeclarative/QDeclarativeExpression
-usr/include/qt5/QtDeclarative/QDeclarativeExtensionInterface
-usr/include/qt5/QtDeclarative/QDeclarativeExtensionPlugin
-usr/include/qt5/QtDeclarative/QDeclarativeImageProvider
-usr/include/qt5/QtDeclarative/QDeclarativeInfo
-usr/include/qt5/QtDeclarative/QDeclarativeItem
-usr/include/qt5/QtDeclarative/QDeclarativeListProperty
-usr/include/qt5/QtDeclarative/QDeclarativeListReference
-usr/include/qt5/QtDeclarative/QDeclarativeNetworkAccessManagerFactory
-usr/include/qt5/QtDeclarative/QDeclarativeParserStatus
-usr/include/qt5/QtDeclarative/QDeclarativeProperties
-usr/include/qt5/QtDeclarative/QDeclarativeProperty
-usr/include/qt5/QtDeclarative/QDeclarativePropertyMap
-usr/include/qt5/QtDeclarative/QDeclarativePropertyValueInterceptor
-usr/include/qt5/QtDeclarative/QDeclarativePropertyValueSource
-usr/include/qt5/QtDeclarative/QDeclarativeScriptString
-usr/include/qt5/QtDeclarative/QDeclarativeTypeInfo
-usr/include/qt5/QtDeclarative/QDeclarativeView
-usr/include/qt5/QtDeclarative/QtDeclarative
-usr/include/qt5/QtDeclarative/QtDeclarativeDepends
-usr/include/qt5/QtDeclarative/QtDeclarativeVersion
-usr/include/qt5/QtDeclarative/qdeclarative.h
-usr/include/qt5/QtDeclarative/qdeclarativecomponent.h
-usr/include/qt5/QtDeclarative/qdeclarativecontext.h
-usr/include/qt5/QtDeclarative/qdeclarativedebug.h
-usr/include/qt5/QtDeclarative/qdeclarativeengine.h
-usr/include/qt5/QtDeclarative/qdeclarativeerror.h
-usr/include/qt5/QtDeclarative/qdeclarativeexpression.h
-usr/include/qt5/QtDeclarative/qdeclarativeextensioninterface.h
-usr/include/qt5/QtDeclarative/qdeclarativeextensionplugin.h
-usr/include/qt5/QtDeclarative/qdeclarativeimageprovider.h
-usr/include/qt5/QtDeclarative/qdeclarativeinfo.h
-usr/include/qt5/QtDeclarative/qdeclarativeitem.h
-usr/include/qt5/QtDeclarative/qdeclarativelist.h
-usr/include/qt5/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h
-usr/include/qt5/QtDeclarative/qdeclarativeparserstatus.h
-usr/include/qt5/QtDeclarative/qdeclarativeprivate.h
-usr/include/qt5/QtDeclarative/qdeclarativeproperty.h
-usr/include/qt5/QtDeclarative/qdeclarativepropertymap.h
-usr/include/qt5/QtDeclarative/qdeclarativepropertyvalueinterceptor.h
-usr/include/qt5/QtDeclarative/qdeclarativepropertyvaluesource.h
-usr/include/qt5/QtDeclarative/qdeclarativescriptstring.h
-usr/include/qt5/QtDeclarative/qdeclarativeview.h
-usr/include/qt5/QtDeclarative/qtdeclarativeglobal.h
-usr/include/qt5/QtDeclarative/qtdeclarativeversion.h
+usr/include/*/qt5/QtDeclarative/QDeclarativeAttachedPropertiesFunc
+usr/include/*/qt5/QtDeclarative/QDeclarativeComponent
+usr/include/*/qt5/QtDeclarative/QDeclarativeContext
+usr/include/*/qt5/QtDeclarative/QDeclarativeDebuggingEnabler
+usr/include/*/qt5/QtDeclarative/QDeclarativeEngine
+usr/include/*/qt5/QtDeclarative/QDeclarativeError
+usr/include/*/qt5/QtDeclarative/QDeclarativeExpression
+usr/include/*/qt5/QtDeclarative/QDeclarativeExtensionInterface
+usr/include/*/qt5/QtDeclarative/QDeclarativeExtensionPlugin
+usr/include/*/qt5/QtDeclarative/QDeclarativeImageProvider
+usr/include/*/qt5/QtDeclarative/QDeclarativeInfo
+usr/include/*/qt5/QtDeclarative/QDeclarativeItem
+usr/include/*/qt5/QtDeclarative/QDeclarativeListProperty
+usr/include/*/qt5/QtDeclarative/QDeclarativeListReference
+usr/include/*/qt5/QtDeclarative/QDeclarativeNetworkAccessManagerFactory
+usr/include/*/qt5/QtDeclarative/QDeclarativeParserStatus
+usr/include/*/qt5/QtDeclarative/QDeclarativeProperties
+usr/include/*/qt5/QtDeclarative/QDeclarativeProperty
+usr/include/*/qt5/QtDeclarative/QDeclarativePropertyMap
+usr/include/*/qt5/QtDeclarative/QDeclarativePropertyValueInterceptor
+usr/include/*/qt5/QtDeclarative/QDeclarativePropertyValueSource
+usr/include/*/qt5/QtDeclarative/QDeclarativeScriptString
+usr/include/*/qt5/QtDeclarative/QDeclarativeTypeInfo
+usr/include/*/qt5/QtDeclarative/QDeclarativeView
+usr/include/*/qt5/QtDeclarative/QtDeclarative
+usr/include/*/qt5/QtDeclarative/QtDeclarativeDepends
+usr/include/*/qt5/QtDeclarative/QtDeclarativeVersion
+usr/include/*/qt5/QtDeclarative/qdeclarative.h
+usr/include/*/qt5/QtDeclarative/qdeclarativecomponent.h
+usr/include/*/qt5/QtDeclarative/qdeclarativecontext.h
+usr/include/*/qt5/QtDeclarative/qdeclarativedebug.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeengine.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeerror.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeexpression.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeextensioninterface.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeextensionplugin.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeimageprovider.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeinfo.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeitem.h
+usr/include/*/qt5/QtDeclarative/qdeclarativelist.h
+usr/include/*/qt5/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeparserstatus.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeprivate.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeproperty.h
+usr/include/*/qt5/QtDeclarative/qdeclarativepropertymap.h
+usr/include/*/qt5/QtDeclarative/qdeclarativepropertyvalueinterceptor.h
+usr/include/*/qt5/QtDeclarative/qdeclarativepropertyvaluesource.h
+usr/include/*/qt5/QtDeclarative/qdeclarativescriptstring.h
+usr/include/*/qt5/QtDeclarative/qdeclarativeview.h
+usr/include/*/qt5/QtDeclarative/qtdeclarativeglobal.h
+usr/include/*/qt5/QtDeclarative/qtdeclarativeversion.h
 usr/lib/*/cmake/Qt5Declarative/Qt5DeclarativeConfig.cmake
 usr/lib/*/cmake/Qt5Declarative/Qt5DeclarativeConfigVersion.cmake
 usr/lib/*/libQt5Declarative.prl
diff --git a/debian/qtquick1-5-private-dev.install b/debian/qtquick1-5-private-dev.install
index 72f7002..eda0331 100644
--- a/debian/qtquick1-5-private-dev.install
+++ b/debian/qtquick1-5-private-dev.install
@@ -1,2 +1,2 @@
-usr/include/qt5/QtDeclarative/*/QtDeclarative/private/
+usr/include/*/qt5/QtDeclarative/*/QtDeclarative/private/
 usr/lib/*/qt5/mkspecs/modules/qt_lib_declarative_private.pri

-- 
qtquick1 packaging