[neon/backports-jammy/signond/Neon/unstable] debian: Add qt6 packages

Scarlett Moore null at kde.org
Thu Sep 21 12:55:32 BST 2023


Git commit c3fb01e9b9845d3f0bb58bb7549285ed8b55f103 by Scarlett Moore.
Committed on 21/09/2023 at 13:55.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Add qt6 packages

M  +26   -2    debian/control
A  +2    -0    debian/libsignon-qt6-1.install
A  +4    -0    debian/libsignon-qt6-dev.install
M  +17   -3    debian/rules

https://invent.kde.org/neon/backports-jammy/signond/-/commit/c3fb01e9b9845d3f0bb58bb7549285ed8b55f103

diff --git a/debian/control b/debian/control
index 71996c3..664778e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,11 @@ Build-Depends: dbus-test-runner <!nocheck>,
                libproxy-dev,
                libqt5sql5-sqlite,
                pkg-config,
-               pkg-kde-tools (>= 0.14),
+               pkg-kde-tools-neon,
                qt5-qmake,
                qtbase5-dev,
-               qttools5-dev-tools
+               qttools5-dev-tools,
+               qt6-base-dev
 Standards-Version: 4.6.0
 Homepage: https://gitlab.com/accounts-sso/signond
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/signond
@@ -90,6 +91,28 @@ Description: Single Sign On framework - qt5 development files
  .
  Headers and static libraries for the libsignon-qt5 library.
 
+Package: libsignon-qt6-1
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Single Sign On framework - qt6 shared libraries
+ Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
+ platforms.
+ .
+ This package contains Qt6 shared libraries to be used by applications.
+
+Package: libsignon-qt6-dev
+Section: libdevel
+Architecture: any
+Depends: libsignon-qt6-1 (= ${binary:Version}), qt6-base-dev, ${misc:Depends}
+Multi-Arch: same
+Description: Single Sign On framework - qt6 development files
+ Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
+ platforms.
+ .
+ Headers and static libraries for the libsignon-qt6 library.
+
 Package: signon-plugin-password
 Section: libs
 Architecture: any
@@ -162,3 +185,4 @@ Description: Single Sign On framework - documentation for daemon
  platforms.
  .
  This package contains the documentation for signond-dev.
+
diff --git a/debian/libsignon-qt6-1.install b/debian/libsignon-qt6-1.install
new file mode 100644
index 0000000..df111d0
--- /dev/null
+++ b/debian/libsignon-qt6-1.install
@@ -0,0 +1,2 @@
+usr/lib/*/libsignon-qt6.so.1
+usr/lib/*/libsignon-qt6.so.1.*
diff --git a/debian/libsignon-qt6-dev.install b/debian/libsignon-qt6-dev.install
new file mode 100644
index 0000000..c967f57
--- /dev/null
+++ b/debian/libsignon-qt6-dev.install
@@ -0,0 +1,4 @@
+usr/include/signon-qt6/SignOn/
+usr/lib/*/cmake/SignOnQt6/
+usr/lib/*/libsignon-qt6.so
+usr/lib/*/pkgconfig/libsignon-qt6.pc
diff --git a/debian/rules b/debian/rules
index d8c0662..28dd9f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,23 @@ include /usr/share/dpkg/architecture.mk
 	dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		CONFIG+=enable-p2p \
-		DEFINES+=QT_NO_DEBUG_OUTPUT
+	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
 
 execute_after_dh_auto_clean:
 	-rm src/signond/backupifadaptor.*


More information about the Neon-commits mailing list