[tracker/harmattan-pre-signal-updates: 1151/1380] Merge branch 'harmattan' of gitorious.org:tracker/tracker into harmattan

[Martyn James Russell <mr src gnome org>]

commit ae0d6e2f3b4a8c31aaf3466a692daef50c3ec657
Merge: 3bf7b61 d0a7706
Author: Jean-Luc Lamadon <jean-luc lamadon nokia com>
Date:   Fri Aug 20 19:11:58 2010 +0300

    Merge branch 'harmattan' of gitorious.org:tracker/tracker into harmattan
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog     |    7 +++++++
 debian/rules         |    5 +++++
 debian/tracker.aegis |    4 ----
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --cc debian/changelog
index c9cebe1,df418c4..85f457a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ tracker (0.9.18-1maemo1) unstable; urgency=low
+ 
+  ! unreleased !
+   * Fixes: NB#182131, Tracker isn't using resource tokens to protect its interfaces
+ 
+  -- Martyn Russell <martyn lanedo com>  Thu, 26 Aug 2010 18:00:00 +0100
+ 
 +tracker (0.9.17-1maemo2) unstable; urgency=low
 +
 +  * Removed wrong bug reference
 +
 + -- Jean-Luc Lamadon <jean-luc lamadon nokia com>  Thu, 19 Aug 2010 18:04:32 +0300
 +
  tracker (0.9.17-1maemo1) unstable; urgency=low
  
    * Require SQLite 3.7 for WAL (Write Ahead Logging)