[SCM] qt3d packaging branch, master, updated. 34bd966568918744a908724820e5ecf655333701
Timo Jyrinki
timo at moszumanska.debian.org
Tue Jul 14 11:50:23 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=8f47f22
The following commit has been merged in the master branch:
commit 8f47f22ac400c55b8a34948edf13faa5ad74e915
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Tue Jul 14 11:44:13 2015 +0000
Update *.install, control, remove private headers.
For now, do not split libs into separate packages, but can be done.
Qt 3D 2.0 has many.
---
debian/control | 49 ++---------
debian/libqt53d5.install | 2 +-
debian/libqt53dquick5.install | 1 -
debian/qml-module-qt3d.install | 15 +---
debian/qt3d5-dev.install | 180 +--------------------------------------
debian/qt3d5-examples.install | 2 +-
debian/qt3d5-private-dev.install | 3 -
7 files changed, 11 insertions(+), 241 deletions(-)
diff --git a/debian/control b/debian/control
index 3f652e6..e35f84d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,10 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Timo Jyrinki <timo at debian.org>,
Build-Depends: debhelper (>= 9.0.0),
libqt5opengl5-dev,
+ libqt5xcbqpa5,
pkg-kde-tools,
- qtbase5-private-dev (>= 5.2.1+dfsg~),
- qtdeclarative5-private-dev (>= 5.2.1~),
+ qtbase5-private-dev (>= 5.5.0~),
+ qtdeclarative5-private-dev (>= 5.5.0~),
xauth,
xvfb,
zlib1g-dev,
@@ -32,34 +33,17 @@ Description: Qt 3D module
snapshot of an ongoing development. The package is very likely to
change in a binary incompatible way, and no guarantees are given.
-Package: libqt53dquick5
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libqt53d5 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends},
-Description: Qt 3D Quick module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains Qt 3D Quick module.
- .
- WARNING: This module is not an official part of Qt 5, but instead a git
- snapshot of an ongoing development. The package is very likely to
- change in a binary incompatible way, and no guarantees are given.
-
Package: qml-module-qt3d
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends},
Depends: ${misc:Depends},
${shlibs:Depends},
-Description: Qt 5 3D QML plugin
+Description: Qt 5 3D QML module
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- This package contains the Qt 3D QML plugin.
+ This package contains the Qt 3D QML module.
.
WARNING: This module is not an official part of Qt 5, but instead a git
snapshot of an ongoing development. The package is very likely to
@@ -70,11 +54,10 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libqt53d5 (= ${binary:Version}),
- libqt53dquick5 (= ${binary:Version}),
qtbase5-dev,
${misc:Depends},
${shlibs:Depends},
-Description: Qt 5 3d development files
+Description: Qt 5 3D 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.
.
@@ -85,25 +68,6 @@ Description: Qt 5 3d development files
snapshot of an ongoing development. The package is very likely to
change in a binary incompatible way, and no guarantees are given.
-Package: qt3d5-private-dev
-Architecture: any
-Section: libdevel
-Multi-Arch: same
-Depends: qt3d5-dev (= ${binary:Version}),
- ${misc:Depends},
-Description: Qt 5 3d 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.
- .
- This package contains the private header development files for building some
- Qt 5 applications using 3D private headers.
- .
- Use at your own risk.
- .
- WARNING: This module is not an official part of Qt 5, but instead a git
- snapshot of an ongoing development. The package is very likely to
- change in a binary incompatible way, and no guarantees are given.
-
Package: qt3d5-examples
Architecture: any
Multi-Arch: same
@@ -127,7 +91,6 @@ Multi-Arch: same
Section: debug
Depends: libqt53d5 (= ${binary:Version}),
${misc:Depends},
-Recommends: libqt53dquick5 (= ${binary:Version}),
Suggests: qt3d5-examples (= ${binary:Version})
Description: Qt 3D library debugging symbols
Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/libqt53d5.install b/debian/libqt53d5.install
index 1e88781..3de3b10 100644
--- a/debian/libqt53d5.install
+++ b/debian/libqt53d5.install
@@ -1 +1 @@
-usr/lib/*/libQt53D.so.*
+usr/lib/*/*.so.*
diff --git a/debian/libqt53dquick5.install b/debian/libqt53dquick5.install
deleted file mode 100644
index 77f4af7..0000000
--- a/debian/libqt53dquick5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libQt53DQuick.so.*
diff --git a/debian/qml-module-qt3d.install b/debian/qml-module-qt3d.install
index f497468..2ff088f 100644
--- a/debian/qml-module-qt3d.install
+++ b/debian/qml-module-qt3d.install
@@ -1,14 +1 @@
-usr/lib/*/qt5/qml/Qt3D/Shapes/Capsule.qml
-usr/lib/*/qt5/qml/Qt3D/Shapes/Cube.qml
-usr/lib/*/qt5/qml/Qt3D/Shapes/Cylinder.qml
-usr/lib/*/qt5/qml/Qt3D/Shapes/Quad.qml
-usr/lib/*/qt5/qml/Qt3D/Shapes/Sphere.qml
-usr/lib/*/qt5/qml/Qt3D/Shapes/Teapot.qml
-usr/lib/*/qt5/qml/Qt3D/Shapes/cube.obj
-usr/lib/*/qt5/qml/Qt3D/Shapes/plugins.qmltypes
-usr/lib/*/qt5/qml/Qt3D/Shapes/qmldir
-usr/lib/*/qt5/qml/Qt3D/Shapes/quad.obj
-usr/lib/*/qt5/qml/Qt3D/Shapes/teapot.bez
-usr/lib/*/qt5/qml/Qt3D/libqthreedqmlplugin.so
-usr/lib/*/qt5/qml/Qt3D/plugins.qmltypes
-usr/lib/*/qt5/qml/Qt3D/qmldir
+usr/lib/*/qt5/qml/*
diff --git a/debian/qt3d5-dev.install b/debian/qt3d5-dev.install
index d71af0a..7b2c029 100644
--- a/debian/qt3d5-dev.install
+++ b/debian/qt3d5-dev.install
@@ -1,182 +1,6 @@
-usr/include/*/qt5/Qt3D/QAreaAllocator
-usr/include/*/qt5/Qt3D/QArray
-usr/include/*/qt5/Qt3D/QArrayAlignedChar
-usr/include/*/qt5/Qt3D/QArrayAlignedPrealloc
-usr/include/*/qt5/Qt3D/QBox3D
-usr/include/*/qt5/Qt3D/QColor4ub
-usr/include/*/qt5/Qt3D/QCustomDataArray
-usr/include/*/qt5/Qt3D/QDownloadManager
-usr/include/*/qt5/Qt3D/QGLAbstractEffect
-usr/include/*/qt5/Qt3D/QGLAbstractMaterial
-usr/include/*/qt5/Qt3D/QGLAbstractScene
-usr/include/*/qt5/Qt3D/QGLAbstractSurface
-usr/include/*/qt5/Qt3D/QGLAttributeDescription
-usr/include/*/qt5/Qt3D/QGLAttributeSet
-usr/include/*/qt5/Qt3D/QGLAttributeValue
-usr/include/*/qt5/Qt3D/QGLBezierPatches
-usr/include/*/qt5/Qt3D/QGLBezierScene
-usr/include/*/qt5/Qt3D/QGLBezierSceneHandler
-usr/include/*/qt5/Qt3D/QGLBuilder
-usr/include/*/qt5/Qt3D/QGLCamera
-usr/include/*/qt5/Qt3D/QGLCameraAnimation
-usr/include/*/qt5/Qt3D/QGLColladaFxEffect
-usr/include/*/qt5/Qt3D/QGLColladaFxEffectFactory
-usr/include/*/qt5/Qt3D/QGLColladaFxEffectLoader
-usr/include/*/qt5/Qt3D/QGLColladaImageParam
-usr/include/*/qt5/Qt3D/QGLColladaParam
-usr/include/*/qt5/Qt3D/QGLColladaSampler2DParam
-usr/include/*/qt5/Qt3D/QGLColladaSurfaceParam
-usr/include/*/qt5/Qt3D/QGLColladaTextureParam
-usr/include/*/qt5/Qt3D/QGLColorMaterial
-usr/include/*/qt5/Qt3D/QGLCube
-usr/include/*/qt5/Qt3D/QGLCylinder
-usr/include/*/qt5/Qt3D/QGLDome
-usr/include/*/qt5/Qt3D/QGLFramebufferObjectSurface
-usr/include/*/qt5/Qt3D/QGLIndexBuffer
-usr/include/*/qt5/Qt3D/QGLLightModel
-usr/include/*/qt5/Qt3D/QGLLightParameters
-usr/include/*/qt5/Qt3D/QGLMaterial
-usr/include/*/qt5/Qt3D/QGLMaterialCollection
-usr/include/*/qt5/Qt3D/QGLMockView
-usr/include/*/qt5/Qt3D/QGLPainter
-usr/include/*/qt5/Qt3D/QGLPickNode
-usr/include/*/qt5/Qt3D/QGLPixelBufferSurface
-usr/include/*/qt5/Qt3D/QGLRenderOrder
-usr/include/*/qt5/Qt3D/QGLRenderOrderComparator
-usr/include/*/qt5/Qt3D/QGLRenderSequencer
-usr/include/*/qt5/Qt3D/QGLRenderState
-usr/include/*/qt5/Qt3D/QGLSceneAnimation
-usr/include/*/qt5/Qt3D/QGLSceneFormatFactoryInterface
-usr/include/*/qt5/Qt3D/QGLSceneFormatHandler
-usr/include/*/qt5/Qt3D/QGLSceneNode
-usr/include/*/qt5/Qt3D/QGLShaderProgramEffect
-usr/include/*/qt5/Qt3D/QGLSphere
-usr/include/*/qt5/Qt3D/QGLSubsurface
-usr/include/*/qt5/Qt3D/QGLTeapot
-usr/include/*/qt5/Qt3D/QGLTexture2D
-usr/include/*/qt5/Qt3D/QGLTextureCube
-usr/include/*/qt5/Qt3D/QGLTwoSidedMaterial
-usr/include/*/qt5/Qt3D/QGLVertexBundle
-usr/include/*/qt5/Qt3D/QGLView
-usr/include/*/qt5/Qt3D/QGLWindowSurface
-usr/include/*/qt5/Qt3D/QGeneralAreaAllocator
-usr/include/*/qt5/Qt3D/QGeometryData
-usr/include/*/qt5/Qt3D/QGraphicsBillboardTransform
-usr/include/*/qt5/Qt3D/QGraphicsRotation3D
-usr/include/*/qt5/Qt3D/QGraphicsScale3D
-usr/include/*/qt5/Qt3D/QGraphicsTranslation3D
-usr/include/*/qt5/Qt3D/QLogicalVertex
-usr/include/*/qt5/Qt3D/QMatrix4x4Stack
-usr/include/*/qt5/Qt3D/QPlane3D
-usr/include/*/qt5/Qt3D/QQuickQGraphicsTransform3D
-usr/include/*/qt5/Qt3D/QRay3D
-usr/include/*/qt5/Qt3D/QSimpleAreaAllocator
-usr/include/*/qt5/Qt3D/QSphere3D
-usr/include/*/qt5/Qt3D/QTriangle3D
-usr/include/*/qt5/Qt3D/QUniformAreaAllocator
-usr/include/*/qt5/Qt3D/QVector2DArray
-usr/include/*/qt5/Qt3D/QVector3DArray
-usr/include/*/qt5/Qt3D/QVector4DArray
-usr/include/*/qt5/Qt3D/Qt3D
-usr/include/*/qt5/Qt3D/Qt3DDepends
-usr/include/*/qt5/Qt3D/Qt3DVersion
-usr/include/*/qt5/Qt3D/QtArrayData
-usr/include/*/qt5/Qt3D/qareaallocator.h
-usr/include/*/qt5/Qt3D/qarray.h
-usr/include/*/qt5/Qt3D/qbox3d.h
-usr/include/*/qt5/Qt3D/qcolor4ub.h
-usr/include/*/qt5/Qt3D/qcustomdataarray.h
-usr/include/*/qt5/Qt3D/qdownloadmanager.h
-usr/include/*/qt5/Qt3D/qgeometrydata.h
-usr/include/*/qt5/Qt3D/qglabstracteffect.h
-usr/include/*/qt5/Qt3D/qglabstractmaterial.h
-usr/include/*/qt5/Qt3D/qglabstractscene.h
-usr/include/*/qt5/Qt3D/qglabstractsurface.h
-usr/include/*/qt5/Qt3D/qglattributedescription.h
-usr/include/*/qt5/Qt3D/qglattributeset.h
-usr/include/*/qt5/Qt3D/qglattributevalue.h
-usr/include/*/qt5/Qt3D/qglbezierpatches.h
-usr/include/*/qt5/Qt3D/qglbezierscene.h
-usr/include/*/qt5/Qt3D/qglbezierscenehandler.h
-usr/include/*/qt5/Qt3D/qglbuilder.h
-usr/include/*/qt5/Qt3D/qglcamera.h
-usr/include/*/qt5/Qt3D/qglcameraanimation.h
-usr/include/*/qt5/Qt3D/qglcolladafxeffect.h
-usr/include/*/qt5/Qt3D/qglcolladafxeffectfactory.h
-usr/include/*/qt5/Qt3D/qglcolladafxeffectloader.h
-usr/include/*/qt5/Qt3D/qglcolormaterial.h
-usr/include/*/qt5/Qt3D/qglcube.h
-usr/include/*/qt5/Qt3D/qglcylinder.h
-usr/include/*/qt5/Qt3D/qgldome.h
-usr/include/*/qt5/Qt3D/qglframebufferobjectsurface.h
-usr/include/*/qt5/Qt3D/qglindexbuffer.h
-usr/include/*/qt5/Qt3D/qgllightmodel.h
-usr/include/*/qt5/Qt3D/qgllightparameters.h
-usr/include/*/qt5/Qt3D/qglmaterial.h
-usr/include/*/qt5/Qt3D/qglmaterialcollection.h
-usr/include/*/qt5/Qt3D/qglmockview.h
-usr/include/*/qt5/Qt3D/qglnamespace.h
-usr/include/*/qt5/Qt3D/qglpainter.h
-usr/include/*/qt5/Qt3D/qglpicknode.h
-usr/include/*/qt5/Qt3D/qglpixelbuffersurface.h
-usr/include/*/qt5/Qt3D/qglrenderorder.h
-usr/include/*/qt5/Qt3D/qglrenderordercomparator.h
-usr/include/*/qt5/Qt3D/qglrendersequencer.h
-usr/include/*/qt5/Qt3D/qglrenderstate.h
-usr/include/*/qt5/Qt3D/qglsceneanimation.h
-usr/include/*/qt5/Qt3D/qglsceneformatplugin.h
-usr/include/*/qt5/Qt3D/qglscenenode.h
-usr/include/*/qt5/Qt3D/qglshaderprogrameffect.h
-usr/include/*/qt5/Qt3D/qglsphere.h
-usr/include/*/qt5/Qt3D/qglsubsurface.h
-usr/include/*/qt5/Qt3D/qglteapot.h
-usr/include/*/qt5/Qt3D/qgltexture2d.h
-usr/include/*/qt5/Qt3D/qgltexturecube.h
-usr/include/*/qt5/Qt3D/qgltwosidedmaterial.h
-usr/include/*/qt5/Qt3D/qglvertexbundle.h
-usr/include/*/qt5/Qt3D/qglview.h
-usr/include/*/qt5/Qt3D/qglwindowsurface.h
-usr/include/*/qt5/Qt3D/qgraphicsbillboardtransform.h
-usr/include/*/qt5/Qt3D/qgraphicsrotation3d.h
-usr/include/*/qt5/Qt3D/qgraphicsscale3d.h
-usr/include/*/qt5/Qt3D/qgraphicstransform3d.h
-usr/include/*/qt5/Qt3D/qgraphicstranslation3d.h
-usr/include/*/qt5/Qt3D/qlogicalvertex.h
-usr/include/*/qt5/Qt3D/qmatrix4x4stack.h
-usr/include/*/qt5/Qt3D/qplane3d.h
-usr/include/*/qt5/Qt3D/qray3d.h
-usr/include/*/qt5/Qt3D/qsphere3d.h
-usr/include/*/qt5/Qt3D/qt3dglobal.h
-usr/include/*/qt5/Qt3D/qt3dversion.h
-usr/include/*/qt5/Qt3D/qtriangle3d.h
-usr/include/*/qt5/Qt3D/qvector2darray.h
-usr/include/*/qt5/Qt3D/qvector3darray.h
-usr/include/*/qt5/Qt3D/qvector4darray.h
-usr/include/*/qt5/Qt3DQuick/QQuickAnimation3D
-usr/include/*/qt5/Qt3DQuick/QQuickEffect
-usr/include/*/qt5/Qt3DQuick/QQuickItem3D
-usr/include/*/qt5/Qt3DQuick/QQuickMesh
-usr/include/*/qt5/Qt3DQuick/QQuickViewport
-usr/include/*/qt5/Qt3DQuick/Qt3DQuick
-usr/include/*/qt5/Qt3DQuick/Qt3DQuickDepends
-usr/include/*/qt5/Qt3DQuick/Qt3DQuickVersion
-usr/include/*/qt5/Qt3DQuick/capsulemesh.h
-usr/include/*/qt5/Qt3DQuick/cylindermesh.h
-usr/include/*/qt5/Qt3DQuick/line.h
-usr/include/*/qt5/Qt3DQuick/point.h
-usr/include/*/qt5/Qt3DQuick/qmlres.h
-usr/include/*/qt5/Qt3DQuick/qquickanimation3d.h
-usr/include/*/qt5/Qt3DQuick/qquickeffect.h
-usr/include/*/qt5/Qt3DQuick/qquickitem3d.h
-usr/include/*/qt5/Qt3DQuick/qquickmesh.h
-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/Qt3D*/*
usr/lib/*/*.prl
usr/lib/*/*.so
usr/lib/*/cmake/*
usr/lib/*/pkgconfig/*
-usr/lib/*/qt5/bin/qglinfo
-usr/lib/*/qt5/mkspecs/modules/qt_lib_3d.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_3dquick.pri
+usr/lib/*/qt5/mkspecs/modules/*
diff --git a/debian/qt3d5-examples.install b/debian/qt3d5-examples.install
index 97c4a2a..f7648b9 100644
--- a/debian/qt3d5-examples.install
+++ b/debian/qt3d5-examples.install
@@ -1 +1 @@
-usr/lib/*/qt5/examples/*
+usr/lib/*/qt5/examples/qt3d/
diff --git a/debian/qt3d5-private-dev.install b/debian/qt3d5-private-dev.install
deleted file mode 100644
index 33d8236..0000000
--- a/debian/qt3d5-private-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/*/qt5/Qt3D/*/Qt3D/private/*
-usr/lib/*/qt5/mkspecs/modules/qt_lib_3d_private.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_3dquick_private.pri
--
qt3d packaging
More information about the pkg-kde-commits
mailing list