[SCM] qtquick1 packaging branch, master, updated. debian/5.2.1-2-2-g18693dc

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 4c1cccccbf9d335d5cb776ad6538ff7d61ac0ce6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Mar 1 17:32:06 2014 -0300

    Revert "Simplify qtquick1-5-dev.install."
    
    This reverts commit 5cc32f0765755f0bdcfa469a9c50545c2490ce7b.
    
    This would install the private headers in a wrong place.
---
 debian/changelog              |  5 +++++
 debian/qtquick1-5-dev.install | 52 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8b0ac74..acdabdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 qtquick1-opensource-src (5.2.1-2) UNRELEASED; urgency=medium
 
+<<<<<<<
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Install private headers, needed by Qt Creator.
     - Add script to mark private symbols as such.
   * Simplify qtquick1-5-dev.install.
+=======
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Install private headers, needed by Qt Creator.
+>>>>>>>
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 01 Mar 2014 17:01:31 -0300
 
diff --git a/debian/qtquick1-5-dev.install b/debian/qtquick1-5-dev.install
index 2f8850b..d1e8785 100644
--- a/debian/qtquick1-5-dev.install
+++ b/debian/qtquick1-5-dev.install
@@ -1,4 +1,54 @@
-usr/include/qt5/QtDeclarative/*
+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

-- 
qtquick1 packaging