summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-04 18:00:46 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-04 18:00:46 +0000
commitc5b904dfb608f376dc7df55ee82797d48f781675 (patch)
tree14aa8f2cb841b66776fd42b8893e38a909865bcc
parentReleasing progress-linux version 2.9.5-2~progress7.99u1. (diff)
downloadsssd-c5b904dfb608f376dc7df55ee82797d48f781675.tar.xz
sssd-c5b904dfb608f376dc7df55ee82797d48f781675.zip
Merging debian version 2.9.5-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules4
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e16d768..a9b62a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sssd (2.9.5-3) unstable; urgency=medium
+
+ * rules: Flip the test logic to fix ftbfs on armel/armhf.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 04 Jun 2024 18:22:29 +0300
+
sssd (2.9.5-2~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/rules b/debian/rules
index 7da1f9f..165cc1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,9 +55,9 @@ override_dh_auto_test:
ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
export CK_TIMEOUT_MULTIPLIER=10
ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf))
- dh_auto_test -- VERBOSE=yes
- else
dh_auto_test -- VERBOSE=yes || true
+ else
+ dh_auto_test -- VERBOSE=yes
endif
unset CK_TIMEOUT_MULTIPLIER
endif