[neon/neon-packaging/libquotient/Neon/release] debian: merge Neon/unstable into Neon/release

Tue Aug 15 01:45:03 BST 2023

Git commit 2a15a1186c9d7eac92c0affdef5c80390ef3040c by Carlos De Maine.
Committed on 15/08/2023 at 02:45.
Pushed by carlosdem into branch 'Neon/release'.

merge Neon/unstable into Neon/release

M  +41   -9    debian/control
D  +0    -1    debian/files
D  +0    -2    debian/libquotient-dev.dirs
M  +0    -3    debian/libquotient-dev.install
A  +3    -0    debian/libquotient-qt5-dev.install
A  +1    -0    debian/libquotient-qt6-0.8.install
A  +1    -0    debian/libquotient-qt6-0.8.lintian-overrides
A  +3    -0    debian/libquotient-qt6-dev.install
D  +0    -1    debian/libquotient0.8.dirs
M  +1    -1    debian/libquotient0.8.install
A  +1    -0    debian/not-installed
M  +16   -4    debian/rules

https://invent.kde.org/neon/neon-packaging/libquotient/-/commit/2a15a1186c9d7eac92c0affdef5c80390ef3040c

diff --git a/debian/control b/debian/control
index a0473b9..0363eb4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,18 @@ Source: libquotient
 Priority: optional
 Maintainer: Matrix Packaging Team <pkg-matrix-maintainers at lists.alioth.debian.org>
 Uploaders: Hubert Chathi <uhoreg at debian.org>, Andres Salomon <dilinger at debian.org>
-Build-Depends:
-  debhelper-compat (= 12),
-  cmake,
-  libolm-dev,
-  libssl-dev,
-  qtbase5-dev,
-  qtmultimedia5-dev,
-  qt5keychain-dev
-Standards-Version: 4.3.0
+Build-Depends:cmake,
+              debhelper-compat (= 13),
+              cmake,
+              libolm-dev,
+              libssl-dev,
+              qtkeychain-qt5-dev,
+              qtkeychain-qt6-dev,
+              qt6-base-dev,
+              qt6-multimedia-dev,
+              qtbase5-dev,
+              qtmultimedia5-dev,
+Standards-Version: 4.6.2
 Section: libs
 Homepage: https://github.com/quotient-im/libQuotient
 Vcs-Git: https://salsa.debian.org/matrix-team/libquotient.git
@@ -23,6 +26,8 @@ Depends: libquotient0.8 (= ${binary:Version}), ${misc:Depends}
 Description: Qt5 library to write cross-platform clients for Matrix
  libQuotient is a Qt5-based library to make IM clients for the Matrix
  protocol. It is the backbone of Quaternion, Spectral and some other projects.
+ .
+ Qt5 and Qt6 source files.
 
 Package: libquotient0.8
 Architecture: any
@@ -30,3 +35,30 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Qt5 library to write cross-platform clients for Matrix
  libQuotient is a Qt5-based library to make IM clients for the Matrix
  protocol. It is the backbone of Quaternion, Spectral and some other projects.
+
+Package: libquotient-qt5-dev
+Section: libdevel
+Architecture: any
+Depends: libquotient-dev (= ${binary:Version}), libquotient0.8 (= ${binary:Version}), ${misc:Depends}
+Description: Qt5 library to write cross-platform clients for Matrix
+ libQuotient is a Qt5-based library to make IM clients for the Matrix
+ protocol. It is the backbone of Quaternion, Spectral and some other projects.
+ .
+ Qt5 development files and binaries.
+
+Package: libquotient-qt6-dev
+Section: libdevel
+Architecture: any
+Depends:libquotient-dev (= ${binary:Version}), libquotient-qt6-0.8 (= ${binary:Version}), ${misc:Depends}
+Description: Qt6 library to write cross-platform clients for Matrix
+ libQuotient is a Qt6-based library to make IM clients for the Matrix
+ protocol. It is the backbone of Quaternion, Spectral and some other projects.
+ .
+ Qt6 development files and binaries.
+
+Package: libquotient-qt6-0.8
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt6 library to write cross-platform clients for Matrix
+ libQuotient is a Qt6-based library to make IM clients for the Matrix
+ protocol. It is the backbone of Quaternion, Spectral and some other projects
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 082b2d3..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-libquotient_0.6.11-1_source.buildinfo libs optional
diff --git a/debian/libquotient-dev.dirs b/debian/libquotient-dev.dirs
deleted file mode 100644
index da07fdd..0000000
--- a/debian/libquotient-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include
-usr/lib
diff --git a/debian/libquotient-dev.install b/debian/libquotient-dev.install
index 9b9e44b..41a1414 100644
--- a/debian/libquotient-dev.install
+++ b/debian/libquotient-dev.install
@@ -1,4 +1 @@
 usr/include/*
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig/*
-usr/lib/*/cmake/*
diff --git a/debian/libquotient-qt5-dev.install b/debian/libquotient-qt5-dev.install
new file mode 100644
index 0000000..93a44e5
--- /dev/null
+++ b/debian/libquotient-qt5-dev.install
@@ -0,0 +1,3 @@
+usr/lib/*/libQuotient.so
+usr/lib/*/pkgconfig/Quotient.pc
+usr/lib/*/cmake/Quotient/*
diff --git a/debian/libquotient-qt6-0.8.install b/debian/libquotient-qt6-0.8.install
new file mode 100644
index 0000000..989c540
--- /dev/null
+++ b/debian/libquotient-qt6-0.8.install
@@ -0,0 +1 @@
+usr/lib/*/libQuotientQt6.so.0.8*
diff --git a/debian/libquotient-qt6-0.8.lintian-overrides b/debian/libquotient-qt6-0.8.lintian-overrides
new file mode 100644
index 0000000..3ea53db
--- /dev/null
+++ b/debian/libquotient-qt6-0.8.lintian-overrides
@@ -0,0 +1 @@
+libquotient-qt6-0.8: package-name-doesnt-match-sonames libQuotientQt6-0.8
diff --git a/debian/libquotient-qt6-dev.install b/debian/libquotient-qt6-dev.install
new file mode 100644
index 0000000..af08ac7
--- /dev/null
+++ b/debian/libquotient-qt6-dev.install
@@ -0,0 +1,3 @@
+usr/lib/*/libQuotientQt6.so
+usr/lib/*/pkgconfig/QuotientQt6.pc
+usr/lib/*/cmake/QuotientQt6/*
diff --git a/debian/libquotient0.8.dirs b/debian/libquotient0.8.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libquotient0.8.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libquotient0.8.install b/debian/libquotient0.8.install
index 3ddde58..8a01f0d 100644
--- a/debian/libquotient0.8.install
+++ b/debian/libquotient0.8.install
@@ -1 +1 @@
-usr/lib/*/lib*.so.*
+usr/lib/*/libQuotient.so.0.8*
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..9641300
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1 @@
+usr/share/ndk-modules/Android.mk
diff --git a/debian/rules b/debian/rules
index 5a12370..527a8cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,25 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto
+
+CMAKE_ARGS = -DCMAKE_INSTALL_INCLUDEDIR=include/libquotient -DBUILD_SHARED_LIBS=1 -DQuotient_ENABLE_E2EE=true
+
 
 %:
-	dh $@
+	dh $@ --with pkgkde_symbolshelper
 
+execute_after_dh_auto_clean:
+	rm -rf build-Qt6
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_INCLUDEDIR=include/libquotient -DBUILD_SHARED_LIBS=1 -DQuotient_ENABLE_E2EE=true
+	dh_auto_configure -- $(CMAKE_ARGS) -DBUILD_WITH_QT5=ON
+	dh_auto_configure --builddirectory=build-Qt6 -- $(CMAKE_ARGS) -DBUILD_WITH_QT6=ON
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --builddirectory=build-Qt6
 
 override_dh_auto_install:
 	dh_auto_install
-# unused example file -- remove to avoid warning from dh_missing
-#	rm debian/tmp/usr/bin/quotest
+	dh_auto_install --builddirectory=build-Qt6
