diff -Nru libquazip-0.9.1/debian/changelog libquazip-0.9.1/debian/changelog --- libquazip-0.9.1/debian/changelog 2020-07-23 13:48:10.000000000 +0000 +++ libquazip-0.9.1/debian/changelog 2021-10-11 19:43:56.000000000 +0000 @@ -1,3 +1,17 @@ +libquazip (0.9.1-2) unstable; urgency=medium + + [ Andreas Tille ] + * override_dh_auto_test: Create test executable manually to pass test + * Standards-Version: 4.6.0 (routine-update) + * Remove trailing whitespace in debian/changelog (routine-update) + + [ Bas Couwenberg ] + * Update symbols for gcc-11. + Closes: #984206 + * Override dh_makeshlibs to use upstream version and not fail on changes. + + -- Andreas Tille Mon, 11 Oct 2021 21:43:56 +0200 + libquazip (0.9.1-1) unstable; urgency=medium * New upstream version diff -Nru libquazip-0.9.1/debian/control libquazip-0.9.1/debian/control --- libquazip-0.9.1/debian/control 2020-07-23 13:48:10.000000000 +0000 +++ libquazip-0.9.1/debian/control 2021-10-11 19:43:56.000000000 +0000 @@ -14,7 +14,7 @@ zlib1g-dev, doxygen, graphviz -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Vcs-Browser: https://salsa.debian.org/med-team/libquazip Vcs-Git: https://salsa.debian.org/med-team/libquazip.git Homepage: https://github.com/stachenov/quazip diff -Nru libquazip-0.9.1/debian/libquazip5-1.symbols.amd64 libquazip-0.9.1/debian/libquazip5-1.symbols.amd64 --- libquazip-0.9.1/debian/libquazip5-1.symbols.amd64 2020-07-23 13:48:10.000000000 +0000 +++ libquazip-0.9.1/debian/libquazip5-1.symbols.amd64 2021-10-11 19:43:56.000000000 +0000 @@ -164,8 +164,6 @@ _ZN5QHashI7QString16unz64_file_pos_sE11deleteNode2EPN9QHashData4NodeE@Base 0.7.3 _ZN5QHashI7QString16unz64_file_pos_sE13duplicateNodeEPN9QHashData4NodeEPv@Base 0.7.3 _ZN5QHashI7QString16unz64_file_pos_sE6insertERKS0_RKS1_@Base 0.9.1 - _ZN5QHashI7QString16unz64_file_pos_sED1Ev@Base 0.9.1 - _ZN5QHashI7QString16unz64_file_pos_sED2Ev@Base 0.9.1 _ZN5QHashIt5QListI10QByteArrayEE11deleteNode2EPN9QHashData4NodeE@Base 0.9 _ZN5QHashIt5QListI10QByteArrayEE13duplicateNodeEPN9QHashData4NodeEPv@Base 0.9 _ZN5QHashIt5QListI10QByteArrayEED1Ev@Base 0.9 @@ -334,9 +332,8 @@ _ZSt13__heap_selectIN5QListI16QuaZipFileInfo64E8iteratorEN9__gnu_cxx5__ops15_Iter_comp_iterI19QuaZipDirComparatorEEEvT_S9_S9_T0_@Base 0.9 _ZSt16__insertion_sortIN5QListI16QuaZipFileInfo64E8iteratorEN9__gnu_cxx5__ops15_Iter_comp_iterI19QuaZipDirComparatorEEEvT_S9_T0_@Base 0.9 _ZSt16__introsort_loopIN5QListI16QuaZipFileInfo64E8iteratorEiN9__gnu_cxx5__ops15_Iter_comp_iterI19QuaZipDirComparatorEEEvT_S9_T0_T1_@Base 0.9 - _ZSt21__unguarded_partitionIN5QListI16QuaZipFileInfo64E8iteratorEN9__gnu_cxx5__ops15_Iter_comp_iterI19QuaZipDirComparatorEEET_S9_S9_S9_T0_@Base 0.9.1 - _ZSt22__move_median_to_firstIN5QListI16QuaZipFileInfo64E8iteratorEN9__gnu_cxx5__ops15_Iter_comp_iterI19QuaZipDirComparatorEEEvT_S9_S9_S9_T0_@Base 0.9.1 _ZSt25__unguarded_linear_insertIN5QListI16QuaZipFileInfo64E8iteratorEN9__gnu_cxx5__ops14_Val_comp_iterI19QuaZipDirComparatorEEEvT_T0_@Base 0.9 + _ZSt4swapI16QuaZipFileInfo64ENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS5_ESt18is_move_assignableIS5_EEE5valueEvE4typeERS5_SF_@Base 0.9.1 _ZTI10QuaAdler32@Base 0.7.3 _ZTI10QuaZipFile@Base 0.7.3 _ZTI11QuaGzipFile@Base 0.7.3 diff -Nru libquazip-0.9.1/debian/rules libquazip-0.9.1/debian/rules --- libquazip-0.9.1/debian/rules 2020-07-23 13:48:10.000000000 +0000 +++ libquazip-0.9.1/debian/rules 2021-10-11 19:43:56.000000000 +0000 @@ -11,6 +11,10 @@ QT_SELECT=qt5 +include /usr/share/dpkg/pkg-info.mk + +UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//') + # Enable multiarch builds & prepare qmake vars include /usr/share/dpkg/architecture.mk @@ -25,8 +29,21 @@ -DCMAKE_POSITION_INDEPENDENT_CODE=ON cp NEWS.txt NEWS +override_dh_auto_configure_in_version_1.1: + dh_auto_configure -Bbuild-shared -- \ + -DBUILD_WITH_QT4=OFF \ + -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + dh_auto_configure -Bbuild-static -- \ + -DBUILD_WITH_QT4=OFF \ + -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DBUILD_SHARED_LIBS=OFF + cp NEWS.txt NEWS + override_dh_auto_build: - dh_auto_build + dh_auto_build # -Bbuild-shared + # dh_auto_build -Bbuild-static # build doc doxygen @@ -42,9 +59,13 @@ dh_installdocs -i find debian -name "*.md5" -delete +override_dh_auto_install_in_version_1.1: + dh_auto_install -Bbuild-shared --destdir=debian/tmp + override_dh_install: dh_install cp -a obj-*/libquazip5.a debian/tmp/usr/lib/*/ + # cp -a build-static/quazip/libquazip1-qt5.a debian/tmp/usr/lib/*/ # this is for version 1.1 d-shlibmove --commit \ --multiarch \ --devunversioned \ @@ -53,5 +74,16 @@ --movedev "debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/QuaZip5/QuaZip5Config.cmake" "usr/share/quazip/" \ debian/tmp/usr/lib/*/*.so -override_dh_missing: - dh_missing --fail-missing +# --movedev "debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/QuaZip5/QuaZip5Config-*.cmake" "usr/share/quazip/" \ # this is for version 1.1 + +override_dh_auto_test_in_version_1.1: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + # somehow qztest executable is not build - do this manually here + cd build-shared/qztest && make + cd build-static/qztest && make + dh_auto_test -Bbuild-shared + dh_auto_test -Bbuild-static +endif + +override_dh_makeshlibs: + dh_makeshlibs -- -c0 -v$(UPSTREAM_VERSION)