diff -u tracker-0.5.3ubuntu/debian/changelog tracker-0.5.4/debian/changelog
--- tracker-0.5.3ubuntu/debian/changelog
+++ tracker-0.5.4/debian/changelog
@@ -1,3 +1,20 @@
+tracker (0.5.4-0ubuntu1) feisty; urgency=low
+
+  * New upstream release.
+    - Also contains a plugin for deskbar-applet.
+  * Added debian/watch.
+  * debian/copyright:
+    - Mention the deskbar plugin.
+  * debian/patches/10-deskbar_plugin-hashbang.patch:
+    - Remove the #! line from the deskbar plugin.
+  * debian/patches/20-trackerd-manpage.patch:
+    - Fix markup.
+    - Replace $Home with $HOME.
+  * debian/patches/30-deskbar_plugin-max_results.patch:
+    - Increase the maximum number of listed results from 2 to 10.
+
+ -- Johan Kiviniemi <debian@johan.kiviniemi.name>  Sat, 27 Jan 2007 16:58:32 +0200
+
 tracker (0.5.3ubuntu-0ubuntu1) feisty; urgency=low
 
   * Upload to Ubuntu from the package made by Michael Biebl for Debian
diff -u tracker-0.5.3ubuntu/debian/copyright tracker-0.5.4/debian/copyright
--- tracker-0.5.3ubuntu/debian/copyright
+++ tracker-0.5.4/debian/copyright
@@ -107,6 +107,12 @@
 Copyright (C) 2004-2006 Christian Hammond
 License: LGPL v2 or later
 
+===============================================================================
+python/deskbar-handler/tracker-handler.py
+
+Copyright (c) 2006 Mikkel Kamstrup
+License: GPL v2 or later
+
 
 
 On Debian systems, the complete text of the GNU Lesser General
diff -u tracker-0.5.3ubuntu/debian/rules tracker-0.5.4/debian/rules
--- tracker-0.5.3ubuntu/debian/rules
+++ tracker-0.5.4/debian/rules
@@ -6,3 +6,9 @@
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-external-sqlite
+DEB_CONFIGURE_EXTRA_FLAGS = \
+	--enable-external-sqlite \
+	--with-deskbar-applet-handler-dir=/usr/lib/deskbar-applet/handlers
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+
+binary-install/libdeskbar-tracker ::
+	dh_pycentral -p$(cdbs_curpkg)
diff -u tracker-0.5.3ubuntu/debian/control tracker-0.5.4/debian/control
--- tracker-0.5.3ubuntu/debian/control
+++ tracker-0.5.4/debian/control
@@ -2,13 +2,15 @@
 Section: utils
 Priority: optional
 Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), autotools-dev, dpkg-dev (>= 1.13.19), libxml-parser-perl, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.0.0), libgmime-2.0-2-dev (>= 2.1.0), libdbus-1-dev (>= 0.50), libdbus-glib-1-dev (>= 0.50), libgstreamer0.10-dev (>= 0.10.0), libsqlite3-dev, libpoppler-dev (>= 0.4.5), libpoppler-glib-dev (>= 0.4.5), libgsf-1-dev (>= 1.13), libexif-dev (>= 0.6), libpng12-dev (>= 1.2), libgtk2.0-dev (>= 2.8.0), libgnome2-dev (>= 2.14.0), libgnomeui-dev (>= 2.14.0), libgnomevfs2-dev (>= 2.8.4), libgnome-desktop-dev (>= 2.10)
+XS-Python-Version: all
+Build-Depends: cdbs, debhelper (>= 5.0.0), autotools-dev, dpkg-dev (>= 1.13.19), libxml-parser-perl, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.0.0), libgmime-2.0-2-dev (>= 2.1.0), libdbus-1-dev (>= 0.50), libdbus-glib-1-dev (>= 0.50), libgstreamer0.10-dev (>= 0.10.0), libsqlite3-dev, libpoppler-dev (>= 0.4.5), libpoppler-glib-dev (>= 0.4.5), libgsf-1-dev (>= 1.13), libexif-dev (>= 0.6), libpng12-dev (>= 1.2), libgtk2.0-dev (>= 2.8.0), libgnome2-dev (>= 2.14.0), libgnomeui-dev (>= 2.14.0), libgnomevfs2-dev (>= 2.8.4), libgnome-desktop-dev (>= 2.10), zlib1g-dev, libmagic-dev
+Build-Depends-Indep: python-central (>= 0.5)
 Standards-Version: 3.7.2
 
 Package: tracker
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, shared-mime-info, dbus
-Recommends: tracker-utils, tracker-search-tool, unzip, wv, poppler-utils | xpdf-utils, xsltproc, w3m, o3read
+Recommends: tracker-utils, tracker-search-tool, unzip, wv, poppler-utils | xpdf-utils, xsltproc, w3m, o3read, untex
 Suggests: imagemagick, evince
 Description: metadata database, indexer and search tool
  Tracker is an advanced framework for first class objects with associated
@@ -72,6 +74,7 @@
 Architecture: any
 Section: gnome
 Depends: ${shlibs:Depends}, ${misc:Depends}, tracker (= ${binary:Version})
+Recommends: xdg-utils
 Description: metadata database, indexer and search tool - Gnome frontend
  This package provides a graphical Tracker search tool for Gnome.
  .
@@ -82,0 +86,14 @@
+
+Package: libdeskbar-tracker
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-dbus (>= 0.41), python-gnome2, deskbar-applet, tracker
+Recommends: tracker-search-tool
+Description: metadata database, indexer and search tool - deskbar-applet plugin
+ This package provides a deskbar-applet plugin for Tracker.
+ .
+ Tracker is an advanced framework for first class objects with associated
+ metadata and tags. It provides a one stop solution for all metadata, tags,
+ shared object databases, search tools and indexing.
+ .
+  Homepage: http://www.tracker-project.org
only in patch2:
--- tracker-0.5.4.orig/debian/watch
+++ tracker-0.5.4/debian/watch
@@ -0,0 +1,5 @@
+version=3
+
+# Probably going to be tracker-project.org in the future.
+http://www.gnome.org/projects/tracker/download.html \
+  .*/tracker-(.*)\.tar\.gz
only in patch2:
--- tracker-0.5.4.orig/debian/libdeskbar-tracker.install
+++ tracker-0.5.4/debian/libdeskbar-tracker.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/deskbar-applet/handlers/
only in patch2:
--- tracker-0.5.4.orig/debian/patches/20-trackerd-manpage.patch
+++ tracker-0.5.4/debian/patches/20-trackerd-manpage.patch
@@ -0,0 +1,21 @@
+diff -Nur tracker-0.5.4/docs/trackerd.1 tracker-0.5.4.new/docs/trackerd.1
+--- tracker-0.5.4/docs/trackerd.1	2007-01-26 19:51:52.000000000 +0200
++++ tracker-0.5.4.new/docs/trackerd.1	2007-01-27 12:47:32.000000000 +0200
+@@ -16,7 +16,7 @@
+ \-e, --exclude-dir=/PATH/DIR
+ Specifies directories to be excluded from indexing
+ .TP
+-\[-i, --include-dir=/PATH/DIR]
++\-i, --include-dir=/PATH/DIR
+ Specifies directories to be included for indexing. All non-hidden sub directories of the specified directory will also be indexed. If this param is set then the user's home directory is no longer indexed by default (you can still add the home directory to this param)
+ .TP
+ \--no-indexing
+@@ -37,7 +37,7 @@
+  Language to use for stemmer and stop words list (ISO 639-1 2 characters code)
+ 
+ .SH FILES
+-.I $Home/.Tracker/tracker.cfg
++.I $HOME/.Tracker/tracker.cfg
+ .RS
+ Trackerd user configuration file. See
+ .BR tracker.cfg(5)
only in patch2:
--- tracker-0.5.4.orig/debian/patches/10-deskbar_plugin-hashbang.patch
+++ tracker-0.5.4/debian/patches/10-deskbar_plugin-hashbang.patch
@@ -0,0 +1,8 @@
+diff -Nur tracker-0.5.4/python/deskbar-handler/tracker-handler.py tracker-0.5.4.new/python/deskbar-handler/tracker-handler.py
+--- tracker-0.5.4/python/deskbar-handler/tracker-handler.py	2007-01-25 14:47:08.000000000 +0200
++++ tracker-0.5.4.new/python/deskbar-handler/tracker-handler.py	2007-01-27 12:37:06.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ #    This handler was originaly created by Mikkel Kamstrup and finaly
+ #    new version it's writed by Eugenio Cutolo(eulin)
+ #
only in patch2:
--- tracker-0.5.4.orig/debian/patches/30-deskbar_plugin-max_results.patch
+++ tracker-0.5.4/debian/patches/30-deskbar_plugin-max_results.patch
@@ -0,0 +1,12 @@
+diff -Nur tracker-0.5.4/python/deskbar-handler/tracker-handler.py tracker-0.5.4.new/python/deskbar-handler/tracker-handler.py
+--- tracker-0.5.4/python/deskbar-handler/tracker-handler.py	2007-01-27 16:53:49.000000000 +0200
++++ tracker-0.5.4.new/python/deskbar-handler/tracker-handler.py	2007-01-27 16:56:31.000000000 +0200
+@@ -18,7 +18,7 @@
+ from deskbar.Match import Match
+ 
+ #Edit this var for change the numer of output results
+-MAX_RESULTS = 2
++MAX_RESULTS = 10
+ 
+ def _check_requirements ():
+ 	try: