[neon/qt6/qt6-webchannel/Neon/release] debian: revert to salsa experimental for qt 6.4.1 and run qt_sixy
Jonathan Esk-Riddell
null at kde.org
Tue Dec 6 13:33:29 GMT 2022
Git commit dbb4ac4bf1ab779504c3d5790432d4e1df035d7a by Jonathan Esk-Riddell.
Committed on 06/12/2022 at 13:30.
Pushed by jriddell into branch 'Neon/release'.
revert to salsa experimental for qt 6.4.1 and run qt_sixy
A +1 -0 debian/.gitattributes
A +1 -0 debian/.gitignore
M +98 -4 debian/changelog
M +21 -11 debian/control
M +6 -0 debian/not-installed
M +27 -7 debian/qt6-webchannel-dev.install
M +4 -2 debian/qt6-webchannel.install
M +9 -2 debian/rules
https://invent.kde.org/neon/qt6/qt6-webchannel/commit/dbb4ac4bf1ab779504c3d5790432d4e1df035d7a
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..027271b
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+files
diff --git a/debian/changelog b/debian/changelog
index b229158..bb2dfff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,103 @@
-qt6-webchannel (6.4.0-0neon) UNRELEASED; urgency=medium
+qt6-webchannel (6.4.1-2) experimental; urgency=medium
- * new release
- * New release
+ [ Patrick Franz ]
+ * Rename libqt6webchannel6-dev to qt6-webchannel-dev.
- -- Jonathan Riddell <jr at jriddell.org> Wed, 02 Feb 2022 15:13:50 +0000
+ -- Patrick Franz <deltaone at debian.org> Wed, 30 Nov 2022 23:52:35 +0100
+
+qt6-webchannel (6.4.1-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.4.1).
+ * Bump Qt B-Ds to 6.4.1.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 16 Nov 2022 19:05:36 +0100
+
+qt6-webchannel (6.4.0-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Enable link time optimization (Closes: #1015629).
+ * Pass QT_HOST_PATH to cmake in cross-builds, thx to Helmut Grohne
+ (Closes: #1023077).
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 05 Nov 2022 10:02:45 +0100
+
+qt6-webchannel (6.4.0-1) experimental; urgency=medium
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Bump minimum CMake version in order to get pkg-config's .pc files.
+
+ [ Patrick Franz ]
+ * Increase CMake verbosity level.
+ * New upstream release (6.4.0).
+ * Bump Qt B-Ds to 6.4.0.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Thu, 13 Oct 2022 12:33:59 +0200
+
+qt6-webchannel (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:24:11 +0200
+
+qt6-webchannel (6.3.1-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.1).
+ * Bump Qt B-Ds to 6.3.1.
+ * Bump Standards-Version to 4.6.1 (no changes needed).
+ * Update list of installed files.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 17 Jul 2022 16:48:23 +0200
+
+qt6-webchannel (6.3.0-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.0).
+ * Bump Qt B-Ds to 6.3.0.
+ * Update list of installed files.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 15 Jun 2022 18:18:38 +0200
+
+qt6-webchannel (6.2.4-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:07:55 +0200
+
+qt6-webchannel (6.2.4-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.2.4).
+ * Bump Qt B-Ds to 6.2.4.
+
+ -- Patrick Franz <deltaone at debian.org> Thu, 31 Mar 2022 23:16:19 +0200
+
+qt6-webchannel (6.2.2-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:07:02 +0100
+
+qt6-webchannel (6.2.2-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 06 Dec 2021 09:17:32 +0100
+
+qt6-webchannel (6.2.2-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.2.2).
+ * Bump Qt B-Ds to 6.2.2.
+ * Update installed files.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 06 Dec 2021 08:26:26 +0100
qt6-webchannel (6.2.1-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 830d835..8bb3aad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Patrick Franz <deltaone at debian.org>
-Build-Depends: cmake (>= 3.18~),
+Build-Depends: cmake (>= 3.24~),
debhelper-compat (= 13),
libgl-dev,
libssl-dev,
@@ -12,10 +12,10 @@ Build-Depends: cmake (>= 3.18~),
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.4.0),
- qt6-declarative-dev (>= 6.4.0),
- qt6-websockets-dev (>= 6.4.0)
-Standards-Version: 4.6.0
+ qt6-base-dev (>= 6.4.1+dfsg~),
+ qt6-declarative-dev (>= 6.4.1+dfsg~),
+ qt6-websockets-dev (>= 6.4.1~)
+Standards-Version: 4.6.1
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-webchannel
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-webchannel.git
@@ -24,9 +24,7 @@ Rules-Requires-Root: no
Package: qt6-webchannel
Architecture: any
Section: kde
-Provides: libqt6webchannel6, qml6-module-qtwebchannel
-Breaks: libqt6webchannel6 (<< 6.4), qml6-module-qtwebchannel (<< 6.4)
-Replaces: libqt6webchannel6 (<< 6.4), qml6-module-qtwebchannel (<< 6.4)
+X-Neon-MergedPackage: true
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt 6 WebChannel library
@@ -43,13 +41,13 @@ Description: Qt 6 WebChannel library
Package: qt6-webchannel-dev
Architecture: any
Section: kde
-Provides: libqt6webchannel6-dev
-Breaks: libqt6webchannel6-dev (<< 6.4)
-Replaces: libqt6webchannel6-dev (<< 6.4)
+X-Neon-MergedPackage: true
Depends: qt6-base-dev,
qt6-declarative-dev,
qt6-webchannel (= ${binary:Version}),
${misc:Depends}
+Breaks: libqt6webchannel6-dev (<< 6.4.1-2~)
+Replaces: libqt6webchannel6-dev (<< 6.4.1-2~)
Description: Qt 6 WebChannel library - 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.
@@ -61,3 +59,15 @@ Description: Qt 6 WebChannel library - development files
.
This package contains the development files needed to build Qt 6 applications
using the QtWebChannel library.
+
+Package: libqt6webchannel6
+Architecture: all
+Depends: qt6-webchannel
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtwebchannel
+Architecture: all
+Depends: qt6-webchannel
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/not-installed b/debian/not-installed
index f893d11..0413cae 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,8 @@
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/6.*
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6webchannelAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6webchannelConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6webchannelConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6webchannelConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6webchannelTargets-none.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6webchannelTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_webchannel_private.pri
diff --git a/debian/qt6-webchannel-dev.install b/debian/qt6-webchannel-dev.install
index acc62df..1c1af07 100644
--- a/debian/qt6-webchannel-dev.install
+++ b/debian/qt6-webchannel-dev.install
@@ -1,7 +1,27 @@
-usr/include/
-usr/lib/*/cmake/
-usr/lib/*/libQt6*.prl
-usr/lib/*/libQt6*.so
-usr/lib/*/metatypes/qt6*metatypes.json
-usr/lib/*/pkgconfig/Qt6*.pc
-usr/lib/*/qt6/mkspecs/
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QQmlWebChannel
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QWebChannel
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QWebChannelAbstractTransport
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QtWebChannel
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QtWebChannelDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/QtWebChannelVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qqmlwebchannel.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qtwebchannelexports.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qtwebchannelversion.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qwebchannel.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qwebchannelabstracttransport.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtWebChannel/qwebchannelglobal.h
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtWebChannelTestsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6WebChannel/Qt6WebChannelVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebChannel.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebChannel.so
+usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6webchannel_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6WebChannel.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_webchannel.pri
+usr/share/qt6/modules/WebChannel.json
diff --git a/debian/qt6-webchannel.install b/debian/qt6-webchannel.install
index b1d32b1..74c9235 100644
--- a/debian/qt6-webchannel.install
+++ b/debian/qt6-webchannel.install
@@ -1,2 +1,4 @@
-usr/lib/*/libQt6*.so.6*
-usr/lib/*/qt6/qml
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6WebChannel.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebChannel/libwebchannelplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebChannel/plugins.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtWebChannel/qmldir
diff --git a/debian/rules b/debian/rules
index 149018d..89e1536 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,21 @@
#!/usr/bin/make -f
include /usr/share/dpkg/architecture.mk
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
+
+# QT_HOST_PATH isn't passed in cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+ extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
override_dh_auto_configure:
dh_auto_configure -- \
- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+ --log-level=STATUS \
+ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+ $(extra_cmake_args)
execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files
More information about the Neon-commits
mailing list