debdiff attached, I will upload this as a delayed NMU.
best, -- Matthias Geiger <werdahias> Debian Maintainer "Freiheit ist immer Freiheit des anders Denkenden" -- Rosa Luxemburg
diff -Nru keepassxc-2.7.4+dfsg.1/debian/changelog keepassxc-2.7.6+dfsg.1/debian/changelog --- keepassxc-2.7.4+dfsg.1/debian/changelog 2022-12-28 15:32:38.000000000 +0100 +++ keepassxc-2.7.6+dfsg.1/debian/changelog 2023-11-10 19:34:47.000000000 +0100 @@ -1,3 +1,22 @@ +keepassxc (2.7.6+dfsg.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream release (Closes: #1041248) + * Drop upstream/0001-Fix-appdata.xml-formatting.patch; this has been + fixed upstream + * Drop upstream/0002-Set-password-input-field-font-correctly.- + 8732.patch; this has been fixed upstream + * Drop unused license paragraphs from d/copyright: + - LGPL-3 + - BSD-3-clause + * Updated d/watch to version 4 + * Updated copyright info for cmake/*.cmake files + * Add lintian override for no-manual-page warning + * Stop excuding pdf files; they are not present in the tarball anymore + * Version dependencies in d/control according to CMakelists.txt + + -- Matthias Geiger <werdah...@riseup.net> Fri, 10 Nov 2023 19:34:47 +0100 + keepassxc (2.7.4+dfsg.1-2) unstable; urgency=medium * Do not require version of Qt we built against at runtime (Closes: #1027140) diff -Nru keepassxc-2.7.4+dfsg.1/debian/control keepassxc-2.7.6+dfsg.1/debian/control --- keepassxc-2.7.4+dfsg.1/debian/control 2022-12-28 15:32:38.000000000 +0100 +++ keepassxc-2.7.6+dfsg.1/debian/control 2023-11-10 19:33:38.000000000 +0100 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Julian Andres Klode <j...@debian.org> Build-Depends: asciidoctor, - cmake, + cmake (>= 3.3.0), dbus-daemon <!nocheck> | dbus <!nocheck>, debhelper-compat (= 13), libargon2-dev | libargon2-0-dev, - libbotan-2-dev, + libbotan-2-dev (>= 2.11.0), libcurl4-gnutls-dev, libminizip-dev, libpcsclite-dev, @@ -18,14 +18,14 @@ libusb-1.0-0-dev, libxtst-dev, libzxcvbn-dev, - qtbase5-dev, + qtbase5-dev (>= 5.2.0), qtbase5-private-dev, qttools5-dev, qttools5-dev-tools, xauth <!nocheck>, xclip <!nocheck>, xvfb <!nocheck>, - zlib1g-dev + zlib1g-dev (>= 1.2.0) Standards-Version: 4.6.2 Homepage: https://www.keepassxc.org/ Vcs-Git: https://salsa.debian.org/debian/keepassxc.git diff -Nru keepassxc-2.7.4+dfsg.1/debian/copyright keepassxc-2.7.6+dfsg.1/debian/copyright --- keepassxc-2.7.4+dfsg.1/debian/copyright 2022-12-28 15:32:38.000000000 +0100 +++ keepassxc-2.7.6+dfsg.1/debian/copyright 2023-11-10 19:33:14.000000000 +0100 @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: KeePassXC Source: https://www.keepassxc.org/ -Files-Excluded: src/zxcvbn *.pdf +Files-Excluded: src/zxcvbn Files: * Copyright: 2010-2015, Felix Geyer <de...@fobos.de> @@ -40,12 +40,14 @@ Every other contributor is listed on https://github.com/keepassxreboot/keepassxc/graphs/contributors Files: cmake/CodeCoverage.cmake -Copyright: 2012 - 2015, Lars Bilke +Copyright: 2012 - 2017, Lars Bilke + 2021 KeePassXC Team License: BSD-3-clause-CopyrightHolders -Files: cmake/FindBotan2.cmake -Copyright: 2018 Ribose Inc. -License: BSD-2-clause +Files: cmake/FindBotan.cmake +Copyright: none +License: public-domain +Comment: Taken from https://github.com/vistle/vistle/blob/master/cmake/Modules/FindBOTAN.cmake Files: cmake/GenerateProductVersion.cmake Copyright: 2015 halex2005 <akhar...@gmail.com> @@ -363,30 +365,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: BSD-3-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - . - 1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - License: LGPL-2.1 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -405,23 +383,6 @@ On Debian systems, the full text of the license can be found in the file `/usr/share/common-licenses/LGPL-2.1'. -License: LGPL-3 - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; - version 3.0 of the License. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with this library. - . - On Debian systems, the full text of the GNU Lesser General Public - License version 3 can be found in the file - `/usr/share/common-licenses/LGPL-3'. - License: CC0-1.0 To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain @@ -940,3 +901,6 @@ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +License: public-domain + This file has been placed in the public domain. diff -Nru keepassxc-2.7.4+dfsg.1/debian/keepassxc.lintian-overrides keepassxc-2.7.6+dfsg.1/debian/keepassxc.lintian-overrides --- keepassxc-2.7.4+dfsg.1/debian/keepassxc.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ keepassxc-2.7.6+dfsg.1/debian/keepassxc.lintian-overrides 2023-11-10 19:33:14.000000000 +0100 @@ -0,0 +1,2 @@ +# As GUI application this warning is pointless +keepassxc: no-manual-page [usr/bin/keepassxc-proxy] diff -Nru keepassxc-2.7.4+dfsg.1/debian/patches/series keepassxc-2.7.6+dfsg.1/debian/patches/series --- keepassxc-2.7.4+dfsg.1/debian/patches/series 2022-12-28 15:32:38.000000000 +0100 +++ keepassxc-2.7.6+dfsg.1/debian/patches/series 2023-11-10 19:33:14.000000000 +0100 @@ -1,5 +1,3 @@ -upstream/0001-Fix-appdata.xml-formatting.patch -upstream/0002-Set-password-input-field-font-correctly.-8732.patch debian/tests-adjust-entropy-for-system-wide-zxcvbn.patch debian/use-local-fonts.patch debian/do-not-require-build-time-qt-version.patch diff -Nru keepassxc-2.7.4+dfsg.1/debian/patches/upstream/0001-Fix-appdata.xml-formatting.patch keepassxc-2.7.6+dfsg.1/debian/patches/upstream/0001-Fix-appdata.xml-formatting.patch --- keepassxc-2.7.4+dfsg.1/debian/patches/upstream/0001-Fix-appdata.xml-formatting.patch 2022-12-28 15:32:38.000000000 +0100 +++ keepassxc-2.7.6+dfsg.1/debian/patches/upstream/0001-Fix-appdata.xml-formatting.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -From: Jonathan White <supp...@dmapps.us> -Date: Sat, 29 Oct 2022 22:11:12 -0400 -Subject: Fix appdata.xml formatting - -Origin: upstream, https://github.com/keepassxreboot/keepassxc/commit/772964886ebb40d9634f2fabf2e04c0df40de667 ---- - share/linux/org.keepassxc.KeePassXC.appdata.xml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml -index 04904de..c899a66 100644 ---- a/share/linux/org.keepassxc.KeePassXC.appdata.xml -+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml -@@ -73,7 +73,8 @@ - <li>Flatpak: Fix launching browser proxy service [#8680]</li> - <li>SSH Agent: Fix paegent support on Windows [#8619]</li> - </ul> -- </description -+ </description> -+ </release> - <release version="2.7.3" date="2022-10-23"> - <description> - <ul> diff -Nru keepassxc-2.7.4+dfsg.1/debian/patches/upstream/0002-Set-password-input-field-font-correctly.-8732.patch keepassxc-2.7.6+dfsg.1/debian/patches/upstream/0002-Set-password-input-field-font-correctly.-8732.patch --- keepassxc-2.7.4+dfsg.1/debian/patches/upstream/0002-Set-password-input-field-font-correctly.-8732.patch 2022-12-28 15:32:38.000000000 +0100 +++ keepassxc-2.7.6+dfsg.1/debian/patches/upstream/0002-Set-password-input-field-font-correctly.-8732.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,129 +0,0 @@ -From: Janek Bevendorff <ja...@keepassxc.org> -Date: Wed, 2 Nov 2022 19:13:48 +0100 -Subject: Set password input field font correctly. (#8732) - -Also update member variable names to describe their contents better. - -Fixes #8709 - -Origin: vendor, https://github.com/keepassxreboot/keepassxc/commit/9ba88e2f13695add13f0391badf49aedae115b6f ---- - src/gui/PasswordWidget.cpp | 34 +++++++++++++++++----------------- - src/gui/PasswordWidget.h | 6 +++--- - 2 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/src/gui/PasswordWidget.cpp b/src/gui/PasswordWidget.cpp -index f5e97ba..e1fc20c 100644 ---- a/src/gui/PasswordWidget.cpp -+++ b/src/gui/PasswordWidget.cpp -@@ -54,7 +54,7 @@ PasswordWidget::PasswordWidget(QWidget* parent) - // use a monospace font for the password field - QFont passwordFont = Font::fixedFont(); - passwordFont.setLetterSpacing(QFont::PercentageSpacing, 110); -- setFont(passwordFont); -+ m_ui->passwordEdit->setFont(passwordFont); - - // Prevent conflicts with global Mac shortcuts (force Control on all platforms) - #ifdef Q_OS_MAC -@@ -143,19 +143,19 @@ void PasswordWidget::setReadOnly(bool state) - m_ui->passwordEdit->setReadOnly(state); - } - --void PasswordWidget::setRepeatPartner(PasswordWidget* repeatEdit) -+void PasswordWidget::setRepeatPartner(PasswordWidget* repeatPartner) - { -- m_repeatPasswordEdit = repeatEdit; -- m_repeatPasswordEdit->setParentPasswordEdit(this); -+ m_repeatPasswordWidget = repeatPartner; -+ m_repeatPasswordWidget->setParentPasswordEdit(this); - - connect( -- m_ui->passwordEdit, SIGNAL(textChanged(QString)), m_repeatPasswordEdit, SLOT(autocompletePassword(QString))); -- connect(m_ui->passwordEdit, SIGNAL(textChanged(QString)), m_repeatPasswordEdit, SLOT(updateRepeatStatus())); -+ m_ui->passwordEdit, SIGNAL(textChanged(QString)), m_repeatPasswordWidget, SLOT(autocompletePassword(QString))); -+ connect(m_ui->passwordEdit, SIGNAL(textChanged(QString)), m_repeatPasswordWidget, SLOT(updateRepeatStatus())); - } - - void PasswordWidget::setParentPasswordEdit(PasswordWidget* parent) - { -- m_parentPasswordEdit = parent; -+ m_parentPasswordWidget = parent; - // Hide actions - m_toggleVisibleAction->setVisible(false); - m_passwordGeneratorAction->setVisible(false); -@@ -176,13 +176,13 @@ void PasswordWidget::setShowPassword(bool show) - m_toggleVisibleAction->setIcon(icons()->onOffIcon("password-show", show)); - m_toggleVisibleAction->setChecked(show); - -- if (m_repeatPasswordEdit) { -- m_repeatPasswordEdit->setEchoMode(show ? QLineEdit::Normal : QLineEdit::Password); -+ if (m_repeatPasswordWidget) { -+ m_repeatPasswordWidget->setEchoMode(show ? QLineEdit::Normal : QLineEdit::Password); - if (!config()->get(Config::Security_PasswordsRepeatVisible).toBool()) { -- m_repeatPasswordEdit->setEnabled(!show); -- m_repeatPasswordEdit->setText(text()); -+ m_repeatPasswordWidget->setEnabled(!show); -+ m_repeatPasswordWidget->setText(text()); - } else { -- m_repeatPasswordEdit->setEnabled(true); -+ m_repeatPasswordWidget->setEnabled(true); - } - } - } -@@ -199,19 +199,19 @@ void PasswordWidget::popupPasswordGenerator() - generator->setPasswordLength(text().length()); - - connect(generator, SIGNAL(appliedPassword(QString)), SLOT(setText(QString))); -- if (m_repeatPasswordEdit) { -- connect(generator, SIGNAL(appliedPassword(QString)), m_repeatPasswordEdit, SLOT(setText(QString))); -+ if (m_repeatPasswordWidget) { -+ connect(generator, SIGNAL(appliedPassword(QString)), m_repeatPasswordWidget, SLOT(setText(QString))); - } - } - - void PasswordWidget::updateRepeatStatus() - { - static const auto stylesheetTemplate = QStringLiteral("QLineEdit { background: %1; }"); -- if (!m_parentPasswordEdit) { -+ if (!m_parentPasswordWidget) { - return; - } - -- const auto otherPassword = m_parentPasswordEdit->text(); -+ const auto otherPassword = m_parentPasswordWidget->text(); - const auto password = text(); - if (otherPassword != password) { - bool isCorrect = false; -@@ -251,7 +251,7 @@ bool PasswordWidget::event(QEvent* event) - - void PasswordWidget::checkCapslockState() - { -- if (m_parentPasswordEdit) { -+ if (m_parentPasswordWidget) { - return; - } - -diff --git a/src/gui/PasswordWidget.h b/src/gui/PasswordWidget.h -index f844d77..0014b69 100644 ---- a/src/gui/PasswordWidget.h -+++ b/src/gui/PasswordWidget.h -@@ -37,7 +37,7 @@ public: - explicit PasswordWidget(QWidget* parent = nullptr); - ~PasswordWidget() override; - void enablePasswordGenerator(); -- void setRepeatPartner(PasswordWidget* repeatEdit); -+ void setRepeatPartner(PasswordWidget* repeatPartner); - void setQualityVisible(bool state); - - bool isPasswordVisible() const; -@@ -76,8 +76,8 @@ private: - QPointer<QAction> m_toggleVisibleAction; - QPointer<QAction> m_passwordGeneratorAction; - QPointer<QAction> m_capslockAction; -- QPointer<PasswordWidget> m_repeatPasswordEdit; -- QPointer<PasswordWidget> m_parentPasswordEdit; -+ QPointer<PasswordWidget> m_repeatPasswordWidget; -+ QPointer<PasswordWidget> m_parentPasswordWidget; - - bool m_capslockState = false; - }; diff -Nru keepassxc-2.7.4+dfsg.1/debian/watch keepassxc-2.7.6+dfsg.1/debian/watch --- keepassxc-2.7.4+dfsg.1/debian/watch 2022-12-28 15:32:38.000000000 +0100 +++ keepassxc-2.7.6+dfsg.1/debian/watch 2023-11-10 19:33:14.000000000 +0100 @@ -1,4 +1,4 @@ -version=3 +version=4 opts=pgpsigurlmangle=s/$/.sig/,\ filenamemangle=s%(.*)keepassxc-(.*)-src.tar.xz%keepassxc-$2.tar.xz%,\ dversionmangle=s/\+dfsg\.\d$//,repacksuffix=+dfsg.1 \
OpenPGP_0x18BD106B3B6C5475.asc
Description: OpenPGP public key
OpenPGP_signature.asc
Description: OpenPGP digital signature