[SCM] qt3d packaging branch, master, updated. 824b755f4f679b132eb760af4e946b665851a041

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit bde0e80400f246ba139a26edaa64c9d7afb517c4
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Dec 17 17:00:23 2013 +0000

    Build against Qt 5.2.0, use QT_SELECT
---
 debian/control           |  5 ++---
 debian/qt3d5-dev.install | 14 ++------------
 debian/rules             |  2 ++
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 501f24f..e5732c3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,8 @@ Uploaders: Timo Jyrinki <timo at debian.org>,
 Build-Depends: debhelper (>= 9.0.0),
                libqt5opengl5-dev,
                pkg-kde-tools,
-               qt5-default,
-               qtbase5-private-dev,
-               qtdeclarative5-private-dev,
+               qtbase5-private-dev (>= 5.2.0+dfsg~),
+               qtdeclarative5-private-dev (>= 5.2.0~),
                zlib1g-dev,
 Standards-Version: 3.9.3
 Homepage: http://qt-project.org/
diff --git a/debian/qt3d5-dev.install b/debian/qt3d5-dev.install
index 4d0d14d..3d646b4 100644
--- a/debian/qt3d5-dev.install
+++ b/debian/qt3d5-dev.install
@@ -1,7 +1,3 @@
-usr/include/qt5/Qt3D/QAiLoader
-usr/include/qt5/Qt3D/QAiMesh
-usr/include/qt5/Qt3D/QAiScene
-usr/include/qt5/Qt3D/QAiSceneHandler
 usr/include/qt5/Qt3D/QAreaAllocator
 usr/include/qt5/Qt3D/QArray
 usr/include/qt5/Qt3D/QArrayAlignedChar
@@ -84,12 +80,6 @@ usr/include/qt5/Qt3D/QVector4DArray
 usr/include/qt5/Qt3D/Qt3D
 usr/include/qt5/Qt3D/Qt3DVersion
 usr/include/qt5/Qt3D/QtArrayData
-usr/include/qt5/Qt3D/ailoaderiostream.h
-usr/include/qt5/Qt3D/ailoaderiosystem.h
-usr/include/qt5/Qt3D/qailoader.h
-usr/include/qt5/Qt3D/qaimesh.h
-usr/include/qt5/Qt3D/qaiscene.h
-usr/include/qt5/Qt3D/qaiscenehandler.h
 usr/include/qt5/Qt3D/qareaallocator.h
 usr/include/qt5/Qt3D/qarray.h
 usr/include/qt5/Qt3D/qbox3d.h
@@ -169,7 +159,6 @@ usr/include/qt5/Qt3DQuick/QQuickViewport
 usr/include/qt5/Qt3DQuick/Qt3DQuick
 usr/include/qt5/Qt3DQuick/Qt3DQuickVersion
 usr/include/qt5/Qt3DQuick/capsulemesh.h
-usr/include/qt5/Qt3DQuick/cube.h
 usr/include/qt5/Qt3DQuick/cylindermesh.h
 usr/include/qt5/Qt3DQuick/line.h
 usr/include/qt5/Qt3DQuick/point.h
@@ -182,10 +171,11 @@ usr/include/qt5/Qt3DQuick/qquickviewport.h
 usr/include/qt5/Qt3DQuick/qt3dquickglobal.h
 usr/include/qt5/Qt3DQuick/qt3dquickversion.h
 usr/include/qt5/Qt3DQuick/spheremesh.h
-usr/include/qt5/Qt3DQuick/teapot.h
 usr/lib/*/*.prl
 usr/lib/*/*.so
 usr/lib/*/cmake/*
 usr/lib/*/pkgconfig/*
 usr/lib/*/qt5/bin/qglinfo
 usr/share/qt5/mkspecs/modules/*
+usr/include/qt5/Qt3D/Qt3DDepends
+usr/include/qt5/Qt3DQuick/Qt3DQuickDepends
diff --git a/debian/rules b/debian/rules
index 6bb3706..80b0456 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export QT_SELECT=qt5
+
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed

-- 
qt3d packaging