[neon/qt6/qt6-base/Neon/release] debian: more cleanup

Carlos De Maine null at kde.org
Sun Oct 22 11:56:20 BST 2023


Git commit 0e1d399a251b88702434c0d30ed37efdd232fa6a by Carlos De Maine.
Committed on 22/10/2023 at 12:39.
Pushed by carlosdem into branch 'Neon/release'.

more cleanup

M  +2    -0    debian/not-installed
M  +3    -3    debian/rules

https://invent.kde.org/neon/qt6/qt6-base/-/commit/0e1d399a251b88702434c0d30ed37efdd232fa6a

diff --git a/debian/not-installed b/debian/not-installed
index d55debf..ed8dfc7 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,4 @@
+usr/bin/x86_64-linux-gnu-qmake6
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS
 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
@@ -6,5 +7,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6GuiPlugins.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Network/Qt6NetworkPlugins.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6PrintSupport/Qt6PrintSupportPlugins.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Sql/Qt6SqlPlugins.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/objects-None/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
 usr/lib/qt6/bin/qmake
 usr/lib/qt6/bin/qtpaths
diff --git a/debian/rules b/debian/rules
index 484e1d9..ae0b43a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,9 +105,9 @@ execute_after_dh_auto_install-arch:
 		< debian/qmake-cross-wrapper.in > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
 	chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake6
 
-	# Fix Qt6::qmake IMPORTED_LOCATION, see https://bugs.debian.org/1030980
-	sed -i 's,lib/qt6/bin/qmake,bin/$(DEB_HOST_GNU_TYPE)-qmake6,' \
-		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-none.cmake
+#	# Fix Qt6::qmake IMPORTED_LOCATION, see https://bugs.debian.org/1030980
+#	sed -i 's,lib/qt6/bin/qmake,bin/$(DEB_HOST_GNU_TYPE)-qmake6,' \
+#		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt6CoreTools/Qt6CoreToolsTargets-none.cmake
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs


More information about the Neon-commits mailing list