Merge commit '244f660a0626f4a2c09a669b7d5e89084cebd9db' into update

tracker/Makefile.am

@@ -98,6 +98,7 @@ DISTCLEANFILES +=                                      \
 
 DISTCHECK_CONFIGURE_FLAGS =                            \
 	--with-session-bus-services-dir="\$(datadir)"/dbus-1/services \
+	--with-bash-completion-dir="\$(datadir)"/bash-completion/ \
 	--disable-nautilus-extension                   \
 	--enable-unit-tests                            \
 	--enable-functional-tests                      \
@@ -117,6 +118,6 @@ DISTCHECK_CONFIGURE_FLAGS =                            \
 	--enable-libgsf                                \
 	--enable-playlist                              \
 	--enable-tracker-preferences                   \
-	--with-enca
+	--enable-enca
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

tracker/NEWS

@@ -1,3 +1,121 @@
+New in 1.4.3 - 2016-03-01
+=========================
+
+  * Include embedded copy of sqlite
+
+Translations: pt_BR
+
+New in 1.4.2 - 2015-12-27
+=========================
+
+  * tracker CLI: fixed search with -f argument
+  * libtracker-miner: Cancel pending async operations during destruction
+  * libtracker-miner: Handle failure to get a TrackerSparqlConnection
+  * libtracker-common: Fix buffer overrun on libunistring unaccenting
+  * libtracker-control: Fix return value in function call
+  * libtracker-control: Improve docs
+  * libtracker-data: Silence criticals on REGEX() with null strings
+
+Translations: cs, de, hu, id, lt, pl, pt, sv
+
+NEW in 1.4.1 - 2014-07-31
+=========================
+
+  * build: Move bash-completion to new location
+  * libtracker-miner: Set inotify limits for 'GInotifyFileBackend' too (changes in GLib)
+  * tracker-extract: Remove ModulePath from comic/ebook rules
+  * tracker-extract-gstreamer: Rely better on the GstDiscoverer than mimetype sniffing
+  * tracker-extract-gstreamer: Fallback to preview image for album art
+  * tracker-miner-fs: Reset retry counter when we need to prepend parents
+  * tracker-preferences: Use the new command line tool
+  * tracker: Improve bash completion script (complete on real files for some arguments)
+  * tracker: Mark missing strings for translation
+  * Fixes: GB#735610, Remove requirement on ModulePath for extractor .rule files
+  * Fixes: GB#732236, use embedded album art if available
+  * Fixes: GB#750394, libtracker-miner: Keep a monitor on root index tree files on deletion
+  * Fixes: GB#751723, [PATCH] tracker-sparql.1: Man page syntax fix
+  * Fixes: GB#751724, [PATCH] docs: Spelling fixes
+  * Fixes: GB#751992, gnome-shell search on fresh new tracker db triggers tracker-miner-fs warnings
+  * Fixes: GB#748677, tracker-preferences still calls tracker-control
+  * Fixes: GB#746401, epub: handle multiple dc:identifier tags
+
+Translations:
+
+  * Updated bg: Alexander Shopov
+  * Updated pl: Piotr Drąg
+  * Updated pt: Pedro Albuquerque
+  * Updated pt_BR: Gustavo Marques, Felipe Braga
+  * Updated sl: Martin Srebotnjak, Matej Urbančič
+
+
+NEW in 1.4.0 - 2014-03-24
+=========================
+
+  * Fix ambiguous GListModel vs GtkListModel references in vala (#746194)
+  * Fix compiler warnings (#746381)
+  * Ignore "." recursing through compressed content (#746437)
+
+Translations: id, it, sv, tr
+
+NEW in 1.3.6 - 2015-03-17
+=========================
+
+  * Fix spurious folder deletes/reindexes (#741852)
+  * Fix nie:url UNIQUE constraint asserts on downloaded files (RH#1192224)
+  * Clear tracker-store watchdog timeout (#745565)
+  * Support fn:replace (#745917)
+  * Spam stderr less for not-so-uncommon error conditions (#746256)
+
+Translations: ko, bs, sr, sl, da
+
+
+NEW in 1.3.5 - 2015-03-06
+=========================
+
+  * Fix major database migration bug, skip Tracker 1.3.4. (#745737)
+  * Build only libiptc test if libjpeg is enabled (#745583)
+  * Put absolute path in shell script (#743738)
+
+Translations: ru
+
+
+NEW in 1.3.4 - 2015-03-03
+=========================
+
+  * Fixed playlists being processed by tracker-extract
+  * Fixes: #743727, Account for cardinality=0 on DB migration
+  * Fixes: #745219, mp3 passes album instead of song title to libmediaart
+
+Translations: zh_TW, sk, eo, nb, lt, eu, po
+
+
+NEW in 1.3.3 - 2015-02-05
+=========================
+
+  * Fixes: GB#681698, Disc number may be incorrect for multi-disc vorbis / flac albums
+  * Fixes: GB#741109, BMP extractor doesn't retrieve image height and width
+  * Fixes: GB#743250, libmediart-2.0 support
+  * Fixes: GB#735406, Tracker spams my log with "Unable to insert multiple values for subject ..."
+  * Fixes: GB#742391, applications, userguides: Don't detect locale changes if we failed to create the miner
+  * Fixes: GB#742035, 1.2.5 unit test failures
+  * Fixes: GB#739234, Tracker sometimes ignores SIGINT/SIGTERM
+  * Fixes: GB#663687, Missing accessible label names on tracker-needle widgets
+  * Fixes: GB#741777, libtracker-sparql: Document requirement to escape constructed queries
+  * Fixes: GB#678986, item_move() creates invalid SPARQL if source file does not exist
+  * Reverted: GB#733536, Remove --enable-guarantee metadata, always guarantee nie:title and nie:contentCreated
+
+Translations:
+
+  * Updated cs: Marek Černocký
+  * Updated de: Christian Kirbach, Bernd Homuth
+  * Updated el: Dimitris Spingos, Dimitris Spingos (Δημήτρης Σπίγγος)
+  * Updated es: Daniel Mustieles
+  * Updated eu: Inaki Larranaga Murgoitio, Iñaki Larrañaga Murgoitio
+  * Updated gl: Fran Dieguez
+  * Updated hu: Balázs Úr
+  * Updated pt_BR: Rafael Ferreira
+
+
 NEW in 1.3.2 - 2014-12-11
 =========================
 

tracker/autogen.sh

@@ -21,4 +21,40 @@ if ! which gnome-autogen.sh ; then
   exit 1
 fi
 
+# If no arguments are given, use those used with distcheck
+# equally, use the JHBuild prefix if it is available otherwise fall
+# back to the default (/usr/local)
+if [ $# -eq 0 ] ; then
+  echo "Using distcheck arguments, none were supplied..."
+
+  if test -n "$JHBUILD_PREFIX" ; then
+    echo "Using JHBuild prefix ('$JHBUILD_PREFIX')"
+    NEW_PREFIX="--prefix $JHBUILD_PREFIX --with-bash-completion-dir=$JHBUILD_PREFIX/share/bash-completion/completions"
+  fi
+
+  NEW_ARGS="\
+	--disable-nautilus-extension \
+	--enable-unit-tests \
+	--enable-functional-tests \
+	--enable-gtk-doc \
+	--enable-introspection \
+	--disable-miner-rss \
+	--disable-miner-evolution \
+	--disable-miner-thunderbird \
+	--disable-miner-firefox \
+	--enable-poppler \
+	--enable-exempi \
+	--enable-libiptcdata \
+	--enable-libjpeg \
+	--enable-libtiff \
+	--enable-libvorbis \
+	--enable-libflac \
+	--enable-libgsf \
+	--enable-playlist \
+	--enable-tracker-preferences \
+	--enable-enca"
+
+  set -- $NEW_PREFIX $NEW_ARGS
+fi
+
 . gnome-autogen.sh