[neon/qt6/qt6-speech/Neon/release] debian: align to debian
Carlos De Maine
null at kde.org
Mon Oct 23 23:23:00 BST 2023
Git commit 321546f75118c7c8a2e47f8cb48ed3f76f29873d by Carlos De Maine.
Committed on 24/10/2023 at 00:22.
Pushed by carlosdem into branch 'Neon/release'.
align to debian
M +30 -1 debian/control
M +0 -35 debian/not-installed
M +4 -2 debian/qt6-speech-dev.install
M +2 -6 debian/qt6-speech.install
M +18 -3 debian/rules
https://invent.kde.org/neon/qt6/qt6-speech/-/commit/321546f75118c7c8a2e47f8cb48ed3f76f29873d
diff --git a/debian/control b/debian/control
index 07bc2b5..86e2c76 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,13 @@ Build-Depends: cmake,
pkg-config,
pkg-kde-tools,
qt6-base-dev,
- qt6-base-private-dev,
qt6-declarative-dev,
qt6-multimedia-dev,
qt6-quick3d-dev
+Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
Standards-Version: 4.6.2
Homepage: https://www.qt.io/developers/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-speech
@@ -51,6 +54,20 @@ Description: Qt 6 Speech library - development files
This package contains the header development files used for building Qt 6
applications using the Qt 6 Speech library.
+Package: qt6-speech-doc
+Architecture: all
+Section: kde
+X-Neon-MergedPackage: true
+Depends: qt6-base-doc,
+ qt6-speech-dev (= ${binary:Version}),
+ ${misc:Depends},
+Description: Qt 6 Speech 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.
+ .
+ This package contains the header development files used for building Qt 6
+ applications using the Qt 6 Speech library.
+
Package: libqt6texttospeech6
Architecture: any
Depends: qt6-speech
@@ -80,3 +97,15 @@ Architecture: any
Depends: qt6-speech
Description: Dummy transitional
Transitional dummy package.
+
+Package: qt6-speech-doc-html
+Architecture: any
+Depends: qt6-speech-doc
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-speech-examples
+Architecture: any
+Depends: qt6-speech-dev
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/not-installed b/debian/not-installed
index ccd8125..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,35 +0,0 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtTextToSpeech/6.*/QtTextToSpeech/private/*_p.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginAdditionalTargetInfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginConfigVersionImpl.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginTargets-none.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginTargets.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6TextToSpeechPlugins.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_texttospeech_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/texttospeech/libqtexttospeech_mock.so
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlTargets-relwithdebinfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtSpeechTestsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginTargets-relwithdebinfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginTargets-relwithdebinfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginTargets-relwithdebinfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/Qt6TextToSpeechTargets-relwithdebinfo.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/qt6texttospeech_relwithdebinfo_metatypes.json
diff --git a/debian/qt6-speech-dev.install b/debian/qt6-speech-dev.install
index 7fdd1a4..fa49fdf 100644
--- a/debian/qt6-speech-dev.install
+++ b/debian/qt6-speech-dev.install
@@ -1,8 +1,10 @@
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtTextToSpeech/
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6TextToSpeech/
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6TextToSpeech.prl
-usr/lib/${DEB_HOST_MULTIARCH}/libQt6TextToSpeech.so
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6TextToSpeech.*
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/
usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/
diff --git a/debian/qt6-speech.install b/debian/qt6-speech.install
index dd906c5..d481016 100644
--- a/debian/qt6-speech.install
+++ b/debian/qt6-speech.install
@@ -1,7 +1,3 @@
usr/lib/${DEB_HOST_MULTIARCH}/libQt6TextToSpeech.so.*
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/texttospeech/libqtexttospeech_flite.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/texttospeech/libqtexttospeech_mock.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/texttospeech/libqtexttospeech_speechd.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtTextToSpeech/libtexttospeechqmlplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtTextToSpeech/plugins.qmltypes
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtTextToSpeech/qmldir
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/texttospeech/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtTextToSpeech/
diff --git a/debian/rules b/debian/rules
index 24b92e6..dba1943 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,29 @@ include /usr/share/dpkg/architecture.mk
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_MESSAGE_LOG_LEVEL=STATUS \
- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+ --log-level=STATUS \
+ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+ $(extra_cmake_args)
+
+override_dh_auto_build-indep:
+ dh_auto_build -- docs
+
+override_dh_auto_install-indep:
+ DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
+ # Remove build path from index files.
+ find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
+ sed -i 's@$(CURDIR)/@@g' {} \;
-execute_after_dh_auto_install:
+execute_after_dh_auto_install-arch:
# Reproducible builds: remove build paths from .prl files
sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
More information about the Neon-commits
mailing list