diff -Nru quassel-0.14.0/debian/changelog quassel-0.14.0/debian/changelog --- quassel-0.14.0/debian/changelog 2022-12-15 19:54:34.000000000 +0000 +++ quassel-0.14.0/debian/changelog 2023-07-23 17:41:56.000000000 +0000 @@ -1,3 +1,52 @@ +quassel (1:0.14.0-2ubuntu1) mantic; urgency=medium + + * Merge from debian unstable. Remaining changes: + - Add d/patches/01_change_default_libera_channel.patch. Replaces default + #quassel channel with #ubuntu. + - Remove d/patches/01_default_network_channel.patch. Superseded by the + previous libera channel patch. + - Update apparmor profile to allow running in lxd. + + -- Rik Mills Sun, 23 Jul 2023 18:41:56 +0100 + +quassel (1:0.14.0-2) unstable; urgency=medium + + * Team upload. + + [ Christian Göttsche ] + * Update blhc configuration + + [ Debian Janitor ] + * Trim trailing whitespace. + * Bump debhelper from old 12 to 13. + + debian/rules: Drop --fail-missing argument to dh_missing, which is now the + default. + * Fix day-of-week for changelog entries 0.5.1-2, 0.3.1+dfsg-2, 0.3.1+dfsg-1. + * Update standards version to 4.6.1, no changes needed. + * Avoid explicitly specifying -Wl,--as-needed linker flag. + + [ Adrian Bunk ] + * qtwebengine5-dev is now available on mips64el. + + [ Pino Toscano ] + * Update standards version to 4.6.2, no changes needed. + * Drop patch 02_script_interpreter_path.patch, as now dh_perl rewrites perl + shebangs. + * Stop using qtwebengine5-dev on mipsel, as it will be removed soon from + that architecture. + * Switch the list of architectures for libqt5webkit5-dev to be a negated + version of the ones for qtwebengine5-dev, so it is easier to maintain. + * Remove inactive Uploaders. + * Drop the obsolete lsb-base dependency. + * Use chrpath to drop the extra RPATH set in binaries. + * Remove the custom inxi script directly during dh_auto_install, rather than + with extra checks during dh_install. + * Use execute_after_dh_install to avoid invoking dh_install manually. + * Use the ${perl:Depends} substvar in quassel-data. + * CI: do not consider lintian warnings as fatal. + + -- Pino Toscano Sat, 22 Jul 2023 09:18:22 +0200 + quassel (1:0.14.0-1ubuntu5) lunar; urgency=medium * No-change rebuild against libldap-2 @@ -444,7 +493,7 @@ * New upstream release -- Thomas Mueller Sat, 18 Sep 2010 19:19:40 +0200 - + quassel (0.6.1-2) unstable; urgency=low * add dependency to gawk (closes: #592455) @@ -509,7 +558,7 @@ thanks guys * quilt is used as patch system now - -- Thomas Mueller Thu, 11 Jan 2010 12:52:45 +0100 + -- Thomas Mueller Mon, 11 Jan 2010 12:52:45 +0100 quassel (0.5.1-1) unstable; urgency=low @@ -579,7 +628,7 @@ thanks to Harald Sitter * Version in manpages have been adjusted. - -- Thomas Mueller Mon, 10 Feb 2009 23:13:25 +0100 + -- Thomas Mueller Tue, 10 Feb 2009 23:13:25 +0100 quassel (0.3.1+dfsg-1) unstable; urgency=low @@ -602,7 +651,7 @@ * debian/patches removed - no need to patch anything at the moment * debian/control: dependeny libqt4-sql-sqlite added - -- Thomas Mueller Tue, 08 Jan 2009 01:44:23 +0100 + -- Thomas Mueller Thu, 08 Jan 2009 01:44:23 +0100 quassel (0.2~rc1-1) unstable; urgency=low diff -Nru quassel-0.14.0/debian/control quassel-0.14.0/debian/control --- quassel-0.14.0/debian/control 2022-06-12 19:52:19.000000000 +0000 +++ quassel-0.14.0/debian/control 2023-07-23 17:41:56.000000000 +0000 @@ -3,11 +3,10 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian KDE Extras Team -Uploaders: Thomas Mueller , - Felix Geyer , - Scott Kitterman -Build-Depends: debhelper-compat (= 12), +Uploaders: Scott Kitterman , +Build-Depends: debhelper-compat (= 13), dh-apparmor, + chrpath, cmake, libqca-qt5-2-dev, zlib1g-dev, @@ -20,8 +19,8 @@ libphonon4qt5-dev, libphonon4qt5experimental-dev, libdbusmenu-qt5-dev, - qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], - libqt5webkit5-dev [armel hurd-i386 mips mips64el ppc64el s390x], + qtwebengine5-dev [amd64 arm64 armhf i386 mips64el], + libqt5webkit5-dev [!amd64 !arm64 !armhf !i386 !mips64el], extra-cmake-modules, libkf5textwidgets-dev, libkf5coreaddons-dev, @@ -31,14 +30,14 @@ libkf5widgetsaddons-dev, libssl-dev Homepage: https://www.quassel-irc.org/ -Standards-Version: 4.5.0 +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/quassel.git Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/quassel Package: quassel-core Architecture: any Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libqt5sql5-sqlite, lsb-base (>= 3.2-14), openssl +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libqt5sql5-sqlite, openssl Recommends: ca-certificates Suggests: libqt5sql5-psql Description: distributed IRC client - core component @@ -80,7 +79,7 @@ Package: quassel-data Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ${perl:Depends} Recommends: breeze-icon-theme | oxygen-icon-theme Suggests: inxi Conflicts: quassel-data-kde4 diff -Nru quassel-0.14.0/debian/patches/02_script_interpreter_path.patch quassel-0.14.0/debian/patches/02_script_interpreter_path.patch --- quassel-0.14.0/debian/patches/02_script_interpreter_path.patch 2022-01-12 22:25:09.000000000 +0000 +++ quassel-0.14.0/debian/patches/02_script_interpreter_path.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Index: quassel/data/scripts/inxi -=================================================================== ---- quassel.orig/data/scripts/inxi 2018-12-02 15:30:30.586561181 -0500 -+++ quassel/data/scripts/inxi 2018-12-03 00:24:30.599106749 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - ## infobash: Copyright (C) 2005-2007 Michiel de Boer aka locsmif - ## inxi: Copyright (C) 2008-2018 Harald Hope - ## Additional features (C) Scott Rogers - kde, cpu info -Index: quassel/data/scripts/mpris -=================================================================== ---- quassel.orig/data/scripts/mpris 2018-12-02 15:26:46.362556679 -0500 -+++ quassel/data/scripts/mpris 2018-12-03 00:24:18.139106499 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - - ########################################################################## - # Copyright (C) 2009 by Sebastian Goth # diff -Nru quassel-0.14.0/debian/patches/series quassel-0.14.0/debian/patches/series --- quassel-0.14.0/debian/patches/series 2022-07-07 02:13:21.000000000 +0000 +++ quassel-0.14.0/debian/patches/series 2023-07-23 17:41:56.000000000 +0000 @@ -1,2 +1 @@ 01_change_default_libera_channel.patch -02_script_interpreter_path.patch diff -Nru quassel-0.14.0/debian/rules quassel-0.14.0/debian/rules --- quassel-0.14.0/debian/rules 2022-01-12 22:29:46.000000000 +0000 +++ quassel-0.14.0/debian/rules 2023-07-22 06:49:18.000000000 +0000 @@ -1,7 +1,6 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS=hardening=+all -export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed WEBENGINE_INSTALL_STATUS := $(shell dpkg-query -W --showformat='$${Status}\n' qtwebengine5-dev|grep "install ok installed") ifeq (install ok installed,$(WEBENGINE_INSTALL_STATUS)) @@ -16,18 +15,17 @@ override_dh_auto_configure: dh_auto_configure -- -DWITH_OXYGEN_ICONS=ON -DWITH_BUNDLED_ICONS=OFF -DUSE_QT5=ON -DWITH_KDE=ON -DENABLE_SHARED=OFF $(WEB_BACKEND) -override_dh_install: - dh_install +execute_before_dh_auto_build: + @echo "blhc: ignore-line-regexp: .*/CMakeCXXCompilerABI.cpp.*" + +execute_after_dh_auto_install: + chrpath -d $(CURDIR)/debian/tmp/usr/bin/* # replace inxi with a symlink -ifneq (,$(filter quassel-data, $(shell dh_listpackages))) - rm debian/quassel-data/usr/share/quassel/scripts/inxi -endif + rm $(CURDIR)/debian/tmp/usr/share/quassel/scripts/inxi +execute_after_dh_install: dh_apparmor -pquassel-core --profile-name=usr.bin.quasselcore -override_dh_missing: - dh_missing --fail-missing - override_dh_installinit: dh_installinit --no-stop-on-upgrade --no-restart-after-upgrade --error-handler=exit --name=quasselcore diff -Nru quassel-0.14.0/debian/salsa-ci.yml quassel-0.14.0/debian/salsa-ci.yml --- quassel-0.14.0/debian/salsa-ci.yml 2022-01-12 22:25:09.000000000 +0000 +++ quassel-0.14.0/debian/salsa-ci.yml 2023-07-22 07:04:30.000000000 +0000 @@ -1,8 +1,3 @@ --- include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml - -variables: - SALSA_CI_LINTIAN_FAIL_WARNING: 1 - SALSA_CI_DISABLE_BLHC: 1 + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml