Package: src:tracker
Version: 1.2.6-1
Severity: normal
Tags: upstream patch
Hi Michael,
I noticed that the DEP8 tests of tracker fail (because they are blocking
glib2.0 in Ubuntu). There are a few reasons, see the changelog of the
attached diff:
* debian/tests/unit-tests, debian/patches/000*: Fix the DEP8 tests
- Make sure we always have LANG set
- Run under dbus-run-session so that there's always a session bus
available
- Set HOME to our temporary dir so we can guarantee to be able to write to
dconf & friends
- Tell the code that GInotifyFileWatcher is an inotify backend to avoid a
warning and use the right number of max waters (bgo #749261)
- Fix the collate order of some testsuite output (bgo #749262)
- Make an en_US.utf8 locale which the testsuite expects to find.
The 0001 patch is not only a testfix, but I hope you'll forgive me
bundling it in this bug. You don't get a failure due to it in unstable,
but it happens against glib from exp (≥ 2.45).
See
http://ci.debian.net/data/packages/unstable/amd64/t/tracker/20150501_094009.autopkgtest.log.gz
for an example of a failure.
Cheers,
--
Iain Lane [ i...@orangesquash.org.uk ]
Debian Developer [ la...@debian.org ]
Ubuntu Developer [ la...@ubuntu.com ]
diff -Nru tracker-1.2.6/debian/changelog tracker-1.2.6/debian/changelog
--- tracker-1.2.6/debian/changelog 2015-05-01 04:37:49.000000000 +0100
+++ tracker-1.2.6/debian/changelog 2015-05-12 17:40:12.000000000 +0100
@@ -1,3 +1,18 @@
+tracker (1.2.6-1.1) UNRELEASED; urgency=medium
+
+ * debian/tests/unit-tests, debian/patches/000*: Fix the DEP8 tests
+ - Make sure we always have LANG set
+ - Run under dbus-run-session so that there's always a session bus
+ available
+ - Set HOME to our temporary dir so we can guarantee to be able to write to
+ dconf & friends
+ - Tell the code that GInotifyFileWatcher is an inotify backend to avoid a
+ warning and use the right number of max waters (bgo #749261)
+ - Fix the collate order of some testsuite output (bgo #749262)
+ - Make an en_US.utf8 locale which the testsuite expects to find.
+
+ -- Iain Lane <i...@orangesquash.org.uk> Tue, 12 May 2015 11:16:40 +0100
+
tracker (1.2.6-1) unstable; urgency=medium
* New upstream release.
diff -Nru tracker-1.2.6/debian/patches/0001-tracker-miner-Set-inotify-limits-for-GInotifyFileBac.patch tracker-1.2.6/debian/patches/0001-tracker-miner-Set-inotify-limits-for-GInotifyFileBac.patch
--- tracker-1.2.6/debian/patches/0001-tracker-miner-Set-inotify-limits-for-GInotifyFileBac.patch 1970-01-01 01:00:00.000000000 +0100
+++ tracker-1.2.6/debian/patches/0001-tracker-miner-Set-inotify-limits-for-GInotifyFileBac.patch 2015-05-12 17:51:12.000000000 +0100
@@ -0,0 +1,30 @@
+From dc4785a0f256dc71e1c151da9b0b0c2927059906 Mon Sep 17 00:00:00 2001
+From: Iain Lane <i...@orangesquash.org.uk>
+Date: Tue, 12 May 2015 14:48:32 +0100
+Subject: [PATCH 1/2] tracker-miner: Set inotify limits for
+ 'GInotifyFileBackend' too
+
+As of GLib 2.45.1, the inotify monitor backend is called this.
+
+http://bugzilla.gnome.org/749261
+---
+ src/libtracker-miner/tracker-monitor.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
+index 327882f..dd7a798 100644
+--- a/src/libtracker-miner/tracker-monitor.c
++++ b/src/libtracker-miner/tracker-monitor.c
+@@ -281,7 +281,8 @@ tracker_monitor_init (TrackerMonitor *object)
+ name = g_type_name (priv->monitor_backend);
+
+ /* Set limits based on backend... */
+- if (strcmp (name, "GInotifyDirectoryMonitor") == 0) {
++ if (strcmp(name, "GInotifyDirectoryMonitor") == 0 ||
++ strcmp (name, "GInotifyFileMonitor") == 0) {
+ /* Using inotify */
+ g_message ("Monitor backend is Inotify");
+
+--
+2.1.4
+
diff -Nru tracker-1.2.6/debian/patches/0002-functions-tracker-Fix-collate-order.patch tracker-1.2.6/debian/patches/0002-functions-tracker-Fix-collate-order.patch
--- tracker-1.2.6/debian/patches/0002-functions-tracker-Fix-collate-order.patch 1970-01-01 01:00:00.000000000 +0100
+++ tracker-1.2.6/debian/patches/0002-functions-tracker-Fix-collate-order.patch 2015-05-12 17:51:41.000000000 +0100
@@ -0,0 +1,39 @@
+From 9f03dfb6ac77f4cf7f88563ff58a8196ae6be003 Mon Sep 17 00:00:00 2001
+From: Iain Lane <i...@orangesquash.org.uk>
+Date: Tue, 12 May 2015 15:01:20 +0100
+Subject: [PATCH 2/2] functions-tracker: Fix collate order
+
+In at least en_GB.UTF-8 and C.UTF-8, these tests fail because the output is
+actually in a different order.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=749262
+---
+ tests/libtracker-data/functions/functions-tracker-1.out | 2 +-
+ tests/libtracker-data/functions/functions-tracker-2.out | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/libtracker-data/functions/functions-tracker-1.out b/tests/libtracker-data/functions/functions-tracker-1.out
+index d8c2484..8fc886d 100644
+--- a/tests/libtracker-data/functions/functions-tracker-1.out
++++ b/tests/libtracker-data/functions/functions-tracker-1.out
+@@ -1,7 +1,7 @@
+-"Text"
+ "default"
+ "optional"
+ "optional for third"
+ "other"
+ "purposes"
+ "testing"
++"Text"
+diff --git a/tests/libtracker-data/functions/functions-tracker-2.out b/tests/libtracker-data/functions/functions-tracker-2.out
+index 9045c23..80bddb5 100644
+--- a/tests/libtracker-data/functions/functions-tracker-2.out
++++ b/tests/libtracker-data/functions/functions-tracker-2.out
+@@ -1,3 +1,3 @@
++"title of a film"
+ "Title X"
+ "UnitTesting"
+-"title of a film"
+--
+2.1.4
+
diff -Nru tracker-1.2.6/debian/patches/series tracker-1.2.6/debian/patches/series
--- tracker-1.2.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ tracker-1.2.6/debian/patches/series 2015-05-12 15:17:32.000000000 +0100
@@ -0,0 +1,2 @@
+0001-tracker-miner-Set-inotify-limits-for-GInotifyFileBac.patch
+0002-functions-tracker-Fix-collate-order.patch
diff -Nru tracker-1.2.6/debian/tests/control tracker-1.2.6/debian/tests/control
--- tracker-1.2.6/debian/tests/control 2015-05-01 04:37:49.000000000 +0100
+++ tracker-1.2.6/debian/tests/control 2015-05-12 17:30:05.000000000 +0100
@@ -1,3 +1,3 @@
Tests: unit-tests
-Depends: @, @builddeps@, dbus-x11, xauth, xvfb
+Depends: @, @builddeps@, dbus, xauth, xvfb, locales
Restrictions: build-needed
diff -Nru tracker-1.2.6/debian/tests/unit-tests tracker-1.2.6/debian/tests/unit-tests
--- tracker-1.2.6/debian/tests/unit-tests 2015-05-01 04:37:49.000000000 +0100
+++ tracker-1.2.6/debian/tests/unit-tests 2015-05-12 17:39:51.000000000 +0100
@@ -1,3 +1,10 @@
#!/bin/sh
-xvfb-run -a make -C tests check
+mkdir ${ADTTMP}/locale
+localedef -c -i en_US -f UTF-8 ${ADTTMP}/locale/en_US.utf8
+
+LOCPATH=${ADTTMP}/locale \
+ HOME=${ADTTMP} \
+ LANG=en_US.utf8 \
+ LC_ALL=en_US.utf8 \
+ xvfb-run -a dbus-run-session make -C tests check
