[neon/extras/tellico/Neon/release] debian: fix comparisontest in 2021+ (#980695)

[Pino Toscano]

Git commit 567d5e7fadddb46d9f4fa399244e585bf93644a4 by Pino Toscano.
Committed on 21/01/2021 at 10:52.
Pushed by jriddell into branch 'Neon/release'.

fix comparisontest in 2021+ (#980695)

M  +9    -0    debian/changelog
M  +1    -0    debian/patches/series
A  +26   -0    debian/patches/upstream_Fix-data-comparison-test-for-2021.patch

https://invent.kde.org/neon/extras/tellico/commit/567d5e7fadddb46d9f4fa399244e585bf93644a4

diff --git a/debian/changelog b/debian/changelog
index fe72a1c..75ae399 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tellico (3.3.4-2) UNRELEASED; urgency=medium
+
+  [ Pino Toscano ]
+  * Backport upstream commit c879fa89ea143545c1c6a29f1e1d68c33dee334b to fix
+    comparisontest in years after 2020; patch
+    upstream_Fix-data-comparison-test-for-2021.patch. (Closes: #980695)
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 21 Jan 2021 11:48:48 +0100
+
 tellico (3.3.4-1) unstable; urgency=medium
 
   [ Pino Toscano ]
diff --git a/debian/patches/series b/debian/patches/series
index f783ca4..cd93c18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+upstream_Fix-data-comparison-test-for-2021.patch
 tests-no-network.diff
diff --git a/debian/patches/upstream_Fix-data-comparison-test-for-2021.patch b/debian/patches/upstream_Fix-data-comparison-test-for-2021.patch
new file mode 100644
index 0000000..cc2eca4
--- /dev/null
+++ b/debian/patches/upstream_Fix-data-comparison-test-for-2021.patch
@@ -0,0 +1,26 @@
+From c879fa89ea143545c1c6a29f1e1d68c33dee334b Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby at periapsis.org>
+Date: Sun, 3 Jan 2021 14:44:37 -0500
+Subject: [PATCH] Fix data comparison test for 2021
+
+---
+ src/tests/comparisontest.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/tests/comparisontest.cpp b/src/tests/comparisontest.cpp
+index 1168efe2..653c2d9f 100644
+--- a/src/tests/comparisontest.cpp
++++ b/src/tests/comparisontest.cpp
+@@ -119,7 +119,8 @@ void ComparisonTest::testDate_data() {
+   QTest::newRow("test5") << QStringLiteral("2008-2-2") << QStringLiteral("2008-02-02") << 0;
+   // non-integers get converted to current date
+   QTest::newRow("words") << QStringLiteral("all-by-myself") << QStringLiteral("---") << 0;
+-  QTest::newRow("words") << QStringLiteral("2020--") << QStringLiteral("---") << 0;
++  // no longer in 2020, so all dashes converts to current year, after 2020
++  QTest::newRow("words") << QStringLiteral("2020--") << QStringLiteral("---") << -1;
+ }
+ 
+ void ComparisonTest::testTitle() {
+-- 
+2.29.2
+