[neon/extras/tellico/Neon/release] debian: update the patches
Pino Toscano
null at kde.org
Thu Sep 8 17:48:54 BST 2022
Git commit 642f7343e7f601c5d32f26c35472d34e6ea0d599 by Pino Toscano.
Committed on 24/02/2021 at 13:12.
Pushed by jriddell into branch 'Neon/release'.
update the patches
- upstream_Fix-data-comparison-test-for-2021.patch: drop, backported
from upstream
M +3 -0 debian/changelog
M +0 -1 debian/patches/series
D +0 -26 debian/patches/upstream_Fix-data-comparison-test-for-2021.patch
https://invent.kde.org/neon/extras/tellico/commit/642f7343e7f601c5d32f26c35472d34e6ea0d599
diff --git a/debian/changelog b/debian/changelog
index fa6bec1..3ba91b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ tellico (3.3.5-0r1) UNRELEASED; urgency=medium
[ Pino Toscano ]
* New upstream release.
+ * Update the patches:
+ - upstream_Fix-data-comparison-test-for-2021.patch: drop, backported from
+ upstream
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 24 Feb 2021 14:08:56 +0100
diff --git a/debian/patches/series b/debian/patches/series
index cd93c18..f783ca4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-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
deleted file mode 100644
index cc2eca4..0000000
--- a/debian/patches/upstream_Fix-data-comparison-test-for-2021.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
More information about the Neon-commits
mailing list