[tracker/harmattan: 932/2240] debian: Add changelog entry for 0.7.0-git20090907-1

[Martyn James Russell <mr src gnome org>]

commit 799e2f7209564aa16e1f9ad59428f698e5da964f
Author: Jürg Billeter <j bitron ch>
Date:   Mon Sep 7 19:33:23 2009 +0200

    debian: Add changelog entry for 0.7.0-git20090907-1

 debian/changelog                                   |   13 +++++
 debian/control                                     |    2 +-
 .../01-configure-without-gtk-doc-tools.patch       |   16 +-----
 debian/patches/02-default-config.patch             |   55 ++++++++-----------
 debian/patches/05-disabling-indexer-modules.patch  |   24 ---------
 5 files changed, 38 insertions(+), 72 deletions(-)
---
diff --git a/debian/changelog b/debian/changelog
index b190a27..6f95632 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tracker (0.7.0-git20090907-1) unstable; urgency=low
+
+  * Add libtracker-miner library.
+  * Add SPARQL journal and DB snapshots.
+  * Fix bugs in SPARQL and Turtle parsers.
+  * Perform more input validation for SPARQL updates.
+  * Improve FTS indexing.
+  * Update statistics continuously.
+  * LGPL for libtracker-common, libtracker-db, and libtracker-data.
+  * Fixes: NB#120451, NB#123379, NB#125733, NB#136136, NB#137408
+
+ -- Juerg Billeter <juerg billeter codethink co uk>  Mon, 7 Sep 2009 17:25:00 +0000
+
 tracker (0.7.0-git20090820-1) unstable; urgency=low
 
   * Fix build without raptor
diff --git a/debian/control b/debian/control
index 7e6b657..f5f7254 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XS-Python-Version: all
 Build-Depends: cdbs, debhelper (>= 5.0.0), autotools-dev,
   libxml-parser-perl, libglib2.0-dev (>= 2.16.0), libpango1.0-dev
   (>=1.0.0), libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60),
-  libgmime-2.0-2-dev (>= 2.2.0), libsqlite3-dev (>= 3.5),
+  libgmime-2.0-2-dev (>= 2.2.0), libsqlite3-dev (>= 3.6.11),
   libexif-dev (>= 0.6), libpng12-dev
   (>=1.2), libgtk2.0-dev (>= 2.8.0), zlib1g-dev, intltool, libhal-dev
   (>= 0.5.10), libhal-storage-dev (>= 0.5.10), gtk-doc-tools,
diff --git a/debian/patches/01-configure-without-gtk-doc-tools.patch b/debian/patches/01-configure-without-gtk-doc-tools.patch
index 44e792b..af29d15 100644
--- a/debian/patches/01-configure-without-gtk-doc-tools.patch
+++ b/debian/patches/01-configure-without-gtk-doc-tools.patch
@@ -29,18 +29,4 @@ Index: docs/reference/libtracker-common/Makefile.am
  
  # Other files to distribute
  EXTRA_DIST += version.xml.in
-Index: docs/reference/libtracker-module/Makefile.am
-===================================================================
---- docs/reference/libtracker-module/Makefile.am	(revision 30687)
-+++ docs/reference/libtracker-module/Makefile.am	(working copy)
-@@ -75,7 +75,9 @@ HTML_IMAGES =
- # Extra options to supply to gtkdoc-fixref
- FIXXREF_OPTIONS=
- 
--include $(top_srcdir)/gtk-doc.make
-+# Commented out for Maemo built to work.
-+#include $(top_srcdir)/gtk-doc.make
-+EXTRA_DIST =
- 
- # Other files to distribute
- EXTRA_DIST += version.xml.in
+
diff --git a/debian/patches/02-default-config.patch b/debian/patches/02-default-config.patch
index 464f52f..62db190 100644
--- a/debian/patches/02-default-config.patch
+++ b/debian/patches/02-default-config.patch
@@ -1,58 +1,49 @@
 diff --git a/src/tracker-miner-fs/tracker-config.c b/src/tracker-miner-fs/tracker-config.c
-index 21cef9e..163dfa3 100644
+index 8ee30a0..25f58f8 100644
 --- a/src/tracker-miner-fs/tracker-config.c
 +++ b/src/tracker-miner-fs/tracker-config.c
-@@ -41,11 +41,11 @@
+@@ -41,7 +41,7 @@
  
  /* Default values */
  #define DEFAULT_VERBOSITY			 0
 -#define DEFAULT_INITIAL_SLEEP			 15	  /* 0->1000 */
 +#define DEFAULT_INITIAL_SLEEP			 7	  /* 0->1000 */
- #define DEFAULT_ENABLE_WATCHES			 TRUE
+ #define DEFAULT_ENABLE_MONITORS			 TRUE
  #define DEFAULT_THROTTLE			 0	  /* 0->20 */
+ #define DEFAULT_SCAN_TIMEOUT			 0	  /* 0->1000 */
+@@ -49,7 +49,7 @@
  #define DEFAULT_ENABLE_THUMBNAILS		 TRUE
--#define DEFAULT_DISABLE_INDEXING_ON_BATTERY	 TRUE
-+#define DEFAULT_DISABLE_INDEXING_ON_BATTERY	 FALSE
- #define DEFAULT_DISABLE_INDEXING_ON_BATTERY_INIT FALSE
  #define DEFAULT_INDEX_MOUNTED_DIRECTORIES	 TRUE
  #define DEFAULT_INDEX_REMOVABLE_DEVICES		 TRUE
-@@ -482,14 +482,31 @@ config_create_with_defaults (TrackerConfig *config,
+-#define DEFAULT_INDEX_ON_BATTERY                 FALSE
++#define DEFAULT_INDEX_ON_BATTERY                 TRUE
+ #define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME      TRUE
+ #define DEFAULT_LOW_DISK_SPACE_LIMIT		 1	  /* 0->100 / -1 */
+ 
+@@ -563,9 +563,13 @@ config_create_with_defaults (TrackerConfig *config,
  		case G_TYPE_POINTER:
  			/* Special case string lists */
- 			if (g_strcmp0 (conversions[i].property, "watch-directory-roots") == 0) {
+ 			if (g_strcmp0 (conversions[i].property, "index-recursive-directories") == 0) {
 -				const gchar *string_list[] = { NULL, NULL };
 -
 -				string_list[0] = g_get_home_dir ();
--
--				g_key_file_set_string_list (key_file, 
--							    conversions[i].group, 
--							    conversions[i].key, 
--							    string_list, 
-+				const gchar *string_list[5] = {
++				const gchar *string_list[] = {
 +					"$HOME/MyDocs/.sounds/",
 +					"$HOME/MyDocs/.documents/",
 +					"$HOME/MyDocs/.videos/",
 +					"$HOME/MyDocs/.images/",
 +					"$HOME/MyDocs/.camera/",
 +				};
-+
-+				g_key_file_set_string_list (key_file,
-+							    conversions[i].group,
-+							    conversions[i].key,
-+							    string_list,
-+							    G_N_ELEMENTS (string_list));
-+			}
-+			else if (g_strcmp0 (conversions[i].property, "no-watch-directory-roots") == 0) {
-+				const gchar *string_list[3] = {
+ 
+ 				g_key_file_set_string_list (key_file, 
+ 							    conversions[i].group, 
+@@ -574,6 +578,9 @@ config_create_with_defaults (TrackerConfig *config,
+ 							    G_N_ELEMENTS (string_list));
+ 			} else if (g_strcmp0 (conversions[i].property, "ignored-directories") == 0) {
+ 				const gchar *string_list[] = { 
 +					"$HOME/MyDocs/core-dumps/",
 +					"$HOME/MyDocs/cities/",
 +					"$HOME/MyDocs/.sounds/Ringtones/",
-+				};
-+
-+				g_key_file_set_string_list (key_file,
-+							    conversions[i].group,
-+							    conversions[i].key,
-+							    string_list,
- 							    G_N_ELEMENTS (string_list));
- 			} else {
- 				const gchar *string_list[] = { NULL };
+ 					"po", "CVS", ".svn", ".git", "core-dumps",
+ 					NULL
+ 				};