[neon/qt6/qt6-wayland/Neon/release] debian: lints and internal version deps
Carlos De Maine
null at kde.org
Sun Dec 10 03:45:08 GMT 2023
Git commit 468ba3ebfe52926fb12b2e3aab2cb7fa69b90a3d by Carlos De Maine.
Committed on 10/12/2023 at 04:43.
Pushed by carlosdem into branch 'Neon/release'.
lints and internal version deps
(cherry picked from commit 9b0e7e9493350cd4dd4dd4440722a360ddaeff06)
M +1 -1 debian/changelog
M +55 -24 debian/control
M +0 -9 debian/copyright
D +0 -1 debian/patches/series
M +3 -2 debian/qt6-wayland-dev.install
M +0 -1 debian/qt6-wayland-doc.install
A +1 -0 debian/qt6-wayland.lintian-overrides
https://invent.kde.org/neon/qt6/qt6-wayland/-/commit/468ba3ebfe52926fb12b2e3aab2cb7fa69b90a3d
diff --git a/debian/changelog b/debian/changelog
index e3c9bef..3c43e80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -100,4 +100,4 @@ qt6-wayland (6.2.2-1) experimental; urgency=medium
* Initial release (Closes: #999898)
- -- Patrick Franz <deltaone at debian.org> Thu, 18 Nov 2021 09:15:34 +0100
\ No newline at end of file
+ -- Patrick Franz <deltaone at debian.org> Thu, 18 Nov 2021 09:15:34 +0100
diff --git a/debian/control b/debian/control
index 9374714..ded661e 100644
--- a/debian/control
+++ b/debian/control
@@ -22,15 +22,15 @@ Build-Depends: cmake,
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.4.2+dfsg~),
- qt6-declarative-dev (>= 6.4.2+dfsg~),
+ qt6-base-dev (>= 6.6.1~),
+ qt6-declarative-dev (>= 6.6.1~),
qt6-wayland-dev:native <cross>,
xauth <!nocheck>,
xvfb <!nocheck>,
zlib1g-dev
-Build-Depends-Indep: qt6-base-dev (>= 6.4~) <!nodoc>,
- qt6-documentation-tools (>= 6.4~) <!nodoc>,
- qt6-base-doc (>= 6.4~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+ qt6-documentation-tools (>= 6.6~) <!nodoc>,
+ qt6-base-doc (>= 6.6~) <!nodoc>,
Standards-Version: 4.6.2
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-wayland
@@ -41,7 +41,24 @@ Package: qt6-wayland
Architecture: any
Section: kde
X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: qt6-waylandclient-private-abi (= 6.6.1),
+ qt6-waylandcompositor-private-abi (= 6.6.1),
+ libqt6waylandclient6,
+ libqt6waylandcompositor6,
+ libqt6waylandeglclienthwintegration6,
+ libqt6waylandeglcompositorhwintegration6,
+ libqt6wlshellintegration6,
+ qml6-module-qtwayland-compositor,
+ qml6-module-qtwayland-client-texturesharing,
+Replaces: libqt6waylandclient6,
+ libqt6waylandcompositor6,
+ libqt6waylandeglclienthwintegration6,
+ libqt6waylandeglcompositorhwintegration6,
+ libqt6wlshellintegration6,
+ qml6-module-qtwayland-compositor,
+ qml6-module-qtwayland-client-texturesharing,
Description: Qt 6 Wayland Client library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -54,8 +71,18 @@ Package: qt6-wayland-dev
Architecture: any
Section: kde
X-Neon-MergedPackage: true
-Depends: qt6-wayland (= ${binary:Version}),
- ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libwayland-dev,
+ qt6-base-dev,
+ qt6-wayland (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides: qt6-wayland-dev-tools,
+ qt6-wayland-private-dev,
+ qt6-wayland-examples,
+Replaces: qt6-wayland-dev-tools,
+ qt6-wayland-private-dev,
+ qt6-wayland-examples,
Description: Qt 6 Wayland - 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.
@@ -69,9 +96,13 @@ Package: qt6-wayland-doc
Architecture: all
Section: kde
X-Neon-MergedPackage: true
+Pre-Depends: ${misc:Pre-Depends}
Depends: qt6-base-doc,
- qt6-wayland-dev(= ${binary:Version}),
- ${misc:Depends}
+ qt6-wayland-dev (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides: qt6-wayland-doc-html,
+Replaces: qt6-wayland-doc-html,
Description: Qt 6 Wayland - documentation files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -83,66 +114,66 @@ Description: Qt 6 Wayland - documentation files
Package: libqt6waylandclient6
Architecture: all
-Depends: qt6-wayland
+Depends: qt6-wayland, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6waylandcompositor6
Architecture: all
-Depends: qt6-wayland
+Depends: qt6-wayland, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6waylandeglclienthwintegration6
Architecture: all
-Depends: qt6-wayland
+Depends: qt6-wayland, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6waylandeglcompositorhwintegration6
Architecture: all
-Depends: qt6-wayland
+Depends: qt6-wayland, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: libqt6wlshellintegration6
Architecture: all
-Depends: qt6-wayland
+Depends: qt6-wayland, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qml6-module-qtwayland-compositor
Architecture: all
-Depends: qt6-wayland
+Depends: qt6-wayland, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qml6-module-qtwayland-client-texturesharing
Architecture: all
-Depends: qt6-wayland
+Depends: qt6-wayland, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
Package: qt6-wayland-dev-tools
Architecture: all
-Depends: qt6-wayland-dev
+Depends: qt6-wayland-dev, ${misc:Depends}
Description: Dummy transitional
- Transitional dummy package.
+ Transitional dummy package.
Package: qt6-wayland-private-dev
Architecture: all
-Depends: qt6-wayland-dev
+Depends: qt6-wayland-dev, ${misc:Depends}
Description: Dummy transitional
- Transitional dummy package.
+ Transitional dummy package.
Package: qt6-wayland-doc-html
Architecture: all
-Depends: qt6-wayland-doc
+Depends: qt6-wayland-doc, ${misc:Depends}
Description: Dummy transitional
- Transitional dummy package.
+ Transitional dummy package.
Package: qt6-wayland-examples
Architecture: all
-Depends: qt6-wayland-dev
+Depends: qt6-wayland-dev, ${misc:Depends}
Description: Dummy transitional
- Transitional dummy package.
+ Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index bdd34b2..9d5de30 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,10 +18,6 @@ Files: config.tests/*
Copyright: 2015-2021 The Qt Company Ltd.
License: BSD-3-clause
-Files: conanfile.py
-Copyright: 2021 The Qt Company Ltd.
-License: GPL-3 with Qt-1.0 exception
-
Files: tests/auto/*
Copyright: 2016-2020 The Qt Company Ltd.
2018-2019 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
@@ -42,7 +38,6 @@ Files: examples/wayland/ivi-compositor/doc/src/ivi-compositor.qdoc
examples/wayland/multi-output/doc/src/multi-output.qdoc
examples/wayland/multi-screen/doc/src/multi-screen.qdoc
examples/wayland/overview-compositor/doc/src/overview-compositor.qdoc
- examples/wayland/pure-qml/doc/src/pure-qml.qdoc
examples/wayland/server-side-decoration/doc/src/server-side-decoration.qdoc
examples/wayland/spanning-screens/doc/src/spanning-screens.qdoc
src/compositor/doc/src/qt6-changes.qdoc
@@ -58,10 +53,6 @@ Files: src/plugins/shellintegration/fullscreen-shell-v1/*
Copyright: 2018-2019 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
License: LGPL-3 or GPL-2
-Files: examples/wayland/pure-qml/qml/Keyboard.qml
-Copyright: 2017 Klarälvdalens Datakonsult AB (KDAB)
-License: BSD-3-clause
-
Files: src/client/shellintegration/*
src/hardwareintegration/*/libhybris-egl-server/*
src/plugins/hardwareintegration/*/libhybris-egl-server/main.cpp
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8b13789..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/qt6-wayland-dev.install b/debian/qt6-wayland-dev.install
index c693f55..e6454e6 100644
--- a/debian/qt6-wayland-dev.install
+++ b/debian/qt6-wayland-dev.install
@@ -2,8 +2,9 @@ usr/include/
usr/lib/${DEB_HOST_MULTIARCH}/cmake/
usr/lib/${DEB_HOST_MULTIARCH}/libQt6*.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6*.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/
-usr/lib/qt6/libexec/qtwaylandscanner
usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/*.json
+usr/lib/qt6/libexec/qtwaylandscanner
diff --git a/debian/qt6-wayland-doc.install b/debian/qt6-wayland-doc.install
index ccdb08c..8536ff4 100644
--- a/debian/qt6-wayland-doc.install
+++ b/debian/qt6-wayland-doc.install
@@ -1,2 +1 @@
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
usr/share/qt6/doc/
diff --git a/debian/qt6-wayland.lintian-overrides b/debian/qt6-wayland.lintian-overrides
new file mode 100644
index 0000000..438e862
--- /dev/null
+++ b/debian/qt6-wayland.lintian-overrides
@@ -0,0 +1 @@
+qt6-wayland: package-name-doesnt-match-sonames libQt6WaylandClient6 libQt6WaylandCompositor6 libQt6WaylandEglClientHwIntegration6 libQt6WaylandEglCompositorHwIntegration6 libQt6WlShellIntegration6
More information about the Neon-commits
mailing list