Merge lp:~aleksander-m/tracker/tracker.head.aleksander into lp:~tracker-team/tracker/tracker.head

[Aleksander Morgado]

Updated tracker packaging for 0.9.26

[Chris Coulson (chrisccoulson)]

Thanks, I've merged this now

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-06 01:33:32 +0000
+++ debian/changelog	2010-10-21 20:41:35 +0000
@@ -1,3 +1,29 @@
+tracker (0.9.26-0ubuntu0~unstable1) maverick; urgency=low
+
+  * New upstream release 0.9.26
+
+  * New packages added: libtracker-sparql and libtracker-sparql-dev
+    - add libtracker-sparql.install.in
+    - add libtracker-sparql-dev.install.in
+    - update libtracker-client.install.in
+    - update debian/control.in
+    - update debian/rules
+  * Added dependency for libunistring-dev
+    - update debian/control.in
+  * Removed dependency for libpango-dev and valac
+    - update debian/control.in
+  * Bump libdbus-1-dev, libdbus-glib-1-dev and libsqlite3-dev build-deps
+    - update debian/control.in
+  * In tracker-extract package, suggest gzip instead of unzip and remove
+    odt2txt suggestion.
+    - update debian/control.in
+  * Remove files which no longer exist from the tracker package.
+    - update debian/tracker.install.in
+  * Added copyright of new files
+    - update debian/copyright
+
+ -- Aleksander Morgado <[e-mail]>  Thu, 21 Oct 2010 22:33:18 +0200
+
 tracker (0.9.15-0ubuntu0~unstable1) maverick; urgency=low
 
   * New upstream release 0.9.15
@@ -23,7 +49,7 @@
     - update debian/rules
   * Install vapi helper file /usr/share/vala/vapi/tracker-miner-0.9.deps
     - update debian/libtracker-miner-dev.install.in
-  * Add lintian override for tracker-miner-flickr for 
+  * Add lintian override for tracker-miner-flickr for
     binary-or-shlib-defines-rpath, as it's linking to a private library
     in /usr/lib/tracker-0.9
     - add debian/tracker-miner-flickr.lintian-overrides.in
@@ -35,37 +61,37 @@
 
   * Rebased on Ubuntu maverick, remaining changes:
   * Add APIVER and SONAME placeholders to various files, and substitute these
-    with the correct value at build-time. Create the versioned files 
+    with the correct value at build-time. Create the versioned files
     automatically at build-time
     - rename debian/control => debian/control.in
-    - rename debian/libtracker-client-0.8-0.install => 
+    - rename debian/libtracker-client-0.8-0.install =>
        debian/libtracker-client.install.in
-    - rename debian/libtracker-client-0.8-dev.install => 
+    - rename debian/libtracker-client-0.8-dev.install =>
        debian/libtracker-client-dev.install.in
-    - rename debian/libtracker-extract-0.8-0.install => 
+    - rename debian/libtracker-extract-0.8-0.install =>
        debian/libtracker-extract.install.in
-    - rename debian/libtracker-extract-0.8-0.lintian-overrides => 
+    - rename debian/libtracker-extract-0.8-0.lintian-overrides =>
        debian/libtracker-extract.lintian-overrides.in
-    - rename debian/libtracker-extract-0.8-dev.install => 
+    - rename debian/libtracker-extract-0.8-dev.install =>
        debian/libtracker-extract-dev.install.in
-    - rename debian/libtracker-miner-0.8-0.install => 
+    - rename debian/libtracker-miner-0.8-0.install =>
        debian/libtracker-miner.install.in
     - rename debian/libtracker-miner-0.8-0.lintian-overrides =>
        debian/libtracker-miner.lintian-overrides.in
-    - rename debian/libtracker-miner-0.8-dev.install => 
+    - rename debian/libtracker-miner-0.8-dev.install =>
        debian/libtracker-miner-dev.install.in
     - rename debian/tracker-extract.install => debian/tracker-extract.install.in
     - rename debian/tracker-gui.install => debian/tracker-gui.install.in
-    - rename debian/tracker-gui.lintian-overrides => 
+    - rename debian/tracker-gui.lintian-overrides =>
        debian/tracker-gui.lintian-overrides.in
     - rename debian/tracker.install => debian/tracker.install.in
-    - rename debian/tracker-miner-evolution.install => 
+    - rename debian/tracker-miner-evolution.install =>
        debian/tracker-miner-evolution.install.in
-    - rename debian/tracker-miner-evolution.lintian-overrides => 
+    - rename debian/tracker-miner-evolution.lintian-overrides =>
        debian/tracker-miner-evolution.lintian-overrides.in
-    - rename debian/tracker-miner-fs.lintian-overrides => 
+    - rename debian/tracker-miner-fs.lintian-overrides =>
        debian/tracker-miner-fs.lintian-overrides.in
-    - rename debian/tracker-utils.lintian-overrides => 
+    - rename debian/tracker-utils.lintian-overrides =>
        debian/tracker-utils.lintian-overrides.in
     - update debian/control.in
     - update debian/libtracker-client.install.in
@@ -74,7 +100,7 @@
     - update debian/libtracker-extract.lintian-overrides.in
     - update debian/libtracker-extract-dev.install.in
     - update debian/libtracker-miner.install.in
-    - update debian/libtracker-miner.lintian-overrides.in  
+    - update debian/libtracker-miner.lintian-overrides.in
     - update debian/libtracker-miner-dev.install.in
     - update debian/tracker-extract.install.in
     - update debian/tracker-gui.install.in
@@ -380,12 +406,12 @@
         automatically build without UNAC support when it
         is not installed now.
     - debian/tracker.install:
-      + Don't install the DBus service so trackerd is not automatically 
+      + Don't install the DBus service so trackerd is not automatically
         started when other software try to see if it's already running
     - debian/patches/02_no_kde_autostart.patch:
 	  + Do not autostart trackerd in KDE.
     - debian/patches/03_dont_activate_indexing_and_watching.patch:
-      + Don't active indexing nor watching as decided by the 
+      + Don't active indexing nor watching as decided by the
         technical board.
     - debian/patches/05_am_maintainer_mode.patch:
       + Enable AM_MAINTAINER_MODE, to stop the build system being updated,
@@ -396,7 +422,7 @@
       + Automatically reindex if the index becomes corrupt as opposed
       	to displaying a notification with reindex action, which requires
       	user intervention and results in a confusing fallback notification.
-      	Reindexing is the only sane way to recover from a corrupt index 
+      	Reindexing is the only sane way to recover from a corrupt index
       	anyway.
     - debian/patches/20-tracker-defaults.patch:
       + Don't disable the evolution module in the default config - we
@@ -405,7 +431,7 @@
     - debian/patches/99_autotools.patch:
       + Autotools update.
     - debian/tracker.postinst:
-      + Start procps to apply "sysctl.d/30-tracker.conf"	    
+      + Start procps to apply "sysctl.d/30-tracker.conf"
     - debian/tracker.py:
       + Apport hook to ignore tracker-extract crashes. The hook is not
         installed since tracker-extract no longer limits memory with
@@ -417,7 +443,7 @@
       upstream.
   * debian/control:
     - Don't build-depend on evolution-dev or evolution-data-server-dev.
-      The push-modules were disabled upstream, so these dependencies are 
+      The push-modules were disabled upstream, so these dependencies are
       not required.
   * Dropped patches merged upstream:
     - 21_remove_all_indexes_on_reindex.patch.
@@ -429,7 +455,7 @@
   * debian/patches/11_drop_evolution_module.patch:
     - Updated to hide the Evolution indexing option from the preferences
       dialog.
-                     
+
  -- Chris Coulson <[e-mail]>  Mon, 15 Jun 2009 19:37:06 +0100
 
 tracker (0.6.95-1) unstable; urgency=low
@@ -478,7 +504,7 @@
     - debian/patches/22_flush_stop_on_index_error.patch:
       + Make sync/async flush functions to stop on any error.
     - debian/patches/23_indexer_pause_on_index_error.patch:
-      + Add new "index error" indexer status and pause the indexer 
+      + Add new "index error" indexer status and pause the indexer
         on index error.
 
  -- Chris Coulson <[e-mail]>  Thu, 04 Jun 2009 21:49:31 +0100
@@ -490,7 +516,7 @@
     - Automatically reindex if the index becomes corrupt as opposed
       to displaying a notification with reindex action, which requires
       user intervention and results in a confusing fallback notification.
-      Reindexing is the only sane way to recover from a corrupt index 
+      Reindexing is the only sane way to recover from a corrupt index
       anyway (LP: #361205).
   * debian/patches/21_remove_all_indexes_on_reindex.patch:
     - Ensure that all index files are removed when a reindex is
@@ -568,14 +594,14 @@
 tracker (0.6.92-1ubuntu2) jaunty; urgency=low
 
   * debian/patches/11_drop_evolution_module.patch:
-    - Updated to fully disable the old Evolution module. 
-      This corrects a warning when tracker-indexer first 
+    - Updated to fully disable the old Evolution module.
+      This corrects a warning when tracker-indexer first
       starts (LP: #354601).
   * debian/patches/15_crasher-fix-from-svn-r3159.patch:
     - Fix backported from SVN to fix a crash in the indexer
       when unmounting removable devices (LP: #354362, LP: #354236).
   * debian/patches/16_fixes-from-svn-r3167.patch:
-    - Various fixes for memory leaks and corruption issues 
+    - Various fixes for memory leaks and corruption issues
       backported from SVN revision 3167. Should fix LP: #340055.
   * debian/tracker-utils.install:
     - Install tracker-processes utility.
@@ -601,17 +627,17 @@
         automatically build without UNAC support when it
         is not installed now.
     - debian/tracker.install:
-      + Don't install the DBus service so trackerd is not automatically 
+      + Don't install the DBus service so trackerd is not automatically
         started when other software try to see if it's already running
-      + Install tracker.py in /usr/share/apport/package-hooks/  
+      + Install tracker.py in /usr/share/apport/package-hooks/
     - debian/tracker.postinst:
-      + Start procps to apply "sysctl.d/30-tracker.conf"         
+      + Start procps to apply "sysctl.d/30-tracker.conf"
     - debian/tracker.py:
       + Added an apport hook to ignore tracker-extract crashes, since they
         are caused by setrlimit terminating tracker-extract when it raises
         it's cpu/memory limit.
     - debian/patches/03_dont_activate_indexing_and_watching.patch:
-      + Don't active indexing nor watching as decided by the 
+      + Don't active indexing nor watching as decided by the
         technical board.
     - debian/patches/02_no_kde_autostart.patch:
       + Do not autostart trackerd in KDE, as they have strigi.
@@ -655,20 +681,20 @@
         libunac1-dev, libqdbm-dev.
       + tracker depends on procps.
     - debian/30-tracker.conf:
-      + Increase maximum number of inotify watches to 524288.      
+      + Increase maximum number of inotify watches to 524288.
     - debian/rules:
       + Enable sqlite external db instead of qdbm.
       + Pass --disable-unac to configure. The new version won't
         automatically build without UNAC support when it
         is not installed now.
     - debian/tracker.install:
-      + Don't install the DBus service so trackerd is not automatically 
+      + Don't install the DBus service so trackerd is not automatically
         started when other software try to see if it's already running
       + Install tracker.py in /usr/share/apport/package-hooks/
     - debian/patches/02_no_kde_autostart.patch:
       + Do not autostart trackerd in KDE, as they have strigi.
     - debian/patches/03_dont_activate_indexing_and_watching.patch:
-      + Don't active indexing nor watching as decided by the 
+      + Don't active indexing nor watching as decided by the
         technical board.
     - debian/tracker.postinst:
       + Start procps to apply "sysctl.d/30-tracker.conf"
@@ -678,7 +704,7 @@
         it's cpu/memory limit.
   * debian/patches/03_dont_activate_indexing_and_watching.patch:
     - Updated for new version.
-                    
+
  -- Chris Coulson <[e-mail]>  Wed, 18 Mar 2009 23:57:41 +0000
 
 tracker (0.6.91-1) unstable; urgency=low
@@ -750,10 +776,10 @@
     - debian/patches/02_no_kde_autostart.patch:
       + Do not autostart trackerd in KDE, as they have strigi.
     - debian/patches/03_dont_activate_indexing_and_watching.patch:
-      + Don't active indexing nor watching as decided by the 
+      + Don't active indexing nor watching as decided by the
         technical board.
     - debian/patches/05_gnomedesktop.patch:
-      + Use python module gnomedesktop directly rather than 
+      + Use python module gnomedesktop directly rather than
         deskbar.core.gnomedesktop python module
     - debian/rules:
       + Enable sqlite external db instead of qdbm.
@@ -767,7 +793,7 @@
         are caused by setrlimit terminating tracker-extract when it raises
         it's cpu/memory limit.
     - debian/tracker.install:
-      + Don't install the DBus service so tracker is not automatically 
+      + Don't install the DBus service so tracker is not automatically
         started when other software try to see if it's already running
       + Install tracker.py in /usr/share/apport/package-hooks/
     - debian/tracker.postinst:
@@ -864,13 +890,13 @@
       + 05_gnomedesktop.patch: use python module gnomedesktop directly rather
         than deskbar.core.gnomedesktop python module
     - debian/tracker.install:
-      + don't install the dbus service so tracker is not automatically 
+      + don't install the dbus service so tracker is not automatically
         started when other software try to see if it's already running
         (lp: #204770)
   * new recommends on odt2txt
   * drop o3read dependency (no longer in the archive)
 
-  
+
  -- Michael Vogt <[e-mail]>  Thu, 13 Nov 2008 15:34:51 +0100
 
 tracker (0.6.6-2) unstable; urgency=low
@@ -882,7 +908,7 @@
   * debian/patches/01-secure_tmpdir.patch
     - Use mktemp to create a secure tmpdir for the msword filter.
       Thanks to Jon Dowland for the patch. Closes: #473733
-  * Add symbols files for libtrackerclient0 and libtracker-gtk0. 
+  * Add symbols files for libtrackerclient0 and libtracker-gtk0.
   * debian/patches/02-static_keywords_reply.patch
     - Make _keywords_reply a static function to not export it in the public
       API.
@@ -1326,7 +1352,7 @@
     - Improved stopwords
     - New deskbar handler that uses the new deskbar api (2.19+)
     - Fixed old deskbar handler to remove race condition causing crashes
-    - Fixed a number of annoying bugs in email indexing and tracker 
+    - Fixed a number of annoying bugs in email indexing and tracker
       preferences (LP: #132921)
   * debian/libdeskbar-tracker.install:
     - updated
@@ -1369,16 +1395,16 @@
 tracker (0.6.0-1) unstable; urgency=low
 
   * New upstream release.
-    - Uses XDG directories to store the settings, cache, database and log 
+    - Uses XDG directories to store the settings, cache, database and log
       files. Closes: #414860
-    - Fixes the crash of the deskbar applet at session start. Closes: #434078 
+    - Fixes the crash of the deskbar applet at session start. Closes: #434078
     - Does not fall back to polling when the inotify limit is exceeded.
       Closes: #412089
     - Correctly uses xdg-open to open the search results with the preferred
       application. This requires the xdg-utils package to be installed, which
       is a Recommends of tracker-search-tool. Closes: 415705
-  * Removed debian/man/ as the man pages are now shipped upstream. 
-    Update tracker.manpages, tracker-search-tool.manpages and 
+  * Removed debian/man/ as the man pages are now shipped upstream.
+    Update tracker.manpages, tracker-search-tool.manpages and
     tracker-utils.manpages accordingly.
   * Removed patches that were applied upstream or are now obsolete
     - debian/patches/20-trackerd_manpage.patch
@@ -1413,7 +1439,7 @@
 tracker (0.5.4-6) unstable; urgency=low
 
   * Rebuild against poppler 0.5.4. Closes: #427815
-  * Don't install htmless binary and man page anymore. 
+  * Don't install htmless binary and man page anymore.
     The html filter now uses w3m.
 
  -- Michael Biebl <[e-mail]>  Wed, 06 Jun 2007 22:39:00 +0200
@@ -1472,7 +1498,7 @@
   * debian/control:
     - Add Recommends: untex to tracker and Recommends: xdg-utils to
       tracker-search-tool.
-    - Add libmagic-dev as new build depencency.  
+    - Add libmagic-dev as new build depencency.
 
   [ Michael Biebl ]
   * Review Johan's work and upload to unstable.
 
=== modified file 'debian/control'
--- debian/control	2010-08-06 01:00:30 +0000
+++ debian/control	2010-10-21 20:41:35 +0000
@@ -8,14 +8,12 @@
                autotools-dev,
                pkg-config,
                intltool (>= 0.35.0),
-               libglib2.0-dev (>= 2.20.0),
-               libpango1.0-dev (>= 1.0.0),
-               libdbus-1-dev (>= 1.0),
-               libdbus-glib-1-dev (>= 0.78),
+               libglib2.0-dev (>= 2.24.0),
+               libdbus-1-dev (>= 1.3.1),
+               libdbus-glib-1-dev (>= 0.82),
                libgstreamer0.10-dev (>= 0.10.12),
                libgstreamer-plugins-base0.10-dev (>= 0.10.12),
-               libsqlite3-dev (>= 3.6.17),
-               libpoppler-dev (>= 0.12.2),
+               libsqlite3-dev (>= 3.7.1),
                libgsf-1-dev (>= 1.13),
                libexif-dev (>= 0.6),
                libpng12-dev (>= 1.2),
@@ -27,8 +25,6 @@
                zlib1g-dev,
                libexempi-dev (>= 2.1.0),
                libnotify-dev (>= 0.4.3),
-               python-support (>= 0.6),
-               quilt,
                evolution-dev (>= 2.25.5),
                evolution-data-server-dev (>= 2.25.5),
                libpanel-applet2-dev,
@@ -39,14 +35,14 @@
                libiptcdata0-dev,
                uuid-dev,
                libgee-dev (>= 0.3),
-               valac,
                gtk-doc-tools,
                graphviz,
                librest-dev (>= 0.6),
                libnm-glib-dev (>= 0.8),
                libgif-dev,
-               libgnome-keyring-dev (>= 2.26)
-Standards-Version: 3.8.4
+               libgnome-keyring-dev (>= 2.26),
+               libunistring-dev
+Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/users/biebl/tracker.git
 Vcs-Browser: http://git.debian.org/?p=users/biebl/tracker.git;a=summary
 Homepage: http://www.tracker-project.org/
@@ -87,7 +83,34 @@
          libglib2.0-dev
 Description: metadata database, indexer and search tool - development files
  This package contains the static libraries and header files needed to link
- applications with libtrackerclient.
+ applications with libtracker-client.
+ .
+ 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.
+
+Package: libtracker-sparql-0.9-0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: metadata database, indexer and search tool - library
+ This package contains the library that is used by applications to access
+ the Tracker daemon and database.
+ .
+ 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.
+
+Package: libtracker-sparql-0.9-dev
+Architecture: any
+Section: libdevel
+Depends: libtracker-sparql-0.9-0 (= ${binary:Version}),
+         ${misc:Depends},
+         libglib2.0-dev
+Description: metadata database, indexer and search tool - development files
+ This package contains the static libraries and header files needed to link
+ applications with libtracker-sparql.
  .
  Tracker is an advanced framework for first class objects with associated
  metadata and tags. It provides a one stop solution for all metadata, tags,
@@ -107,7 +130,7 @@
 Section: libdevel
 Depends: libtracker-miner-0.9-0 (= ${binary:Version}),
          ${misc:Depends},
-         libtracker-client-0.9-dev,
+         libtracker-sparql-0.9-dev,
          libglib2.0-dev
 Description: tracker data miner library - development files
  This package contains the static libraries and header files needed to link
@@ -129,7 +152,7 @@
 Section: libdevel
 Depends: libtracker-extract-0.9-0 (= ${binary:Version}),
          ${misc:Depends},
-         libtracker-client-0.9-dev,
+         libtracker-sparql-0.9-dev,
          libglib2.0-dev
 Description: tracker extractor library - development files
  This package contains the static libraries and header files needed to link
@@ -164,9 +187,12 @@
 Section: gnome
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         tracker (= ${binary:Version})
-Conflicts: tracker-search-tool
-Replaces: tracker-search-tool
+         tracker (= ${binary:Version}),
+         gnome-icon-theme
+Breaks: tracker-search-tool (<< 0.8.1-1),
+        tracker (<< 0.8.1-1)
+Replaces: tracker-search-tool (<< 0.8.1-1),
+          tracker (<< 0.8.1-1)
 Description: metadata database, indexer and search tool - GNOME frontend
  This package provides a graphical Tracker search tool for GNOME.
  .
@@ -179,8 +205,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          tracker (= ${binary:Version})
-Recommends: unzip,
-            odt2txt
+Recommends: gzip
 Description: metadata database, indexer and search tool - metadata extractors
  This package contains the metadata extractors.
  .
@@ -188,24 +213,6 @@
  metadata and tags. It provides a one stop solution for all metadata, tags,
  shared object databases, search tools and indexing.
 
-#Package: libdeskbar-tracker
-#Architecture: all
-#Depends: ${misc:Depends},
-#         ${python:Depends},
-#         python-dbus (>= 0.41),
-#         python-gnome2,
-#         python-gobject,
-#         python-gnomedesktop,
-#         deskbar-applet (>= 2.20.0),
-#         tracker
-#Recommends: tracker-gui
-#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.
-
 Package: tracker-miner-fs
 Architecture: any
 Depends: ${shlibs:Depends},
 
=== modified file 'debian/control.in'
--- debian/control.in	2010-08-06 01:00:30 +0000
+++ debian/control.in	2010-10-21 20:41:35 +0000
@@ -9,12 +9,11 @@
                pkg-config,
                intltool (>= 0.35.0),
                libglib2.0-dev (>= 2.24.0),
-               libpango1.0-dev (>= 1.0.0),
-               libdbus-1-dev (>= 1.0),
-               libdbus-glib-1-dev (>= 0.78),
+               libdbus-1-dev (>= 1.3.1),
+               libdbus-glib-1-dev (>= 0.82),
                libgstreamer0.10-dev (>= 0.10.12),
                libgstreamer-plugins-base0.10-dev (>= 0.10.12),
-               libsqlite3-dev (>= 3.6.17),
+               libsqlite3-dev (>= 3.7.1),
                libgsf-1-dev (>= 1.13),
                libexif-dev (>= 0.6),
                libpng12-dev (>= 1.2),
@@ -36,13 +35,13 @@
                libiptcdata0-dev,
                uuid-dev,
                libgee-dev (>= 0.3),
-               valac,
                gtk-doc-tools,
                graphviz,
                librest-dev (>= 0.6),
                libnm-glib-dev (>= 0.8),
                libgif-dev,
-               libgnome-keyring-dev (>= 2.26)
+               libgnome-keyring-dev (>= 2.26),
+               libunistring-dev
 Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/users/biebl/tracker.git
 Vcs-Browser: http://git.debian.org/?p=users/biebl/tracker.git;a=summary
@@ -84,7 +83,34 @@
          libglib2.0-dev
 Description: metadata database, indexer and search tool - development files
  This package contains the static libraries and header files needed to link
- applications with libtrackerclient.
+ applications with libtracker-client.
+ .
+ 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.
+
+Package: libtracker-sparql-@APIVER@-@SONAME@
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: metadata database, indexer and search tool - library
+ This package contains the library that is used by applications to access
+ the Tracker daemon and database.
+ .
+ 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.
+
+Package: libtracker-sparql-@APIVER@-dev
+Architecture: any
+Section: libdevel
+Depends: libtracker-sparql-@APIVER@-@SONAME@ (= ${binary:Version}),
+         ${misc:Depends},
+         libglib2.0-dev
+Description: metadata database, indexer and search tool - development files
+ This package contains the static libraries and header files needed to link
+ applications with libtracker-sparql.
  .
  Tracker is an advanced framework for first class objects with associated
  metadata and tags. It provides a one stop solution for all metadata, tags,
@@ -104,7 +130,7 @@
 Section: libdevel
 Depends: libtracker-miner-@APIVER@-@SONAME@ (= ${binary:Version}),
          ${misc:Depends},
-         libtracker-client-@APIVER@-dev,
+         libtracker-sparql-@APIVER@-dev,
          libglib2.0-dev
 Description: tracker data miner library - development files
  This package contains the static libraries and header files needed to link
@@ -126,7 +152,7 @@
 Section: libdevel
 Depends: libtracker-extract-@APIVER@-@SONAME@ (= ${binary:Version}),
          ${misc:Depends},
-         libtracker-client-@APIVER@-dev,
+         libtracker-sparql-@APIVER@-dev,
          libglib2.0-dev
 Description: tracker extractor library - development files
  This package contains the static libraries and header files needed to link
@@ -179,8 +205,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          tracker (= ${binary:Version})
-Recommends: unzip,
-            odt2txt
+Recommends: gzip
 Description: metadata database, indexer and search tool - metadata extractors
  This package contains the metadata extractors.
  .
 
=== modified file 'debian/copyright'
--- debian/copyright	2010-05-20 18:43:29 +0000
+++ debian/copyright	2010-10-21 20:41:35 +0000
@@ -10,10 +10,11 @@
     Philip Van Hoof <[e-mail]>
     Jürg Billeter <[e-mail]>
     Mikael Ottela <[e-mail]>
+    Aleksander Morgado <[e-mail]>
 
 Copyright:
     Copyright (C) 2006, Jamie McCracken <[e-mail]>
-    Copyright (C) 2008, Nokia <[e-mail]>
+    Copyright (C) 2008-2010 Nokia <[e-mail]>
 
 License:
     All files if not specified otherwise are licensed under the GPL v2 or later.
@@ -57,6 +58,24 @@
 License: LGPL v2.1 or later
 
 ===============================================================================
+src/libtracker-bus/*
+
+Copyright (C) 2010, Nokia <[e-mail]>
+License: LGPL v2.1 or later
+
+===============================================================================
+src/libtracker-direct/*
+
+Copyright (C) 2010, Nokia <[e-mail]>
+License: LGPL v2.1 or later
+
+===============================================================================
+src/libtracker-sparql/*
+
+Copyright (C) 2010, Nokia <[e-mail]>
+License: LGPL v2.1 or later
+
+===============================================================================
 src/libtracker-extract/*
 
 Copyright (C) 2006, Jamie McCracken <[e-mail]>
@@ -89,10 +108,10 @@
   * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
   * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation 
+    this list of conditions and the following disclaimer in the documentation
     and/or other materials provided with the distribution.
   * Neither the name of the <ORGANIZATION> nor the names of its contributors
-    may be used to endorse or promote products derived from this software 
+    may be used to endorse or promote products derived from this software
     without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
=== modified file 'debian/libtracker-client.install.in'
--- debian/libtracker-client.install.in	2010-04-05 23:43:38 +0000
+++ debian/libtracker-client.install.in	2010-10-21 20:41:35 +0000
@@ -1,2 +1,1 @@
 usr/lib/libtracker-client-@APIVER@.so.*
-usr/lib/tracker-@APIVER@/libtracker-common.so.*
 
=== added file 'debian/libtracker-sparql-dev.install.in'
--- debian/libtracker-sparql-dev.install.in	1970-01-01 00:00:00 +0000
+++ debian/libtracker-sparql-dev.install.in	2010-10-21 20:41:35 +0000
@@ -0,0 +1,5 @@
+usr/lib/libtracker-sparql-@APIVER@.so
+usr/lib/pkgconfig/tracker-sparql-@APIVER@.pc
+usr/include/tracker-@APIVER@/libtracker-sparql/*.h
+usr/share/vala/vapi/tracker-sparql-@APIVER@.vapi
+usr/share/gtk-doc/html/libtracker-sparql/
 
=== added file 'debian/libtracker-sparql.install.in'
--- debian/libtracker-sparql.install.in	1970-01-01 00:00:00 +0000
+++ debian/libtracker-sparql.install.in	2010-10-21 20:41:35 +0000
@@ -0,0 +1,3 @@
+usr/lib/libtracker-sparql-@APIVER@.so.*
+usr/lib/tracker-@APIVER@/sparql-modules/*.so
+usr/lib/tracker-@APIVER@/libtracker-common.so.*
 
=== modified file 'debian/rules'
--- debian/rules	2010-08-06 01:07:06 +0000
+++ debian/rules	2010-10-21 20:41:35 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-  
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -24,11 +24,14 @@
 LDFLAGS += -Wl,--as-needed -Wl,-Bsymbolic
 
 tracker_libs = \
+	libtracker-sparql \
 	libtracker-client \
 	libtracker-extract \
 	libtracker-miner
 
 subst_files = \
+	debian/libtracker-sparql.install \
+	debian/libtracker-sparql-dev.install \
 	debian/libtracker-client.install \
 	debian/libtracker-client-dev.install \
 	debian/libtracker-extract.install \
@@ -46,13 +49,13 @@
 	debian/tracker-miner-fs.lintian-overrides \
 	debian/tracker-utils.lintian-overrides \
 	debian/tracker-miner-flickr.lintian-overrides
-	
+
 # Enforce tight shlibs dependencies
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V -X/usr/lib/tracker-$(APIVER)/writeback-modules/ \
                                  -X/usr/lib/tracker-$(APIVER)/extract-modules/ \
-                                 -X/usr/lib/tracker-$(APIVER)/push-modules/ \
+                                 -X/usr/lib/tracker-$(APIVER)/sparql-modules/ \
                                  -X$(EVOPLUGDIR) \
-                                 -X$(NAUTILUSEXTDIR)                                 
+                                 -X$(NAUTILUSEXTDIR)
 
 % : %.in
 	sed -e 's,@APIVER@,$(APIVER),g' \
 
=== modified file 'debian/tracker.install.in'
--- debian/tracker.install.in	2010-05-20 18:43:29 +0000
+++ debian/tracker.install.in	2010-10-21 20:41:35 +0000
@@ -6,12 +6,9 @@
 usr/share/tracker/tracker-miner-web.xml
 usr/share/tracker/tracker-statistics.xml
 usr/share/tracker/tracker-backup.xml
-usr/share/tracker/tracker-resources-class.xml
 usr/share/tracker/tracker-resources.xml
 usr/share/tracker/tracker-status.xml
 
-usr/share/tracker/*.sql
-
 usr/lib/tracker/tracker-store
 
 usr/share/man/man1/tracker-store.1
@@ -25,4 +22,3 @@
 etc/xdg/autostart/tracker-store.desktop
 
 usr/lib/tracker-@APIVER@/libtracker-data.so.*
-usr/lib/tracker-@APIVER@/push-modules/daemon/*.so