[neon/kde/breeze/Neon/unstable] debian: fix rules order

Carlos De Maine null at kde.org
Wed Aug 30 06:09:09 BST 2023


Git commit 27a701a7b82bd4fc8872725933b75269927fcaac by Carlos De Maine.
Committed on 30/08/2023 at 07:09.
Pushed by carlosdem into branch 'Neon/unstable'.

fix rules order

M  +4    -9    debian/rules

https://invent.kde.org/neon/kde/breeze/-/commit/27a701a7b82bd4fc8872725933b75269927fcaac

diff --git a/debian/rules b/debian/rules
index 37a5dfe..b69b271 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: LGPL-2.0-or-later
 # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-QT6_CMAKE_ARGS = -DBUILD_QT5=OFF -DBUILD_QT6=ON 
+QT6_CMAKE_ARGS = -DBUILD_QT5=OFF -DBUILD_QT6=ON
 QT5_CMAKE_ARGS = -DBUILD_QT5=ON -DBUILD_QT6=OFF
 
 %:
@@ -12,18 +12,13 @@ execute_after_dh_auto_clean:
 	rm -rf build-QT5
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(QT6_CMAKE_ARGS) -DUSE_QT_VERSION=6
 	dh_auto_configure --builddirectory=build-QT5 -- $(QT5_CMAKE_ARGS) -DUSE_QT_VERSION=5
-
+	dh_auto_configure -- $(QT6_CMAKE_ARGS) -DUSE_QT_VERSION=6
 
 override_dh_auto_build:
-	dh_auto_build
 	dh_auto_build --builddirectory=build-QT5
+	dh_auto_build
 
 override_dh_install:
-	# This is required to make sure Plasma does not
-	# fall back to a cursor theme from the 90's
-	CURDIR=$(CURDIR) $(CURDIR)/debian/wrapperthemes.sh breeze_cursors \
-	                                                   Breeze_Light
-	dh_install
 	dh_auto_install --builddirectory=build-QT5
+	dh_install


More information about the Neon-commits mailing list