diff --git a/debian/changelog b/debian/changelog index 46f2da9..871a301 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ qt6-base (6.6.0+dfsg-2) UNRELEASED; urgency=medium [ Patrick Franz ] * Rename the virtual ABI package to qt6-base-private-abi. * Update symbols from buildlogs. + * Move prf-files into qmake6-package (Closes: #1053824). -- Debian Qt/KDE Maintainers Thu, 12 Oct 2023 17:42:13 +0200 diff --git a/debian/control b/debian/control index 2909756..a676c10 100644 --- a/debian/control +++ b/debian/control @@ -443,6 +443,8 @@ Depends: qmake6-bin (= ${binary:Version}), ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, +Breaks: qt6-base-dev (<< 6.6.0+dfsg~), +Replaces: qt6-base-dev (<< 6.6.0+dfsg~), Description: Qt 6 qmake Makefile generator tool Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. diff --git a/debian/qmake6.install b/debian/qmake6.install index ce7ab58..aa291b7 100644 --- a/debian/qmake6.install +++ b/debian/qmake6.install @@ -214,6 +214,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/mac/unsupported/objc_namespac usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/metatypes.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/moc.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/no_debug_info.prf +usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/permissions.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/plugin_bundle.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/precompile_header.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qgltf.prf @@ -224,6 +225,8 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qml_module.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qml_plugin.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qmltestcase.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qt.prf +usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qt_config.prf +usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qt_functions.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/resolve_config.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/resolve_target.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/resources.prf @@ -260,6 +263,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/unix/bsymbolic_functions.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/unix/ccache.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/unix/hide_symbols.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/unix/largefile.prf +usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/unix/no_direct_extern_access.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/unix/opengl.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/unix/separate_debug_info.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/unix/thread.prf diff --git a/debian/qt6-base-dev.install b/debian/qt6-base-dev.install index 442f5e8..6438e08 100755 --- a/debian/qt6-base-dev.install +++ b/debian/qt6-base-dev.install @@ -2312,7 +2312,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Widgets.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Xml.pc usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/devices/linux-rasp-pi4-aarch64/qmake.conf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/devices/linux-rasp-pi4-aarch64/qplatformdefs.h -usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/unix/no_direct_extern_access.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_concurrent.pri usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_concurrent_private.pri usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_core.pri @@ -2610,9 +2609,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/Widgets.json usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/Xml.json usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/common/wasm/qplatformdefs.h usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/common/wasm/wasm.conf -usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/permissions.prf -usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qt_config.prf -usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/features/qt_functions.prf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_example_icons_private.pri usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/unsupported/macx-tvos-clang/Info.plist.app usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/unsupported/macx-tvos-clang/Info.plist.lib