diff -Nru tracker-3.4.2/debian/changelog tracker-3.4.2/debian/changelog --- tracker-3.4.2/debian/changelog 2023-02-04 19:57:50.000000000 +0000 +++ tracker-3.4.2/debian/changelog 2023-06-27 16:09:03.000000000 +0000 @@ -1,8 +1,16 @@ -tracker (3.4.2-1build1) lunar; urgency=medium +tracker (3.4.2-3) unstable; urgency=medium - * Rebuild against latest icu + [ Manuel A. Fernandez Montecelo ] + * Increase dh_auto_test timeout (Closes: #1026236) - -- Jeremy Bicha Sat, 04 Feb 2023 14:57:50 -0500 + -- Jeremy Bícha Tue, 27 Jun 2023 12:09:03 -0400 + +tracker (3.4.2-2) unstable; urgency=medium + + * Cherry-pick proposed patch to fix tests with sqlite 3.42 + * debian/gbp.conf: Branch for trixie + + -- Jeremy Bícha Tue, 27 Jun 2023 09:47:27 -0400 tracker (3.4.2-1) unstable; urgency=medium diff -Nru tracker-3.4.2/debian/gbp.conf tracker-3.4.2/debian/gbp.conf --- tracker-3.4.2/debian/gbp.conf 2022-12-06 21:51:16.000000000 +0000 +++ tracker-3.4.2/debian/gbp.conf 2023-06-27 16:09:03.000000000 +0000 @@ -1,6 +1,6 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = debian/trixie upstream-branch = upstream/latest [buildpackage] diff -Nru tracker-3.4.2/debian/patches/series tracker-3.4.2/debian/patches/series --- tracker-3.4.2/debian/patches/series 2022-12-06 21:51:16.000000000 +0000 +++ tracker-3.4.2/debian/patches/series 2023-06-27 16:09:03.000000000 +0000 @@ -1 +1,2 @@ disable-some-failing-tests.patch +tests-Adapt-FTS-snippet-tests-to-run-before-after-SQLite-.patch diff -Nru tracker-3.4.2/debian/patches/tests-Adapt-FTS-snippet-tests-to-run-before-after-SQLite-.patch tracker-3.4.2/debian/patches/tests-Adapt-FTS-snippet-tests-to-run-before-after-SQLite-.patch --- tracker-3.4.2/debian/patches/tests-Adapt-FTS-snippet-tests-to-run-before-after-SQLite-.patch 1970-01-01 00:00:00.000000000 +0000 +++ tracker-3.4.2/debian/patches/tests-Adapt-FTS-snippet-tests-to-run-before-after-SQLite-.patch 2023-06-27 16:09:03.000000000 +0000 @@ -0,0 +1,132 @@ +From: Carlos Garnacho +Date: Sat, 20 May 2023 11:42:09 +0200 +Subject: tests: Adapt FTS snippet tests to run before/after SQLite 3.42.0 + +This SQLite version fixes a small bug in the FTS5 snippet function +that affects our output checks here. Concretely, it might ignore +the specified number of output words with repeated matched terms. + +It is good that we have FTS tests, but we do not need to test for +this behavior specifically. Adapt the tests so that we keep their +spirit but bypass the SQLite behavior change. The snippet-4 test +coincided too much on it and had to be dropped, it's a minor loss +though. + +This fixes the test suite with SQLite >= 3.42.0. + +Closes: https://gitlab.gnome.org/GNOME/tracker/-/issues/405 + +Origin: https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/600 +--- + tests/fts/functions/snippet-1.out | 2 +- + tests/fts/functions/snippet-2.out | 2 +- + tests/fts/functions/snippet-2.rq | 2 +- + tests/fts/functions/snippet-3.out | 2 +- + tests/fts/functions/snippet-4.out | 6 +++--- + tests/fts/functions/snippet-4.rq | 2 +- + tests/fts/functions/snippet-5.out | 4 ---- + tests/fts/functions/snippet-5.rq | 1 - + tests/fts/functions/snippet-data.rq | 2 +- + tests/fts/tracker-fts-test.c | 2 +- + 10 files changed, 10 insertions(+), 15 deletions(-) + delete mode 100644 tests/fts/functions/snippet-5.out + delete mode 100644 tests/fts/functions/snippet-5.rq + +diff --git a/tests/fts/functions/snippet-1.out b/tests/fts/functions/snippet-1.out +index db1fae0..9cb9c0c 100644 +--- a/tests/fts/functions/snippet-1.out ++++ b/tests/fts/functions/snippet-1.out +@@ -1,4 +1,4 @@ + "http://www.example.org/test#1" "bananas lemons lemons" +-"http://www.example.org/test#2" "bananas bananas lemons" ++"http://www.example.org/test#2" "bananas bandanas lemons" + "http://www.example.org/test#4" "bananas lemons" + "http://www.example.org/test#3" "bananas" +diff --git a/tests/fts/functions/snippet-2.out b/tests/fts/functions/snippet-2.out +index 8cdc6f4..5174b6b 100644 +--- a/tests/fts/functions/snippet-2.out ++++ b/tests/fts/functions/snippet-2.out +@@ -1,4 +1,4 @@ + "http://www.example.org/test#1" ">>>bananas<<< lemons lemons" +-"http://www.example.org/test#2" ">>>bananas<<< >>>bananas<<< lemons" ++"http://www.example.org/test#2" ">>>bananas<<< >>>bandanas<<< lemons" + "http://www.example.org/test#4" ">>>bananas<<< lemons" + "http://www.example.org/test#3" ">>>bananas<<<" +diff --git a/tests/fts/functions/snippet-2.rq b/tests/fts/functions/snippet-2.rq +index 59cd8c3..d6ce1f0 100644 +--- a/tests/fts/functions/snippet-2.rq ++++ b/tests/fts/functions/snippet-2.rq +@@ -1 +1 @@ +-SELECT ?u fts:snippet(?u, '>>>', '<<<') { ?u fts:match 'bananas' } order by desc fts:rank(?u) ++SELECT ?u fts:snippet(?u, '>>>', '<<<') { ?u fts:match 'ban' } order by desc fts:rank(?u) +diff --git a/tests/fts/functions/snippet-3.out b/tests/fts/functions/snippet-3.out +index 9c869b8..03f28af 100644 +--- a/tests/fts/functions/snippet-3.out ++++ b/tests/fts/functions/snippet-3.out +@@ -1,4 +1,4 @@ + "http://www.example.org/test#1" ">>>bananas<<<..." +-"http://www.example.org/test#2" ">>>bananas<<< >>>bananas<<<..." ++"http://www.example.org/test#2" ">>>bananas<<<..." + "http://www.example.org/test#4" ">>>bananas<<<..." + "http://www.example.org/test#3" ">>>bananas<<<" +diff --git a/tests/fts/functions/snippet-4.out b/tests/fts/functions/snippet-4.out +index e3650f6..b7e42e2 100644 +--- a/tests/fts/functions/snippet-4.out ++++ b/tests/fts/functions/snippet-4.out +@@ -1,4 +1,4 @@ + "http://www.example.org/test#1" +-"http://www.example.org/test#2" ">>>bananas<<< >>>bananas<<<..." +-"http://www.example.org/test#4" ">>>bananas<<<..." +-"http://www.example.org/test#3" ">>>bananas<<<..." ++"http://www.example.org/test#2" ++"http://www.example.org/test#4" ++"http://www.example.org/test#3" +diff --git a/tests/fts/functions/snippet-4.rq b/tests/fts/functions/snippet-4.rq +index 1b542b5..564f52d 100644 +--- a/tests/fts/functions/snippet-4.rq ++++ b/tests/fts/functions/snippet-4.rq +@@ -1 +1 @@ +-SELECT ?u fts:snippet(?u, '>>>', '<<<', '...', 0) { ?u fts:match 'bananas' } order by desc fts:rank(?u) ++SELECT ?u fts:snippet(?u, '>>>', '<<<', '...', -1) { ?u fts:match 'bananas' } order by desc fts:rank(?u) +diff --git a/tests/fts/functions/snippet-5.out b/tests/fts/functions/snippet-5.out +deleted file mode 100644 +index b7e42e2..0000000 +--- a/tests/fts/functions/snippet-5.out ++++ /dev/null +@@ -1,4 +0,0 @@ +-"http://www.example.org/test#1" +-"http://www.example.org/test#2" +-"http://www.example.org/test#4" +-"http://www.example.org/test#3" +diff --git a/tests/fts/functions/snippet-5.rq b/tests/fts/functions/snippet-5.rq +deleted file mode 100644 +index 564f52d..0000000 +--- a/tests/fts/functions/snippet-5.rq ++++ /dev/null +@@ -1 +0,0 @@ +-SELECT ?u fts:snippet(?u, '>>>', '<<<', '...', -1) { ?u fts:match 'bananas' } order by desc fts:rank(?u) +diff --git a/tests/fts/functions/snippet-data.rq b/tests/fts/functions/snippet-data.rq +index 2a8ffb1..5aa3006 100644 +--- a/tests/fts/functions/snippet-data.rq ++++ b/tests/fts/functions/snippet-data.rq +@@ -1,6 +1,6 @@ + INSERT { + test:1 a test:A ; test:p "bananas lemons lemons" . +- test:2 a test:A ; test:p "bananas bananas lemons" . ++ test:2 a test:A ; test:p "bananas bandanas lemons" . + test:3 a test:A ; test:o "bananas" . + test:4 a test:A ; test:p "bananas" ; test:o "bananas lemons" . + +diff --git a/tests/fts/tracker-fts-test.c b/tests/fts/tracker-fts-test.c +index b05da1a..0afda2f 100644 +--- a/tests/fts/tracker-fts-test.c ++++ b/tests/fts/tracker-fts-test.c +@@ -42,7 +42,7 @@ const TestInfo tests[] = { + { "input/fts3input", 3 }, + { "functions/rank", 2 }, + { "functions/offsets", 3 }, +- { "functions/snippet", 5 }, ++ { "functions/snippet", 4 }, + { NULL } + }; + diff -Nru tracker-3.4.2/debian/rules tracker-3.4.2/debian/rules --- tracker-3.4.2/debian/rules 2022-12-06 21:51:16.000000000 +0000 +++ tracker-3.4.2/debian/rules 2023-06-27 16:09:03.000000000 +0000 @@ -26,4 +26,4 @@ dh_makeshlibs -V -X/usr/lib/$(DEB_HOST_MULTIARCH)/tracker-3.0/ -- -c4 override_dh_auto_test: - dbus-run-session -- dh_auto_test --no-parallel + dbus-run-session -- dh_auto_test --no-parallel -- --timeout-multiplier 3