debian/changelog

+keepassx (2.0.3+git20190121.1682ab9-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove unused paragraph in copyright file.
+  * set XDG_RUNTIME_DIR env in autopkgtest testcase
+  * Release 2.0.3+git20190121.1682ab9 from experimental to unstable.
+
+ -- Shengjing Zhu <zhsj@debian.org>  Wed, 11 Sep 2019 02:53:27 +0800
+
+keepassx (2.0.3-4) unstable; urgency=medium
+
+  * New Maintainer. Thanks to Reinhard Tartler! (Closes: #924270)
+  * Using new DH level format. Consequently:
+       - debian/compat: removed.
+       - debian/control: Changed from 'debhelper' to 'debhelper-compat' in
+         Build-Depends field and bumped level to 12.
+  * debian/control: bumped Standards-Version to 4.4.0.
+  * debian/copyright:
+       - Include section debian/* copyrights.
+       - Update from http to https.
+  * debian/patches:
+       - Created 10_spell-fix.patch for spell corrections.
+       - Created 20_keywords-keepassx-desktop.patch, added "Keywords" section.
+       - Modified desktop_file_comment.patch, added description.
+  * debian/rules:
+       - Updated to provide hardening.
+       - Created override some empty directory.
+  * debian/tests/control: created to provide a basic trivial test.
+  * debian/upstream/metadata: created.
+  * debian/upstream/signing-key.asc for only upstream.
+  * debian/watch:
+       - Updated http to https.
+       - Updated version to 4.
+
+ -- Diego Sarzi <diegosarzi@gmail.com>  Sat, 20 Jul 2019 10:59:32 -0300
+
 keepassx (2.0.3+git20190121.1682ab9-1) experimental; urgency=medium
 
   * QA upload.
@@ -250,4 +286,3 @@ keepassx (0.2.2-0ubuntu1) edgy; urgency=low
   * Initial release
 
  -- David Valot <ptitdav69@gmail.com>  Wed,  6 Sep 2006 21:07:02 +0200
-

debian/control

 Source: keepassx
 Section: utils
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Diego Sarzi <diegosarzi@gmail.com>
 Build-Depends: debhelper-compat (= 12),
                cmake,
                qtbase5-dev,
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 12),
                xvfb,
                xauth
 Rules-Requires-Root: no
-Standards-Version: 4.1.3
+Standards-Version: 4.4.0
 Homepage: https://www.keepassx.org/
 Vcs-Git: https://salsa.debian.org/debian/keepassx.git
 Vcs-Browser: https://salsa.debian.org/debian/keepassx

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: KeePassX
 Source: https://www.keepassx.org/
 
 Files: *
-Copyright: 2010-2012, Felix Geyer <debfx@fobos.de>
-           2011-2012, Florian Geyer <blueice@fobos.de>
-           2012, Tobias Tangemann
-           2007, Trolltech ASA <info@trolltech.com>
-           2012, Intel Corporation
-           2012, Nokia Corporation and/or its subsidiary(-ies)
-           2000-2008, Tom Sato <VEF00200@nifty.ne.jp>
-           2013, Laszlo Papp <lpapp@kde.org>
-           2013, David Faure <faure@kde.org>
+Copyright: 2010-2012 Felix Geyer <debfx@fobos.de>
+           2011-2012 Florian Geyer <blueice@fobos.de>
+           2012      Tobias Tangemann
+           2007      Trolltech ASA <info@trolltech.com>
+           2012      Intel Corporation
+           2012      Nokia Corporation and/or its subsidiary(-ies)
+           2000-2008 Tom Sato <VEF00200@nifty.ne.jp>
+           2013      Laszlo Papp <lpapp@kde.org>
+           2013      David Faure <faure@kde.org>
 License: GPL-2 or GPL-3
 
 Files: cmake/GNUInstallDirs.cmake
@@ -21,10 +21,10 @@ License: BSD-3-clause
 
 Files: share/icons/application/*/apps/keepassx.png
        share/icons/application/scalable/apps/keepassx.svgz
-Copyright: 2006, Otto Salminen
-           2009, Miguelito Vieira
-           2011-2013, Felix Geyer <debfx@fobos.de>
-           2012, Tobias Tangemann <tobiastangemann@gmail.com>
+Copyright: 2006      Otto Salminen
+           2009      Miguelito Vieira
+           2011-2013 Felix Geyer <debfx@fobos.de>
+           2012      Tobias Tangemann <tobiastangemann@gmail.com>
 License: GPL-2
 
 Files: share/icons/application/*/actions/auto-type.png
@@ -95,7 +95,7 @@ Files: share/icons/application/*/actions/auto-type.png
        share/icons/database/C59_Package_Development.png
        share/icons/database/C60_KFM_Home.png
        share/icons/database/C61_Services.png
-Copyright: 2003-2004, David Vignoni <david@icon-king.com>
+Copyright: 2003-2004 David Vignoni <david@icon-king.com>
 License: LGPL-2.1
 Comment: from Nuvola icon theme
 
@@ -103,8 +103,8 @@ Files: share/icons/application/*/actions/entry-delete.png
        share/icons/application/*/actions/group-delete.png
        share/icons/application/*/actions/group-edit.png
        share/icons/application/*/actions/group-new.png
-Copyright: 2003-2004, David Vignoni <david@icon-king.com>
-           2012, Felix Geyer <debfx@fobos.de>
+Copyright: 2003-2004 David Vignoni <david@icon-king.com>
+           2012      Felix Geyer <debfx@fobos.de>
 License: LGPL-2.1
 Comment: based on Nuvola icon theme
 
@@ -129,12 +129,12 @@ Files: share/icons/application/*/actions/application-exit.png
        share/icons/application/*/status/dialog-information.png
        share/icons/application/*/status/dialog-warning.png
        share/icons/svg/*.svgz
-Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
-           2007, David Vignoni <david@icon-king.com>
-           2007, David Miller <miller@oxygen-icons.org>
-           2007, Johann Ollivier Lapeyre <johann@oxygen-icons.org>
-           2007, Kenneth Wimer <kwwii@bootsplash.org>
-           2007, Riccardo Iaconelli <riccardo@oxygen-icons.org>
+Copyright: 2007 Nuno Pinheiro <nuno@oxygen-icons.org>
+           2007 David Vignoni <david@icon-king.com>
+           2007 David Miller <miller@oxygen-icons.org>
+           2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org>
+           2007 Kenneth Wimer <kwwii@bootsplash.org>
+           2007 Riccardo Iaconelli <riccardo@oxygen-icons.org>
 License: LGPL-3+
 Comment: from Oxygen icon theme (http://www.oxygen-icons.org/)
 
@@ -160,21 +160,27 @@ Copyright: none
 License: public-domain
  In the public domain.
 
-Files: src/crypto/salsa20/*
-Copyright: none
-License: public-domain
- In the public domain.
-
 Files: src/streams/qtiocompressor.*
        src/streams/QtIOCompressor
        tests/modeltest.*
-Copyright: 2009-2012, Nokia Corporation and/or its subsidiary(-ies)
+Copyright: 2009-2012 Nokia Corporation and/or its subsidiary(-ies)
 License: LGPL-2.1 or GPL-3
 
 Files: cmake/GetGitRevisionDescription.cmake*
-Copyright: 2009-2010, Iowa State University
+Copyright: 2009-2010 Iowa State University
 License: Boost-1.0
 
+Files: debian/*
+Copyright: 2006      David Valot <ptitdav69@gmail.com>
+           2007-2019 Reinhard Tartler <siretart@tauware.de>
+           2008      Moritz Muehlenhoff <jmm@debian.org>
+           2008      Nick Ellery <nick.ellery@ubuntu.com>
+           2009-2017 Felix Geyer <debfx-pkg@fobos.de>
+           2013      Serafeim Zanikolas <sez@debian.org>
+           2019      Niels Thykier <niels@thykier.net>
+           2019      Diego Sarzi <diegosarzi@gmail.com>
+License: GPL-2+
+
 License: GPL-2
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -196,6 +202,23 @@ License: GPL-2
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
 License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

debian/patches/10_spell-fix.patch

+Description: fix spells
+Author: Diego Sarzi <diegosarzi@gmail.com>
+Last-Update: 2019-07-20
+--- keepassx-2.0.3.orig/src/crypto/Crypto.cpp
++++ keepassx-2.0.3/src/crypto/Crypto.cpp
+@@ -25,7 +25,7 @@
+ #include "crypto/CryptoHash.h"
+ #include "crypto/SymmetricCipher.h"
+ 
+-bool Crypto::m_initalized(false);
++bool Crypto::m_initialized(false);
+ QString Crypto::m_errorStr;
+ QString Crypto::m_backendVersion;
+ 
+@@ -72,8 +72,8 @@ Crypto::Crypto()
+ 
+ bool Crypto::init()
+ {
+-    if (m_initalized) {
+-        qWarning("Crypto::init: already initalized");
++    if (m_initialized) {
++        qWarning("Crypto::init: already initialized");
+         return true;
+     }
+ 
+@@ -89,19 +89,19 @@ bool Crypto::init()
+     }
+ 
+     // has to be set before testing Crypto classes
+-    m_initalized = true;
++    m_initialized = true;
+ 
+     if (!selfTest()) {
+-        m_initalized = false;
++        m_initialized = false;
+         return false;
+     }
+ 
+     return true;
+ }
+ 
+-bool Crypto::initalized()
++bool Crypto::initialized()
+ {
+-    return m_initalized;
++    return m_initialized;
+ }
+ 
+ QString Crypto::errorString()
+--- keepassx-2.0.3.orig/src/crypto/Crypto.h
++++ keepassx-2.0.3/src/crypto/Crypto.h
+@@ -26,7 +26,7 @@ class Crypto
+ {
+ public:
+     static bool init();
+-    static bool initalized();
++    static bool initialized();
+     static bool backendSelfTest();
+     static QString errorString();
+     static QString backendVersion();
+@@ -42,7 +42,7 @@ private:
+     static bool testTwofish();
+     static bool testSalsa20();
+ 
+-    static bool m_initalized;
++    static bool m_initialized;
+     static QString m_errorStr;
+     static QString m_backendVersion;
+ };
+--- keepassx-2.0.3.orig/src/crypto/CryptoHash.cpp
++++ keepassx-2.0.3/src/crypto/CryptoHash.cpp
+@@ -33,7 +33,7 @@ CryptoHash::CryptoHash(CryptoHash::Algor
+ {
+     Q_D(CryptoHash);
+ 
+-    Q_ASSERT(Crypto::initalized());
++    Q_ASSERT(Crypto::initialized());
+ 
+     int algoGcrypt;
+ 
+--- keepassx-2.0.3.orig/src/crypto/Random.cpp
++++ keepassx-2.0.3/src/crypto/Random.cpp
+@@ -91,7 +91,7 @@ Random::Random(RandomBackend* backend)
+ 
+ void RandomBackendGcrypt::randomize(void* data, int len)
+ {
+-    Q_ASSERT(Crypto::initalized());
++    Q_ASSERT(Crypto::initialized());
+ 
+     gcry_randomize(data, len, GCRY_STRONG_RANDOM);
+ }
+--- keepassx-2.0.3.orig/src/crypto/SymmetricCipherGcrypt.cpp
++++ keepassx-2.0.3/src/crypto/SymmetricCipherGcrypt.cpp
+@@ -84,7 +84,7 @@ void SymmetricCipherGcrypt::setErrorStri
+ 
+ bool SymmetricCipherGcrypt::init()
+ {
+-    Q_ASSERT(Crypto::initalized());
++    Q_ASSERT(Crypto::initialized());
+ 
+     gcry_error_t error;
+ 

debian/patches/20_keywords-keepassx-desktop.patch

+Description: Keywords in desktop file
+Author: Diego Sarzi <diegosarzi@gmail.com>
+Last-Update: 2019-07-20
+
+--- keepassx-2.0.3.orig/share/linux/keepassx.desktop
++++ keepassx-2.0.3/share/linux/keepassx.desktop
+@@ -12,3 +12,4 @@ Terminal=false
+ Type=Application
+ Categories=Qt;Utility;
+ MimeType=application/x-keepass2;
++Keywords=keypassx;password;manager;locksmith;

debian/patches/desktop_file_comment.patch

+Description: comment name programming.
 --- a/share/linux/keepassx.desktop
 +++ b/share/linux/keepassx.desktop
 @@ -5,6 +5,7 @@

debian/patches/series

 desktop_file_comment.patch
+10_spell-fix.patch
+20_keywords-keepassx-desktop.patch

debian/rules

 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 include /usr/share/dpkg/architecture.mk
 
 %:
-	dh $@ --parallel
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DWITH_GUI_TESTS=ON
@@ -18,3 +20,10 @@ endif
 override_dh_makeshlibs:
 	# keepassx only ships plugins
 	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/keepassx
+
+override_dh_auto_install:
+	dh_auto_install
+	# remove empty folders
+	find debian/keepassx/usr/share/icons/hicolor/16x16/actions -type d -empty -delete
+	find debian/keepassx/usr/share/icons/hicolor/22x22/actions -type d -empty -delete
+	find debian/keepassx/usr/share/icons/hicolor/22x22/status -type d -empty -delete

debian/tests/control

+Test-Command: env XDG_RUNTIME_DIR=$(mktemp -d) xvfb-run -a keepassx &
+Depends: @, xauth, xvfb
+

debian/upstream/metadata

+Reference:
+  Author: Felix Geyer and Florian Geyer and Tobias Tangemann and Trolltech ASA and Intel Corporation Nokia Corporation and/or its subsidiary(-ies) and Tom Sato and Laszlo Papp and David Faure
+  Title: keepassx
+  Year: 2010
+  URL: https://www.keepassx.org/

debian/watch

-version=3
+version=4
 opts=pgpsigurlmangle=s/$/.sig/ \
-  https://www.keepassx.org/releases/([\d\.]+)/keepassx-([\d\.]+).tar.gz
+  https://www.keepassx.org/releases/([\d\.]+)/keepassx-([\d\.]+)\.tar\.(?:bz2|gz|xz)