Bug#1106351: unblock: qtorganizer-mkcal/0.1.0~git20250424.45906b1-2

[Mike Gabriel <mike.gabriel@das-netzwerkteam.de>]

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: qtorganizer-mkcal@packages.debian.org
Control: affects -1 + src:qtorganizer-mkcal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package qtorganizer-mkcal

For qtorganizer-mkcal, unit test have been enabled only shortly before
the hard freeze deadline. While unit tests worked ok locally (on amd64),
problems on non-amd64 architectures popped up on Debian's buildds.

[ Reason ]
qtorganizer-mkcal/0.1.0~git20250424.45906b1-2 fixes a test bed
preparation failure (due to a path name mismatch of the out-of-tree
build directory) for i386.

Furthermore, this version of qtorganizer-mkcal skips/disabled a flaky
unit tests that has been failing to often (RC bug #1104706).

[ Impact ]
lomiri-calendar-app, a Lomiri core app, will not be available in Debian 13.

[ Tests ]
Repeated rebuilds are still running here locally (on amd64) without
failure. Waiting for buildd build results.

[ Risks ]
Minimal. qtcontacts-mkcal is only used by Lomiri / lomiri-calendar-app.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
None

unblock qtorganizer-mkcal/0.1.0~git20250424.45906b1-2

diff -Nru qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/changelog qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/changelog
--- qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/changelog	2025-05-02 16:16:42.000000000 +0200
+++ qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/changelog	2025-05-06 13:54:57.000000000 +0200
@@ -1,3 +1,15 @@
+qtorganizer-mkcal (0.1.0~git20250424.45906b1-2) unstable; urgency=medium
+
+  * debian/rules:
+    + Independent from build/host architecture, always use build/ sub-directory
+      for out-of-source-tree builds. This fixes mismatch between
+      DEB_BUILD+HOST_MULTIARCH vs DEB_BUILD+HOST_GNU_TYPE on i386.
+  * debian/patches:
+    + Add 2002_skip-flaky-testSimpleRangeRead.patch. Skip flaky unit test.
+      (Closes: #1104706).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 06 May 2025 13:54:57 +0200
+
 qtorganizer-mkcal (0.1.0~git20250424.45906b1-1) unstable; urgency=medium
 
   [ Lionel Duboeuf ]
diff -Nru qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/patches/2002_skip-flaky-testSimpleRangeRead.patch qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/patches/2002_skip-flaky-testSimpleRangeRead.patch
--- qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/patches/2002_skip-flaky-testSimpleRangeRead.patch	1970-01-01 01:00:00.000000000 +0100
+++ qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/patches/2002_skip-flaky-testSimpleRangeRead.patch	2025-05-06 13:54:57.000000000 +0200
@@ -0,0 +1,14 @@
+Description: Skip flaky tst_enging::testSimpleRangeRead.
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/tests/tst_engine.cpp
++++ b/tests/tst_engine.cpp
+@@ -1156,6 +1156,8 @@
+ 
+ void tst_engine::testSimpleRangeRead()
+ {
++    QSKIP("Test is flaky, see: https://github.com/dcaliste/qtorganizer-mkcal/issues/9";);
++
+     QSignalSpy dataChanged(mManager, &QOrganizerManager::dataChanged);
+ 
+     QOrganizerManager manager(QString::fromLatin1("mkcal"),
diff -Nru qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/patches/series qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/patches/series
--- qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/patches/series	2025-05-02 16:14:17.000000000 +0200
+++ qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/patches/series	2025-05-06 13:54:57.000000000 +0200
@@ -1,2 +1,3 @@
 2000_lomiri_disabled_alarms_tag.patch
 2001_support-running-tests-at-build-time.patch
+2002_skip-flaky-testSimpleRangeRead.patch
diff -Nru qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/rules qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/rules
--- qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/rules	2025-05-02 16:13:02.000000000 +0200
+++ qtorganizer-mkcal-0.1.0~git20250424.45906b1/debian/rules	2025-05-06 13:53:37.000000000 +0200
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 export DPKG_GENSYMBOLS_CHECK_LEVEL=1
 
 export QT_SELECT := qt5
@@ -10,26 +8,23 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 include /usr/share/dpkg/buildflags.mk
 
-include /usr/share/dpkg/architecture.mk
-builddir=obj-$(DEB_BUILD_MULTIARCH)
-
 %:
-	dh $@
+	dh $@ --builddirectory=build
 
 override_dh_missing:
 	dh_missing --fail-missing
 
 override_dh_auto_install:
-	dh_auto_install --destdir=debian/tmp
+	dh_auto_install --builddirectory=build --destdir=debian/tmp
 
 override_dh_auto_test:
 	mkdir debian/home/
-	ln -sf src $(builddir)/organizer
-	export HOME=debian/home && xvfb-run -a dh_auto_test --no-parallel
+	ln -sf src build/organizer
+	export HOME=debian/home && xvfb-run -a dh_auto_test --builddirectory=build --no-parallel
 
 override_dh_auto_clean:
 	rm -fv $(builddir)/organizer
-	dh_auto_clean
+	dh_auto_clean --builddirectory=build
 
 override_dh_clean:
 	dh_clean