diff -Nru qca2-2.3.7/debian/changelog qca2-2.3.7/debian/changelog --- qca2-2.3.7/debian/changelog 2023-07-25 20:51:23.000000000 +0000 +++ qca2-2.3.7/debian/changelog 2023-07-27 04:38:14.000000000 +0000 @@ -1,8 +1,14 @@ -qca2 (2.3.7-0ubuntu1) mantic; urgency=medium +qca2 (2.3.7-1) unstable; urgency=medium - * New upsream release (2.3.7) + * New upstream release. + * Fix typo in plugins recommend in libqca-qt6-2. + * Fix qt6 path in QCA_FEATURE_INSTALL_DIR for the Qt 6 build (although it is + not actually used). + * Update symbols files from the logs of buildds. + * Add openssl as build dependency for the tests, so we get the default openssl + configuration. - -- Rik Mills Tue, 25 Jul 2023 21:51:23 +0100 + -- Pino Toscano Thu, 27 Jul 2023 06:38:14 +0200 qca2 (2.3.6-4) unstable; urgency=medium diff -Nru qca2-2.3.7/debian/control qca2-2.3.7/debian/control --- qca2-2.3.7/debian/control 2023-07-25 20:51:23.000000000 +0000 +++ qca2-2.3.7/debian/control 2023-07-25 07:09:15.000000000 +0000 @@ -1,8 +1,7 @@ Source: qca2 Section: libs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Maintainer: Debian Qt/KDE Maintainers Uploaders: Pino Toscano , Build-Depends: ca-certificates, cmake (>= 3.16~), @@ -10,6 +9,7 @@ gnupg , libsasl2-dev, libssl-dev (>= 1.1.1~), + openssl , pkg-config, pkg-kde-tools (>= 0.15.16), qtbase5-dev (>= 5.14.0~), @@ -77,7 +77,7 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: ca-certificates, libqca-qt6-2-plugins +Recommends: ca-certificates, libqca-qt6-plugins Description: libraries for the Qt Cryptographic Architecture [Qt 6] The Qt Cryptographic Architecture (QCA) provides a straightforward and cross- platform API for a range of cryptographic features, including SSL/TLS, diff -Nru qca2-2.3.7/debian/libqca-qt5-2.symbols qca2-2.3.7/debian/libqca-qt5-2.symbols --- qca2-2.3.7/debian/libqca-qt5-2.symbols 2023-07-25 20:51:23.000000000 +0000 +++ qca2-2.3.7/debian/libqca-qt5-2.symbols 2023-07-18 22:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 2.3.6 arm64 armel armhf hppa hurd-i386 i386 powerpc ppc64 ppc64el riscv64 s390x sparc64 +# SymbolsHelper-Confirmed: 2.3.6 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 libqca-qt5.so.2 libqca-qt5-2 #MINVER# * Build-Depends-Package: libqca-qt5-2-dev _Z10qcaVersionv@Base 2.0.2 @@ -1712,8 +1712,8 @@ _ZNK3QCA9SafeTimer7Private10metaObjectEv@Base 2.1.0+git20141127.0049+15.04 _ZNK3QCA9SafeTimer8intervalEv@Base 2.1.0+git20141127.0049+15.04 _ZNK3QCA9SafeTimer8isActiveEv@Base 2.1.0+git20141127.0049+15.04 - (optional=templinst|arch=!arm64 !hppa)_ZNSt6vectorISt4pairIPvjESaIS2_EE17_M_realloc_insertIJRS1_RKjEEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.3.0 - (optional=templinst|arch=amd64 arm64 armel armhf hppa i386 powerpc ppc64 ppc64el s390x sparc64)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_@Base 2.1.0.3 + (optional=templinst|arch=!amd64 !arm64 !hppa)_ZNSt6vectorISt4pairIPvjESaIS2_EE17_M_realloc_insertIJRS1_RKjEEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.3.0 + (optional=templinst|arch=alpha amd64 arm64 armel armhf hppa i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_@Base 2.1.0.3 _ZTIN3QCA10CRLContextE@Base 2.0.2 _ZTIN3QCA10CSRContextE@Base 2.0.2 _ZTIN3QCA10DSAContextE@Base 2.0.2 diff -Nru qca2-2.3.7/debian/libqca-qt6-2.symbols qca2-2.3.7/debian/libqca-qt6-2.symbols --- qca2-2.3.7/debian/libqca-qt6-2.symbols 2023-07-25 20:51:23.000000000 +0000 +++ qca2-2.3.7/debian/libqca-qt6-2.symbols 2023-07-18 22:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 2.3.6 amd64 arm64 armel armhf hppa hurd-i386 i386 powerpc ppc64 ppc64el riscv64 s390x sparc64 +# SymbolsHelper-Confirmed: 2.3.6 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 libqca-qt6.so.2 libqca-qt6-2 #MINVER# * Build-Depends-Package: libqca-qt6-dev _Z10qcaVersionv@Base 2.3.6 @@ -1721,13 +1721,13 @@ (optional=templinst)_ZNKSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE4findERS2_@Base 2.3.6 (optional=templinst)_ZNKSt8_Rb_treeIN3QCA19CertificateInfoTypeESt4pairIKS1_7QStringESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE11equal_rangeERS3_@Base 2.3.6 (optional=templinst)_ZNKSt8_Rb_treeIN3QCA19CertificateInfoTypeESt4pairIKS1_7QStringESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE4findERS3_@Base 2.3.6 - (optional=templinst|arch=armel armhf hurd-i386 i386 powerpc ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorISt4pairIPvjESaIS2_EE17_M_realloc_insertIJRS1_RKjEEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.3.6 + (optional=templinst|arch=alpha armel armhf hurd-i386 i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorISt4pairIPvjESaIS2_EE17_M_realloc_insertIJRS1_RKjEEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.3.6 (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE16_M_insert_uniqueIS4_EES1_ISt17_Rb_tree_iteratorIS4_EbEOT_@Base 2.3.6 (optional=templinst)_ZNSt8_Rb_treeIN3QCA19CertificateInfoTypeESt4pairIKS1_7QStringESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE11equal_rangeERS3_@Base 2.3.6 - (optional=templinst|arch=amd64 arm64 armel armhf hppa ppc64el riscv64 sparc64)_ZNSt8_Rb_treeIN3QCA19CertificateInfoTypeESt4pairIKS1_7QStringESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE15_M_insert_lowerIS5_EESt17_Rb_tree_iteratorIS5_EPSt18_Rb_tree_node_baseOT_@Base 2.3.6 - (optional=templinst|arch=hurd-i386 i386 powerpc ppc64 s390x)_ZNSt8_Rb_treeIN3QCA19CertificateInfoTypeESt4pairIKS1_7QStringESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE21_M_insert_equal_lowerIS5_EESt17_Rb_tree_iteratorIS5_EOT_@Base 2.3.6 + (optional=templinst|arch=amd64 arm64 armel armhf hppa mips64el ppc64el riscv64 sparc64)_ZNSt8_Rb_treeIN3QCA19CertificateInfoTypeESt4pairIKS1_7QStringESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE15_M_insert_lowerIS5_EESt17_Rb_tree_iteratorIS5_EPSt18_Rb_tree_node_baseOT_@Base 2.3.6 + (optional=templinst|arch=alpha hurd-i386 i386 mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeIN3QCA19CertificateInfoTypeESt4pairIKS1_7QStringESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE21_M_insert_equal_lowerIS5_EESt17_Rb_tree_iteratorIS5_EOT_@Base 2.3.6 (optional=templinst)_ZNSt8_Rb_treeIN3QCA19CertificateInfoTypeESt4pairIKS1_7QStringESt10_Select1stIS5_ESt4lessIS1_ESaIS5_EE28_M_get_insert_hint_equal_posESt23_Rb_tree_const_iteratorIS5_ERS3_@Base 2.3.6 - (optional=templinst|arch=!amd64 !hurd-i386 !riscv64)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_@Base 2.3.6 + (optional=templinst|arch=!hurd-i386 !riscv64)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_@Base 2.3.6 _ZTIN3QCA10CRLContextE@Base 2.3.6 _ZTIN3QCA10CSRContextE@Base 2.3.6 _ZTIN3QCA10DSAContextE@Base 2.3.6 diff -Nru qca2-2.3.7/debian/rules qca2-2.3.7/debian/rules --- qca2-2.3.7/debian/rules 2023-07-25 20:51:23.000000000 +0000 +++ qca2-2.3.7/debian/rules 2023-07-17 03:20:01.000000000 +0000 @@ -25,7 +25,7 @@ dh_auto_configure --builddirectory=build-qt6 -- \ $(COMMON_CMAKE_ARGS) \ -DBUILD_WITH_QT6=ON \ - -DQCA_FEATURE_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features" + -DQCA_FEATURE_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)/qt6/mkspecs/features" override_dh_auto_build-arch: dh_auto_build --builddirectory=build