[neon/backports-jammy/signon-ui/Neon/unstable] debian: qt6 only

Carlos De Maine null at kde.org
Thu Dec 7 13:58:21 GMT 2023


Git commit bddb8ede0eb608dec45ca3f9ba3a7bf59e3a590d by Carlos De Maine.
Committed on 07/12/2023 at 14:58.
Pushed by carlosdem into branch 'Neon/unstable'.

qt6 only

M  +0    -9    debian/control
M  +1    -6    debian/rules

https://invent.kde.org/neon/backports-jammy/signon-ui/-/commit/bddb8ede0eb608dec45ca3f9ba3a7bf59e3a590d

diff --git a/debian/control b/debian/control
index dafd017..71c2656 100644
--- a/debian/control
+++ b/debian/control
@@ -5,29 +5,20 @@ Maintainer: Ubuntu Desktop Team <ubuntu-desktop at lists.ubuntu.com>
 Build-Depends: dbus-test-runner,
                debhelper-compat (= 13),
                gdb,
-               libaccounts-qt5-dev,
                libaccounts-qt6-dev,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev | libgles2-dev,
                libicu-dev,
                libnotify-dev,
                libproxy-dev,
-               libqt5opengl5-dev,
-               libqt5webkit5-dev,
-               libsignon-qt5-dev,
                libsignon-qt6-dev,
                libsqlite3-dev,
                libx11-dev,
                libxext-dev,
                libxslt1-dev,
                pkg-config,
-               qtbase5-dev,
-               qtdeclarative5-dev,
-               qtlocation5-dev,
-               libqt5sensors5-dev,
                signon-plugins-dev,
                xvfb,
-               qtwebengine5-dev,
                qt6-base-dev,
                qt6-declarative-dev,
                qt6-webengine-dev,
diff --git a/debian/rules b/debian/rules
index abb52a2..f3a7a73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 export QMAKE_LIBDIR=/usr/lib
-export QT_SELECT=qt5
+export QT_SELECT=qt6
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 include /usr/share/dpkg/architecture.mk
 
@@ -19,17 +19,12 @@ override_dh_auto_configure:
 	mkdir -p build6 && cd build6 && QT_SELECT=6 qmake6 ../ LIBDIR+=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	CONFIG+=enable-p2p \
 	DEFINES+=QT_NO_DEBUG_OUTPUT
-	mkdir -p build && cd build && QT_SELECT=5 qmake ../ LIBDIR+=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	CONFIG+=enable-p2p \
-	DEFINES+=QT_NO_DEBUG_OUTPUT
 
 override_dh_auto_build:
 	cd build6 &&  make
-	cd build && make
 
 override_dh_auto_install:
 	cd build6 && make install INSTALL_ROOT=$(CURDIR)/debian/tmp
-	cd build && make install INSTALL_ROOT=$(CURDIR)/debian/tmp
 
 override_dh_install:
 	cd /workspace/build && dh_install


More information about the Neon-commits mailing list