[neon/extras/tellico/Neon/release] debian: update the patches

[Pino Toscano]

Git commit 87efec0d5efb0d04c5797881bdd29aa157fcea58 by Pino Toscano.
Committed on 17/02/2022 at 22:36.
Pushed by jriddell into branch 'Neon/release'.

update the patches

- upstream_Update-unit-test-for-collection-appending-and-mergin.patch:
  drop, backported from upstream

M  +3    -0    debian/changelog
M  +0    -1    debian/patches/series
D  +0    -55   debian/patches/upstream_Update-unit-test-for-collection-appending-and-mergin.patch

https://invent.kde.org/neon/extras/tellico/commit/87efec0d5efb0d04c5797881bdd29aa157fcea58

diff --git a/debian/changelog b/debian/changelog
index cff0178..14b0391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ tellico (3.4.4-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - upstream_Update-unit-test-for-collection-appending-and-mergin.patch:
+      drop, backported from upstream
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 17 Feb 2022 23:33:18 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 2b82c39..15de621 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-upstream_Update-unit-test-for-collection-appending-and-mergin.patch
 tests-disable-fetchertest.diff
diff --git a/debian/patches/upstream_Update-unit-test-for-collection-appending-and-mergin.patch b/debian/patches/upstream_Update-unit-test-for-collection-appending-and-mergin.patch
deleted file mode 100644
index 9321bd1..0000000
--- a/debian/patches/upstream_Update-unit-test-for-collection-appending-and-mergin.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 46400b75b4c39ab2eb713bec04f02416c3c1e52b Mon Sep 17 00:00:00 2001
-From: Robby Stephenson <robby at periapsis.org>
-Date: Sun, 2 Jan 2022 21:50:15 -0500
-Subject: [PATCH] Update unit test for collection appending and merging
-
----
- src/tests/collectiontest.cpp | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/tests/collectiontest.cpp b/src/tests/collectiontest.cpp
-index ae58ee53..5362b19a 100644
---- a/src/tests/collectiontest.cpp
-+++ b/src/tests/collectiontest.cpp
-@@ -594,7 +594,9 @@ void CollectionTest::testAppendCollection() {
-   coll2->addEntries(entry2);
- 
-   // append coll1 into coll2
--  Tellico::Data::Document::appendCollection(coll2, coll1);
-+  bool structuralChange;
-+  Tellico::Data::Document::appendCollection(coll2, coll1, &structuralChange);
-+  QVERIFY(structuralChange);
-   // verify that the test field was added
-   QVERIFY(coll2->hasField(QStringLiteral("test")));
-   // verified that the modified field was merged
-@@ -635,7 +637,9 @@ void CollectionTest::testMergeCollection() {
-   // second item is a pair of entries that had their table field modified
-   // typedef QVector< QPair<EntryPtr, QString> > PairVector;
-   // typedef QPair<Data::EntryList, PairVector> MergePair;
--  Tellico::Data::MergePair mergePair = Tellico::Data::Document::mergeCollection(coll1, coll2);
-+  bool structuralChange;
-+  Tellico::Data::MergePair mergePair = Tellico::Data::Document::mergeCollection(coll1, coll2, &structuralChange);
-+  QCOMPARE(structuralChange, false);
- 
-   // one new entry was added
-   QCOMPARE(mergePair.first.count(), 1);
-@@ -681,6 +685,7 @@ void CollectionTest::testBookMatch() {
- void CollectionTest::testMergeBenchmark() {
-   QUrl url = QUrl::fromLocalFile(QFINDTESTDATA("data/movies-many.tc"));
- 
-+  bool structuralChange;
-   Tellico::Data::EntryList entriesToAdd;
-   QBENCHMARK {
-     Tellico::Import::TellicoImporter importer1(url, false /* load all images */);
-@@ -700,7 +705,7 @@ void CollectionTest::testMergeBenchmark() {
-     }
-     coll2->addEntries(entriesToAdd);
- 
--    Tellico::Data::Document::mergeCollection(coll1, coll2);
-+    Tellico::Data::Document::mergeCollection(coll1, coll2, &structuralChange);
-   }
- }
- 
--- 
-2.34.1
-