[neon/qt6/qt6-wayland/Neon/release] debian: Remove private-dev package.
Patrick Franz
null at kde.org
Tue Dec 14 16:27:00 GMT 2021
Git commit 3ae489a928b88b9676657e4ce3891884a7223d5a by Patrick Franz.
Committed on 13/12/2021 at 21:38.
Pushed by jriddell into branch 'Neon/release'.
Remove private-dev package.
M +13 -27 debian/control
M +10 -0 debian/not-installed
D +0 -10 debian/qt6-wayland-private-dev.install
M +1 -1 debian/rules
https://invent.kde.org/neon/qt6/qt6-wayland/commit/3ae489a928b88b9676657e4ce3891884a7223d5a
diff --git a/debian/control b/debian/control
index 1b9603f..f126857 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Description: Qt 6 Wayland Client library
.
QtWayland is a Qt 6 module that wraps the functionality of Wayland.
.
- This package contains the Qt 6 Client library.
+ This package contains the Qt 6 Wayland Client library.
Package: libqt6waylandcompositor6
Architecture: any
@@ -53,7 +53,7 @@ Description: Qt 6 Wayland Compositor library
.
QtWayland is a Qt 6 module that wraps the functionality of Wayland.
.
- This package contains the Qt 6 Compositor library.
+ This package contains the Qt 6 Wayland Compositor library.
Package: libqt6waylandeglclienthwintegration6
Architecture: any
@@ -67,7 +67,7 @@ Description: Qt 6 Wayland WaylandEglClientHwIntegration library
.
QtWayland is a Qt 6 module that wraps the functionality of Wayland.
.
- This package contains the Qt 6 WaylandEglClientHwIntegration library.
+ This package contains the Qt 6 Wayland EglClientHwIntegration library.
Package: libqt6waylandeglcompositorhwintegration6
Architecture: any
@@ -81,7 +81,7 @@ Description: Qt 6 Wayland WaylandEglCompositorHwIntegration library
.
QtWayland is a Qt 6 module that wraps the functionality of Wayland.
.
- This package contains the Qt 6 WaylandEglCompositorHwIntegration library.
+ This package contains the Qt 6 Wayland EglCompositorHwIntegration library.
Package: libqt6wlshellintegration6
Architecture: any
@@ -89,13 +89,13 @@ Multi-Arch: same
Depends: libqt6waylandclient6 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
-Description: Qt 6 Wayland WlShellIntegration library
+Description: Qt 6 Wayland ShellIntegration library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
QtWayland is a Qt 6 module that wraps the functionality of Wayland.
.
- This package contains the Qt 6 WlShellIntegration library.
+ This package contains the Qt 6 Wayland ShellIntegration library.
Package: qml6-module-qtwayland-compositor
Multi-Arch: same
@@ -119,20 +119,6 @@ Description: Qt 6 Wayland Shared Texture Provider QML module
This module allows Qt Wayland clients to use graphical resources exported
by the compositor, without allocating any graphics memory in the client.
-Package: qt6-wayland-dev-tools
-Architecture: any
-Multi-Arch: foreign
-Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 6 Wayland developer tools
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- QtWayland is a Qt 6 module that wraps the functionality of Wayland.
- .
- This package contains the QtWayland developer tools.
- At the moment there is only qtwaylandscanner tool here.
-
Package: qt6-wayland
Architecture: any
Multi-Arch: same
@@ -166,16 +152,16 @@ Description: Qt 6 Wayland - development files
This package contains the development files for QtWayland client
and compositor libraries.
-Package: qt6-wayland-private-dev
+Package: qt6-wayland-dev-tools
Architecture: any
-Section: libdevel
-Multi-Arch: same
-Depends: qt6-wayland-dev (= ${binary:Version}), ${misc:Depends}
-Description: Qt 6 Wayland private - development files
+Multi-Arch: foreign
+Section: devel
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 6 Wayland developer tools
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
QtWayland is a Qt 6 module that wraps the functionality of Wayland.
.
- This package contains the private development files for QtWayland client
- and compositor libraries.
+ This package contains the QtWayland developer tools.
+ At the moment there is only qtwaylandscanner tool here.
diff --git a/debian/not-installed b/debian/not-installed
index c22bd6f..38e8b49 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -184,3 +184,13 @@ usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6wlshellintegrationprivate_none_metaty
usr/share/qt6/modules/WaylandEglClientHwIntegrationPrivate.json
usr/share/qt6/modules/WaylandEglCompositorHwIntegrationPrivate.json
usr/share/qt6/modules/WlShellIntegrationPrivate.json
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/6.*
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/6.*
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglClientHwIntegration/6.*
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglCompositorHwIntegration/6.*
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWlShellIntegration/6.*
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_wayland_egl_client_hw_integration_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_wayland_egl_compositor_hw_integration_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_waylandclient_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_waylandcompositor_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_wl_shell_integration_private.pri
diff --git a/debian/qt6-wayland-private-dev.install b/debian/qt6-wayland-private-dev.install
deleted file mode 100644
index f75773b..0000000
--- a/debian/qt6-wayland-private-dev.install
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandClient/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandCompositor/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglClientHwIntegration/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWaylandEglCompositorHwIntegration/6.*
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWlShellIntegration/6.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_wayland_egl_client_hw_integration_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_wayland_egl_compositor_hw_integration_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_waylandclient_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_waylandcompositor_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_wl_shell_integration_private.pri
diff --git a/debian/rules b/debian/rules
index 884c737..273b07d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
override_dh_auto_configure:
dh_auto_configure -- \
- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files
More information about the Neon-commits
mailing list