[neon/qt6/qt6-remoteobjects/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:32:18 GMT 2022
Git commit 6bafbef913c0035d2c7ebf73f24147bd32688eff 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 +73 -4 debian/changelog
M +33 -10 debian/control
M +1 -0 debian/copyright
M +2 -0 debian/not-installed
M +7 -0 debian/qt6-remoteobjects-dev.install
A +6 -0 debian/qt6-remoteobjects.install
M +1 -0 debian/rules
https://invent.kde.org/neon/qt6/qt6-remoteobjects/commit/6bafbef913c0035d2c7ebf73f24147bd32688eff
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 893cc35..4944684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,79 @@
-qt6-remoteobjects (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-remoteobjects (6.4.1-1) experimental; urgency=medium
- * New release
+ [ Patrick Franz ]
+ * New upstream release (6.4.1).
+ * Bump Qt B-Ds to 6.4.1.
- -- Jonathan Riddell <jr at jriddell.org> Wed, 02 Feb 2022 15:13:49 +0000
+ -- Patrick Franz <deltaone at debian.org> Thu, 17 Nov 2022 19:56:40 +0100
-qt6-remoteobjects (6.2.2-0neon) experimental; urgency=medium
+qt6-remoteobjects (6.4.0-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.4.0).
+ * Bump Qt B-Ds to 6.4.0.
+ * Increase CMake verbosity level.
+ * Bump minimum CMake version in order to get pkg-config's .pc files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 15 Oct 2022 18:18:37 +0200
+
+qt6-remoteobjects (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:23:38 +0200
+
+qt6-remoteobjects (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.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 17 Jul 2022 18:13:40 +0200
+
+qt6-remoteobjects (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 22:06:23 +0200
+
+qt6-remoteobjects (6.2.4-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:07:09 +0200
+
+qt6-remoteobjects (6.2.4-1) experimental; urgency=medium
+
+ [ Lu YaNing ]
+ * New upstream release (6.2.4).
+ * Bump Qt B-Ds to 6.2.4.
+
+ -- Lu YaNing <dluyaning at gmail.com> Thu, 31 Mar 2022 13:34:25 +0000
+
+qt6-remoteobjects (6.2.2-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:44:40 +0100
+
+qt6-remoteobjects (6.2.2-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 06 Dec 2021 09:04:01 +0100
+
+qt6-remoteobjects (6.2.2-1) experimental; urgency=medium
* Initial release (Closes: #999892)
diff --git a/debian/control b/debian/control
index fc5272f..26b4e9e 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>, Lu YaNing <dluyaning at gmail.com>
-Build-Depends: cmake (>= 3.18~),
+Build-Depends: cmake (>= 3.24~),
debhelper-compat (= 13),
libgl-dev,
libssl-dev,
@@ -11,11 +11,11 @@ Build-Depends: cmake (>= 3.18~),
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.2.1+dfsg~),
- qt6-declarative-dev (>= 6.2.1+dfsg~),
+ qt6-base-dev (>= 6.4.1+dfsg~),
+ qt6-declarative-dev (>= 6.4.1+dfsg~),
xauth <!nocheck>,
xvfb <!nocheck>
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-remoteobjects
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-remoteobjects.git
@@ -24,11 +24,10 @@ Rules-Requires-Root: no
Package: qt6-remoteobjects
Architecture: any
Section: kde
-Provides: libqt6remoteobjects6,
- libqt6remoteobjects6-bin,
- libqt6remoteobjectsqml6,
- qml6-module-qtremoteobjects
-Depends: ${misc:Depends},
+X-Neon-MergedPackage: true
+Depends: libqt6remoteobjects6 (= ${binary:Version}),
+ qml6-module-qtquick (>= 6.4.1+dfsg~),
+ ${misc:Depends},
${shlibs:Depends}
Description: Qt 6 Remote Objects library
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -42,7 +41,7 @@ Description: Qt 6 Remote Objects library
Package: qt6-remoteobjects-dev
Architecture: any
Section: kde
-Provides: qt6-remoteobjects-dev
+X-Neon-MergedPackage: true
Depends: qt6-base-dev, qt6-remoteobjects (= ${binary:Version}), ${misc:Depends}
Description: Qt 6 Remote Objects - development files
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -52,3 +51,27 @@ Description: Qt 6 Remote Objects - development files
information exchange between processes or computers.
.
This package contains the development files for Qt Remote Objects.
+
+Package: libqt6remoteobjects6
+Architecture: all
+Depends: qt6-remoteobjects
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6remoteobjectsqml6
+Architecture: all
+Depends: qt6-remoteobjects
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6remoteobjects6-bin
+Architecture: all
+Depends: qt6-remoteobjects
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtremoteobjects
+Architecture: all
+Depends: qt6-remoteobjects
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index e9047c1..e3b9eb9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,6 +23,7 @@ Copyright: 2021 The Qt Company Ltd.
License: GFDL-NIV-1.3
Files: examples/*
+ src/remoteobjects/doc/snippets/cmake-macros/*
Copyright: 2014-2019 Ford Motor Company
License: BSD-3-clause
diff --git a/debian/not-installed b/debian/not-installed
index d30dc96..773dad7 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -18,12 +18,14 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjec
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsConfigVersion.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsTargets-none.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6declarative_remoteobjectsConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserConfigVersion.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RepParser/Qt6RepParserConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/repparser.prf
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_remoteobjects_private.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_remoteobjectsqml_private.pri
diff --git a/debian/qt6-remoteobjects-dev.install b/debian/qt6-remoteobjects-dev.install
index f11f6f8..7532a88 100644
--- a/debian/qt6-remoteobjects-dev.install
+++ b/debian/qt6-remoteobjects-dev.install
@@ -34,6 +34,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectsettingsstore
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qremoteobjectsource.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qtremoteobjectglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qtremoteobjects-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qtremoteobjectsexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjects/qtremoteobjectsversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjectsQml/QtRemoteObjectsQml
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtRemoteObjectsQml/QtRemoteObjectsQmlDepends
@@ -43,6 +44,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtRemoteOb
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsMacros.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsTargets-*.cmake
@@ -51,6 +53,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjects/Qt6RemoteObjectsVersionless
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlTargets.cmake
@@ -58,6 +61,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsQml/Qt6RemoteObjectsQmlVersi
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsAdditionalTargetInfo.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6RemoteObjectsTools/Qt6RemoteObjectsToolsTargets.cmake
@@ -68,6 +72,9 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjectsQml.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjectsQml.so
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6remoteobjects_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6remoteobjectsqml_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6RemoteObjects.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6RemoteObjectsQml.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6RepParser.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/remoteobjects_repc.prf
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/repcclient.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/repccommon.pri
diff --git a/debian/qt6-remoteobjects.install b/debian/qt6-remoteobjects.install
new file mode 100644
index 0000000..6c9f081
--- /dev/null
+++ b/debian/qt6-remoteobjects.install
@@ -0,0 +1,6 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjects.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6RemoteObjectsQml.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtRemoteObjects/libdeclarative_remoteobjectsplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtRemoteObjects/plugins.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtRemoteObjects/qmldir
+usr/lib/qt6/libexec/repc
diff --git a/debian/rules b/debian/rules
index 273b07d..62ab791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
override_dh_auto_configure:
dh_auto_configure -- \
+ --log-level=STATUS \
-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
execute_after_dh_auto_install:
More information about the Neon-commits
mailing list