[neon/qt6/qt6-scxml/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:25 GMT 2022
Git commit 241bae1668d3a69213e28d262047ee179e2b9c37 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 +81 -3 debian/changelog
M +49 -13 debian/control
M +9 -0 debian/qt6-scxml-dev.install
M +1 -1 debian/qt6-scxml.install
M +2 -1 debian/rules
https://invent.kde.org/neon/qt6/qt6-scxml/commit/241bae1668d3a69213e28d262047ee179e2b9c37
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 1999457..4b26e25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,86 @@
-qt6-scxml (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-scxml (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:51 +0000
+ -- Patrick Franz <deltaone at debian.org> Thu, 17 Nov 2022 20:15:42 +0100
+
+qt6-scxml (6.4.0-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Enable link time optimization (Closes: #1015624).
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 12 Nov 2022 15:41:01 +0100
+
+qt6-scxml (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 list of installed files.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 15 Oct 2022 11:54:23 +0200
+
+qt6-scxml (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:23:40 +0200
+
+qt6-scxml (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 18:28:01 +0200
+
+qt6-scxml (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:16:49 +0200
+
+qt6-scxml (6.2.4-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:07:13 +0200
+
+qt6-scxml (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 22:59:47 +0200
+
+qt6-scxml (6.2.2-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:46:48 +0100
+
+qt6-scxml (6.2.2-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Source-only upload to experimental.
+
+ -- Patrick Franz <deltaone at debian.org> Thu, 30 Dec 2021 19:47:49 +0100
qt6-scxml (6.2.2-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 8e70185..3b4e8a0 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.2+dfsg~),
- qt6-declarative-dev (>= 6.2.2+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-scxml
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-scxml.git
@@ -24,14 +24,8 @@ Rules-Requires-Root: no
Package: qt6-scxml
Architecture: any
Section: kde
-Provides: libqt6scxml6,
- libqt6scxml6-bin,
- libqt6scxmlqml6,
- libqt6statemachine6,
- libqt6statemachineqml6,
- qml6-module-qtqml-statemachine,
- qml6-module-qtscxml
-Depends: ${misc:Depends}, ${shlibs:Depends}
+X-Neon-MergedPackage: true
+Depends: libqt6scxml6 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Qt 6 SCXML library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -48,7 +42,7 @@ Description: Qt 6 SCXML library
Package: qt6-scxml-dev
Architecture: any
Section: kde
-Provides: qt6-scxml-dev
+X-Neon-MergedPackage: true
Depends: qt6-base-dev, qt6-scxml (= ${binary:Version}), ${misc:Depends}
Description: Qt 6 SCXML - development files
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -62,3 +56,45 @@ Description: Qt 6 SCXML - development files
to support data models and executable content.
.
This package contains the development files for Qt 6 SCXML.
+
+Package: libqt6scxml6
+Architecture: all
+Depends: qt6-scxml
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6scxml6-bin
+Architecture: all
+Depends: qt6-scxml
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6scxmlqml6
+Architecture: all
+Depends: qt6-scxml
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6statemachine6
+Architecture: all
+Depends: qt6-scxml
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6statemachineqml6
+Architecture: all
+Depends: qt6-scxml
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtscxml
+Architecture: all
+Depends: qt6-scxml
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtqml-statemachine
+Architecture: all
+Depends: qt6-scxml
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-scxml-dev.install b/debian/qt6-scxml-dev.install
index 325c017..f612933 100644
--- a/debian/qt6-scxml-dev.install
+++ b/debian/qt6-scxml-dev.install
@@ -25,10 +25,12 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxml/qscxmlnulldatamodel.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxml/qscxmlstatemachine.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxml/qscxmltabledata.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxml/qtscxml-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxml/qtscxmlexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxml/qtscxmlversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxmlQml/QtScxmlQml
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxmlQml/QtScxmlQmlDepends
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxmlQml/QtScxmlQmlVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxmlQml/qtscxmlqmlexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtScxmlQml/qtscxmlqmlversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachine/QAbstractState
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachine/QAbstractTransition
@@ -55,10 +57,12 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachine/qstate.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachine/qstatemachine.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachine/qstatemachineglobal.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachine/qtstatemachine-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachine/qtstatemachineexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachine/qtstatemachineversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachineQml/QtStateMachineQml
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachineQml/QtStateMachineQmlDepends
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachineQml/QtStateMachineQmlVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachineQml/qtstatemachineqmlexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtStateMachineQml/qtstatemachineqmlversion.h
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtScxmlTestsConfig.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Scxml/Qt6QScxmlEcmaScriptDataModelPluginAdditionalTargetInfo.cmake
@@ -73,6 +77,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Scxml/Qt6ScxmlConfigVersion.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Scxml/Qt6ScxmlConfigVersionImpl.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Scxml/Qt6ScxmlDependencies.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Scxml/Qt6ScxmlMacros.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Scxml/Qt6ScxmlPlugins.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Scxml/Qt6ScxmlTargets-*.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Scxml/Qt6ScxmlTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Scxml/Qt6ScxmlVersionlessTargets.cmake
@@ -120,6 +125,10 @@ usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6scxml_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6scxmlqml_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6statemachine_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6statemachineqml_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Scxml.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6ScxmlQml.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6StateMachine.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6StateMachineQml.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qscxmlc.prf
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_scxml.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_scxmlqml.pri
diff --git a/debian/qt6-scxml.install b/debian/qt6-scxml.install
index 7f96db4..874b822 100644
--- a/debian/qt6-scxml.install
+++ b/debian/qt6-scxml.install
@@ -8,4 +8,4 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtQml/StateMachine/qmldir
usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtScxml/libdeclarative_scxmlplugin.so
usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtScxml/plugins.qmltypes
usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtScxml/qmldir
-usr/lib/qt6/bin/qscxmlc
+usr/lib/qt6/libexec/qscxmlc
diff --git a/debian/rules b/debian/rules
index 273b07d..0d56bff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,14 @@
include /usr/share/dpkg/architecture.mk
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
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