summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2019-01-06 17:35:02 +0000
committerReinhard Tartler <siretart@tauware.de>2019-01-12 12:44:38 -0500
commit0fe2bd38ce7e807f29eaaec46b6d76ce5fb1d6ce (patch)
tree9b01ecf1b043cef3b552c3a7cd8e636fc4f3e2ab
parentd291641742b43bb803f00c0a8a7ba80c5605216c (diff)
Import Debian changes 2.0.3-1.1
keepassx (2.0.3-1.1) unstable; urgency=medium * Non-maintainer upload. * Support DEB_BUILD_OPTIONS=nocheck based on a patch by Helmut Grohne. (Closes: #852368) * Set Rules-Requires-Root to "no" as keepassx does not need (fake)root.
-rw-r--r--debian/changelog10
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules2
3 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 28c0210..f02a650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+keepassx (2.0.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Support DEB_BUILD_OPTIONS=nocheck based on a patch by
+ Helmut Grohne. (Closes: #852368)
+ * Set Rules-Requires-Root to "no" as keepassx does not need
+ (fake)root.
+
+ -- Niels Thykier <niels@thykier.net> Sun, 06 Jan 2019 17:35:02 +0000
+
keepassx (2.0.3-1) unstable; urgency=medium
* New upstream release. (Closes: #845163)
diff --git a/debian/control b/debian/control
index 7ae3376..5e6b8bb 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 9),
libxtst-dev,
xvfb,
xauth
+Rules-Requires-Root: no
Standards-Version: 3.9.6
Homepage: https://www.keepassx.org/
Vcs-Git: https://anonscm.debian.org/git/collab-maint/keepassx.git
diff --git a/debian/rules b/debian/rules
index 3bc50a8..ddb8b17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,10 @@ override_dh_auto_configure:
dh_auto_configure -- -DWITH_GUI_TESTS=ON -DWITH_CXX11=ON
override_dh_auto_test:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
dh_auto_test -- ARGS+="-E testgui"
xvfb-run -a --server-args="-screen 0 800x600x24" dh_auto_test -- ARGS+="-R testgui"
+endif
override_dh_makeshlibs:
# keepassx only ships plugins