[SCM] qtwayland packaging branch, experimental, updated. debian/5.6.1-2-7-g361d9bd

Tue Jun 28 13:09:00 UTC 2016

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

The following commit has been merged in the experimental branch:
commit 566458406710d436d7ef2bbd90909b41b402957d
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jun 28 13:48:20 2016 +0200

    update packaging
    
    - new examples (now properly installed)
    - new compositor library
    - new dev package for library
    - new qml module for compositor
    - updated dbg to alternatively want the compositor library
    - made client-dev more explicit WRT what it installs
    - dropped examples pro removal from previously bugged example install
---
 debian/control                                 | 49 ++++++++++++++++++++++++--
 debian/libqt5waylandclient5-dev.install        |  9 ++---
 debian/libqt5waylandclient5.install            |  3 +-
 debian/libqt5waylandcompositor5-dev.install    |  7 ++++
 debian/libqt5waylandcompositor5.install        |  2 ++
 debian/qml-module-qtwayland-compositor.install |  1 +
 debian/qtwayland5-examples.install             |  1 +
 debian/rules                                   |  4 +--
 8 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 1d60667..d7303da 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,18 @@ Homepage: http://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtwayland.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtwayland.git
 
+Package: qtwayland5-examples
+Architecture: any
+Multi-Arch: same
+Section: x11
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 Wayland examples
+ 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 examples of the Qt 5 Wayland module.
+
 Package: libqt5waylandclient5
 Architecture: any
 Multi-Arch: same
@@ -38,17 +50,49 @@ Description: QtWayland client library
  .
  This package contains the QtWayland client library.
 
+Package: libqt5waylandcompositor5
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: QtWayland compositor library
+ QtWayland is a Qt 5 module that wraps the functionality of Wayland.
+ .
+ This package contains the QtWayland compositor library.
+
+Package: qml-module-qtwayland-compositor
+Section: libs
+Multi-Arch: same
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 5 Wayland Compository 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.
+ .
+ The Qt Wayland Compositor modules provide QML types that can be used to
+ create custom display servers supporting the Wayland protocol.
+
 Package: libqt5waylandclient5-dev
 Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends: libqt5waylandclient5 (= ${binary:Version}), ${misc:Depends}
-Description: QtWayland development files
+Description: QtWayland client development files
  QtWayland is a Qt 5 module that wraps the functionality of Wayland.
  .
  This package contains the development files for QtWayland client
  library.
 
+Package: libqt5waylandcompositor5-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libqt5waylandcompositor5 (= ${binary:Version}), ${misc:Depends}
+Description: QtWayland compositor development files
+ QtWayland is a Qt 5 module that wraps the functionality of Wayland.
+ .
+ This package contains the development files for QtWayland compositor
+ library.
+
 Package: qtwayland5
 Architecture: any
 Multi-Arch: same
@@ -65,7 +109,8 @@ Architecture: any
 Priority: extra
 Section: debug
 Multi-Arch: same
-Depends: libqt5waylandclient5 (= ${binary:Version}), ${misc:Depends}
+Depends: libqt5waylandclient5 (= ${binary:Version}) | libqt5waylandcompositor5 (= ${binary:Version}),
+         ${misc:Depends}
 Description: QtWayland debugging symbols
  QtWayland is a Qt 5 module that wraps the functionality of Wayland.
  .
diff --git a/debian/libqt5waylandclient5-dev.install b/debian/libqt5waylandclient5-dev.install
index 8497940..d4ad0a4 100644
--- a/debian/libqt5waylandclient5-dev.install
+++ b/debian/libqt5waylandclient5-dev.install
@@ -1,6 +1,7 @@
-usr/include/
-usr/lib/*/cmake/
+usr/include/*/qt5/QtWaylandClient/
+usr/lib/*/cmake/Qt5WaylandClient/
 usr/lib/*/libQt5WaylandClient.prl
 usr/lib/*/libQt5WaylandClient.so
-usr/lib/*/pkgconfig/
-usr/lib/*/qt5/mkspecs
+usr/lib/*/pkgconfig/Qt5WaylandClient.pc
+usr/lib/*/qt5/mkspecs/qt_lib_waylandclient.pri
+usr/lib/*/qt5/mkspecs/qt_lib_waylandclient_private.pri
diff --git a/debian/libqt5waylandclient5.install b/debian/libqt5waylandclient5.install
index 74d7dad..df6fca8 100644
--- a/debian/libqt5waylandclient5.install
+++ b/debian/libqt5waylandclient5.install
@@ -1 +1,2 @@
-usr/lib/*/libQt5WaylandClient.so.*
+usr/lib/*/libQt5WaylandClient.so.5
+usr/lib/*/libQt5WaylandClient.so.5.*
diff --git a/debian/libqt5waylandcompositor5-dev.install b/debian/libqt5waylandcompositor5-dev.install
new file mode 100644
index 0000000..7c551f7
--- /dev/null
+++ b/debian/libqt5waylandcompositor5-dev.install
@@ -0,0 +1,7 @@
+usr/include/*/qt5/QtWaylandCompositor/
+usr/lib/*/cmake/Qt5WaylandCompositor/
+usr/lib/*/libQt5WaylandCompositor.prl
+usr/lib/*/libQt5WaylandCompositor.so
+usr/lib/*/pkgconfig/Qt5WaylandCompositor.pc
+usr/lib/*/qt5/mkspecs/modules/qt_lib_waylandcompositor.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_waylandcompositor_private.pri
diff --git a/debian/libqt5waylandcompositor5.install b/debian/libqt5waylandcompositor5.install
new file mode 100644
index 0000000..ef0af41
--- /dev/null
+++ b/debian/libqt5waylandcompositor5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libQt5WaylandCompositor.so.5
+usr/lib/*/libQt5WaylandCompositor.so.5.*
diff --git a/debian/qml-module-qtwayland-compositor.install b/debian/qml-module-qtwayland-compositor.install
new file mode 100644
index 0000000..7c9a0b7
--- /dev/null
+++ b/debian/qml-module-qtwayland-compositor.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/qml/QtWayland/Compositor/*
diff --git a/debian/qtwayland5-examples.install b/debian/qtwayland5-examples.install
new file mode 100644
index 0000000..4334d02
--- /dev/null
+++ b/debian/qtwayland5-examples.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/examples/wayland/
diff --git a/debian/rules b/debian/rules
index 75d3d79..0c3a45e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,7 @@ override_dh_auto_install:
 
 	# Remove libtool-like file
 	rm -vf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5WaylandClient.la
-
-	# Remove a lonely example .pro file, there is no matching code for it.
-	rm -vf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/wayland/wayland.pro
+	rm -vf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt5WaylandCompositor.la
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qtwayland packaging

