From f1d6f0af1ca6be46a37ce7d4152abf17a826b70c Mon Sep 17 00:00:00 2001
From: Patrick Franz <deltaone@debian.org>
Date: Thu, 9 Sep 2021 20:02:45 +0200
Subject: [PATCH] Reverting some changes.

---
 debian/control                               | 18 +++++++++++++++---
 debian/not-installed                         |  1 +
 debian/qmake6-bin.install                    |  1 +
 debian/{qmake-qt6.install => qmake6.install} |  1 -
 debian/qmake6.links                          |  4 ++++
 debian/qt6base-dev-tools.install             |  1 -
 6 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 debian/qmake6-bin.install
 rename debian/{qmake-qt6.install => qmake6.install} (99%)
 create mode 100644 debian/qmake6.links

diff --git a/debian/control b/debian/control
index 9a547d6..39df0f5 100644
--- a/debian/control
+++ b/debian/control
@@ -389,12 +389,24 @@ Description: Qt 6 OpenGL library development files
  is its rich set of widgets that provide standard GUI functionality.
  .
  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
 Multi-Arch: foreign
 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}
 Description: Qt 6 qmake Makefile generator tool
  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
  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.
  .
  This package contains also these platform specifications.
diff --git a/debian/not-installed b/debian/not-installed
index 6b56754..4ae0541 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -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/kwin/COPYING-CMAKE-SCRIPTS
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/qt_attribution.json
+usr/lib/qt6/bin/qmake
diff --git a/debian/qmake6-bin.install b/debian/qmake6-bin.install
new file mode 100644
index 0000000..91dd9e7
--- /dev/null
+++ b/debian/qmake6-bin.install
@@ -0,0 +1 @@
+usr/lib/qt6/bin/qmake6
diff --git a/debian/qmake-qt6.install b/debian/qmake6.install
similarity index 99%
rename from debian/qmake-qt6.install
rename to debian/qmake6.install
index 39bbcdf..3be4988 100644
--- a/debian/qmake-qt6.install
+++ b/debian/qmake6.install
@@ -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-msvc/qmake.conf
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/win32-msvc/qplatformdefs.h
-usr/lib/qt6/bin/qmake
diff --git a/debian/qmake6.links b/debian/qmake6.links
new file mode 100644
index 0000000..809a13f
--- /dev/null
+++ b/debian/qmake6.links
@@ -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
diff --git a/debian/qt6base-dev-tools.install b/debian/qt6base-dev-tools.install
index 5abeb94..c4bfadc 100644
--- a/debian/qt6base-dev-tools.install
+++ b/debian/qt6base-dev-tools.install
@@ -12,7 +12,6 @@ usr/lib/qt6/bin/androiddeployqt
 usr/lib/qt6/bin/androidtestrunner
 usr/lib/qt6/bin/qdbuscpp2xml
 usr/lib/qt6/bin/qdbusxml2cpp
-usr/lib/qt6/bin/qmake6
 usr/lib/qt6/bin/qt-cmake
 usr/lib/qt6/bin/qt-cmake-private
 usr/lib/qt6/bin/qt-cmake-private-install.cmake