Reverting some changes.

This commit is contained in:
Patrick Franz 2021-09-09 20:02:45 +02:00
parent f3e837c6e7
commit f1d6f0af1c
No known key found for this signature in database
GPG Key ID: 9E9F7A603077FE56
6 changed files with 21 additions and 5 deletions

18
debian/control vendored
View File

@ -389,12 +389,24 @@ Description: Qt 6 OpenGL library development files
is its rich set of widgets that provide standard GUI functionality. is its rich set of widgets that provide standard GUI functionality.
. .
This package contains the development files needed to build Qt 6 applications This package contains the development files needed to build Qt 6 applications
using QtOpenGL library. using the QtOpenGL library.
Package: qmake-qt6 Package: qmake6-bin
Architecture: any Architecture: any
Multi-Arch: foreign Multi-Arch: foreign
Section: devel Section: devel
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt 6 qmake Makefile generator tool — binary file
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 binary file for the qmake buildsystem. Do not
install this package directly, use qmake6 instead.
Package: qmake6
Architecture: any
Multi-Arch: same
Section: devel
Depends: qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}, ${shlibs:Depends} Depends: qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}, ${shlibs:Depends}
Description: Qt 6 qmake Makefile generator tool Description: Qt 6 qmake Makefile generator tool
Qt is a cross-platform C++ application framework. Qt's primary feature Qt is a cross-platform C++ application framework. Qt's primary feature
@ -406,7 +418,7 @@ Description: Qt 6 qmake Makefile generator tool
information are needed to create each Makefile. qmake can be used for any information are needed to create each Makefile. qmake can be used for any
software project, whether it is written using Qt or not. software project, whether it is written using Qt or not.
. .
Qt 6 qmake requires a platform and compiler description file which contains Qt 6 qmake requires a platform and a compiler description file which contains
many default values used to generate appropriate Makefiles. many default values used to generate appropriate Makefiles.
. .
This package contains also these platform specifications. This package contains also these platform specifications.

View File

@ -2,3 +2,4 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/extra-cmake-modules/COPYING-CMA
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/extra-cmake-modules/qt_attribution.json usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/extra-cmake-modules/qt_attribution.json
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/COPYING-CMAKE-SCRIPTS usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/COPYING-CMAKE-SCRIPTS
usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/qt_attribution.json usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/qt_attribution.json
usr/lib/qt6/bin/qmake

1
debian/qmake6-bin.install vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/qt6/bin/qmake6

View File

@ -465,4 +465,3 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/win32-icc/qmake.conf
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/win32-icc/qplatformdefs.h usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/win32-icc/qplatformdefs.h
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/win32-msvc/qmake.conf usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/win32-msvc/qmake.conf
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/win32-msvc/qplatformdefs.h usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/win32-msvc/qplatformdefs.h
usr/lib/qt6/bin/qmake

4
debian/qmake6.links vendored Normal file
View File

@ -0,0 +1,4 @@
# qmake and qmake6 files are identical.
# We want people to use qmake6, so we do not install qmake
# and use a symlink qmake6 -> qmake
usr/lib/qt6/bin/qmake6 usr/lib/qt6/bin/qmake

View File

@ -12,7 +12,6 @@ usr/lib/qt6/bin/androiddeployqt
usr/lib/qt6/bin/androidtestrunner usr/lib/qt6/bin/androidtestrunner
usr/lib/qt6/bin/qdbuscpp2xml usr/lib/qt6/bin/qdbuscpp2xml
usr/lib/qt6/bin/qdbusxml2cpp usr/lib/qt6/bin/qdbusxml2cpp
usr/lib/qt6/bin/qmake6
usr/lib/qt6/bin/qt-cmake usr/lib/qt6/bin/qt-cmake
usr/lib/qt6/bin/qt-cmake-private usr/lib/qt6/bin/qt-cmake-private
usr/lib/qt6/bin/qt-cmake-private-install.cmake usr/lib/qt6/bin/qt-cmake-private-install.cmake