diff -urN debian/changelog debian/changelog
--- debian/changelog	2006-05-15 19:30:42.000000000 +0200
+++ debian/changelog	2006-08-11 02:43:08.000000000 +0200
@@ -1,3 +1,9 @@
+tracker (0.0.5) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jamie McCracken <jamiemcc gnome org>  Wed,  9 Aug 2006 04:12:37 +0100
+
 tracker (0.0.4) unstable; urgency=low
 
   * Initial Release.
diff -urN debian/compat debian/compat
--- debian/compat	2006-05-15 19:30:42.000000000 +0200
+++ debian/compat	2006-08-10 01:00:58.000000000 +0200
@@ -1 +1 @@
-4
+5
diff -urN debian/control debian/control
--- debian/control	2006-05-15 19:30:42.000000000 +0200
+++ debian/control	2006-08-11 02:42:51.000000000 +0200
@@ -2,14 +2,61 @@
 Section: utils
 Priority: optional
 Maintainer: Jamie McCracken <jamiemcc gnome org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libmysqlclient15-dev (>= 5.0.19), libextractor-dev (>= 0.5.0), libdbus-glib-1-dev
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libextractor-dev (>= 0.5.0), libdbus-glib-1-dev
+Standards-Version: 3.7.2
 
-Package: tracker
+Package: meta-tracker
 Architecture: any
-Depends: libc6 (>= 2.3.4-1), libglib2.0-0 (>= 2.10.0), libdbus-1-2 (>= 0.60), libdbus-glib-1-2 (>= 0.60), shared-mime-info, libextractor1c2a (>= 0.5.0)
-Description: Metadata database and indexing search tool.
- 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.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: meta-tracker-utils
+Description: Metadata database and indexing search tool
+ 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: libmetatracker0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}, meta-tracker (= ${Source-Version})
+Description: Library for accessing Tracker
+ This library allow programmers accessing Tracker daemon and performing
+ searches.
+ .
+ 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: libmetatracker0-dev
+Architecture: any
+Section: devel
+Depends: libmetatracker0 (= ${Source-Version})
+Description: Development files for Tracker
+ This package contains the headers and other development files not included in
+ the libmetatracker0 package for developing with it.
+ .
+ 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: meta-tracker-utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Utilities for Tracker
+ Included utilities for Tracker:
+  * tracker-files: get files based on a ServiceType (Documents, Music, Images,
+    Videos, Text, Development, Other), or on specified mime types.
+  * tracker-meta-folder: get metadata for files in a folder.
+  * tracker-query: this reads from STDIN an RDF Query that specifies the search
+    criteria for various fields. It prints to STDOUT all matching files. Some
+    examples are included in this package.
+  * tracker-search: this perfoms a google like search using SEARCHTERM to
+    retrieve all matching files where SEARCHTERM appears in any searchable
+    metadata.
+  * tracker-stats: retreive some statistics.
+  * tracker-tag: tool to manage tags on files.
+  * tracker-extract: this extracts embedded metadata from FILE and prints to
+    stdout.
+ .
+ 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.
diff -urN debian/dirs debian/dirs
--- debian/dirs	2006-05-15 19:30:42.000000000 +0200
+++ debian/dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff -urN debian/docs debian/docs
--- debian/docs	2006-05-15 19:30:42.000000000 +0200
+++ debian/docs	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-NEWS
-README
diff -urN debian/files debian/files
--- debian/files	2006-05-15 19:30:42.000000000 +0200
+++ debian/files	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-tracker-0.0.4-1-i386_0.0.4_i386.deb devel extra
-tracker_0.0.4_i386.deb utils optional
diff -urN debian/libmetatracker0-dev.docs debian/libmetatracker0-dev.docs
--- debian/libmetatracker0-dev.docs	1970-01-01 01:00:00.000000000 +0100
+++ debian/libmetatracker0-dev.docs	2006-08-11 00:56:12.000000000 +0200
@@ -0,0 +1,2 @@
+NEWS
+README
diff -urN debian/libmetatracker0-dev.install debian/libmetatracker0-dev.install
--- debian/libmetatracker0-dev.install	1970-01-01 01:00:00.000000000 +0100
+++ debian/libmetatracker0-dev.install	2006-08-10 01:00:39.000000000 +0200
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/
+debian/tmp/usr/lib/libmetatracker.{so,a,la}
+debian/tmp/usr/lib/libtracker.so
+debian/tmp/usr/lib/pkgconfig/
diff -urN debian/libmetatracker0-dev.links debian/libmetatracker0-dev.links
--- debian/libmetatracker0-dev.links	1970-01-01 01:00:00.000000000 +0100
+++ debian/libmetatracker0-dev.links	2006-08-10 01:00:39.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/libmetatracker.so  usr/lib/libtracker.so
diff -urN debian/libmetatracker0.docs debian/libmetatracker0.docs
--- debian/libmetatracker0.docs	1970-01-01 01:00:00.000000000 +0100
+++ debian/libmetatracker0.docs	2006-08-11 00:56:09.000000000 +0200
@@ -0,0 +1,2 @@
+NEWS
+README
diff -urN debian/libmetatracker0.install debian/libmetatracker0.install
--- debian/libmetatracker0.install	1970-01-01 01:00:00.000000000 +0100
+++ debian/libmetatracker0.install	2006-08-10 01:00:02.000000000 +0200
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libmetatracker.so.*
+debian/tmp/usr/lib/libtracker.so.*
diff -urN debian/libmetatracker0.links debian/libmetatracker0.links
--- debian/libmetatracker0.links	1970-01-01 01:00:00.000000000 +0100
+++ debian/libmetatracker0.links	2006-08-10 01:00:13.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/libmetatracker.so.0  usr/lib/libtracker.so.0
diff -urN debian/manpage.sgml.ex debian/manpage.sgml.ex
--- debian/manpage.sgml.ex	2006-05-15 19:30:42.000000000 +0200
+++ debian/manpage.sgml.ex	1970-01-01 01:00:00.000000000 +0100
@@ -1,156 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
-  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>May 15, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>jamiemcc gnome org</email>">
-  <!ENTITY dhusername  "jamie">
-  <!ENTITY dhucpackage "<refentrytitle>TRACKER</refentrytitle>">
-  <!ENTITY dhpackage   "tracker">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>program to do something</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>-e <replaceable>this</replaceable></option></arg>
-
-      <arg><option>--example <replaceable>that</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> and <command>bar</command>
-      commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-
-    <para><command>&dhpackage;</command> is a program that...</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h</option>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version of program.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>bar (1), baz (1).</para>
-
-    <para>The programs are documented fully by <citetitle>The Rise and
-      Fall of a Fooish Bar</citetitle> available via the
-      <application>Info</application> system.</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff -urN debian/meta-tracker-dev.docs debian/meta-tracker-dev.docs
--- debian/meta-tracker-dev.docs	1970-01-01 01:00:00.000000000 +0100
+++ debian/meta-tracker-dev.docs	2006-08-09 04:03:12.000000000 +0200
@@ -0,0 +1 @@
+NEWS
diff -urN debian/meta-tracker-dev.install debian/meta-tracker-dev.install
--- debian/meta-tracker-dev.install	1970-01-01 01:00:00.000000000 +0100
+++ debian/meta-tracker-dev.install	2006-08-10 01:06:12.000000000 +0200
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/
+debian/tmp/usr/lib/libmetatracker.{a,la}
+debian/tmp/usr/lib/pkgconfig/
diff -urN debian/meta-tracker.docs debian/meta-tracker.docs
--- debian/meta-tracker.docs	1970-01-01 01:00:00.000000000 +0100
+++ debian/meta-tracker.docs	2006-08-10 00:58:49.000000000 +0200
@@ -0,0 +1,2 @@
+NEWS
+README
diff -urN debian/meta-tracker.install debian/meta-tracker.install
--- debian/meta-tracker.install	1970-01-01 01:00:00.000000000 +0100
+++ debian/meta-tracker.install	2006-08-10 20:19:29.000000000 +0200
@@ -0,0 +1,5 @@
+debian/tmp/usr/bin/htmless
+debian/tmp/usr/bin/o3totxt
+debian/tmp/usr/bin/trackerd
+debian/tmp/usr/share/
+debian/tmp/usr/share/dbus-1/services/
diff -urN debian/meta-tracker-utils.docs debian/meta-tracker-utils.docs
--- debian/meta-tracker-utils.docs	1970-01-01 01:00:00.000000000 +0100
+++ debian/meta-tracker-utils.docs	2006-08-10 00:59:36.000000000 +0200
@@ -0,0 +1,2 @@
+NEWS
+README
diff -urN debian/meta-tracker-utils.examples debian/meta-tracker-utils.examples
--- debian/meta-tracker-utils.examples	1970-01-01 01:00:00.000000000 +0100
+++ debian/meta-tracker-utils.examples	2006-08-10 21:11:04.000000000 +0200
@@ -0,0 +1 @@
+rdf-query-examples/*.rdf
diff -urN debian/meta-tracker-utils.install debian/meta-tracker-utils.install
--- debian/meta-tracker-utils.install	1970-01-01 01:00:00.000000000 +0100
+++ debian/meta-tracker-utils.install	2006-08-10 00:59:36.000000000 +0200
@@ -0,0 +1,7 @@
+debian/tmp/usr/bin/tracker-files
+debian/tmp/usr/bin/tracker-meta-folder
+debian/tmp/usr/bin/tracker-query
+debian/tmp/usr/bin/tracker-search
+debian/tmp/usr/bin/tracker-stats
+debian/tmp/usr/bin/tracker-tag
+debian/tmp/usr/bin/tracker-extract
diff -urN debian/postinst debian/postinst
--- debian/postinst	2006-05-15 19:30:42.000000000 +0200
+++ debian/postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-# End automatically added section
diff -urN debian/postrm debian/postrm
--- debian/postrm	2006-05-15 19:30:42.000000000 +0200
+++ debian/postrm	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-# End automatically added section
diff -urN debian/rules debian/rules
--- debian/rules	2006-05-15 19:30:42.000000000 +0200
+++ debian/rules	2006-08-11 03:54:05.000000000 +0200
@@ -24,15 +24,20 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+# Ensure the build aborts when there are still references to undefined
+# symbols.
+LDFLAGS += -Wl,-z,defs
+
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-	#CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr 
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
+	touch configure-stamp
 
 build: build-stamp
 
-build-stamp:  config.status
+build-stamp:  configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -44,7 +49,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
@@ -64,9 +69,10 @@
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tracker.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tracker
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
+	dh_install
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -104,4 +110,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install
diff -urN debian/tracker.postinst.debhelper debian/tracker.postinst.debhelper
--- debian/tracker.postinst.debhelper	2006-05-15 19:30:42.000000000 +0200
+++ debian/tracker.postinst.debhelper	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-# End automatically added section
diff -urN debian/tracker.postrm.debhelper debian/tracker.postrm.debhelper
--- debian/tracker.postrm.debhelper	2006-05-15 19:30:42.000000000 +0200
+++ debian/tracker.postrm.debhelper	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-# End automatically added section
diff -urN debian/tracker.substvars debian/tracker.substvars
--- debian/tracker.substvars	2006-05-15 19:30:42.000000000 +0200
+++ debian/tracker.substvars	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.4-1), libdbus-1-2 (>= 0.60), libdbus-glib-1-2 (>= 0.60), libextractor1c2a (>= 0.5.7-1), libglib2.0-0 (>= 2.9.3), libstdc++6 (>= 4.0.2-4), libwrap0, zlib1g (>= 1:1.2.1)
diff -urN Makefile.am Makefile.am
--- Makefile.am	2006-08-09 04:20:36.000000000 +0200
+++ Makefile.am	2006-08-11 01:13:01.000000000 +0200
@@ -3,9 +3,30 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = tracker.pc
 
+debian_files = \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/libmetatracker0-dev.docs \
+	debian/libmetatracker0-dev.install \
+	debian/libmetatracker0-dev.links \
+	debian/libmetatracker0.docs \
+	debian/libmetatracker0.install \
+	debian/libmetatracker0.links \
+	debian/meta-tracker-dev.docs \
+	debian/meta-tracker-dev.install \
+	debian/meta-tracker.docs \
+	debian/meta-tracker.install \
+	debian/meta-tracker-utils.docs \
+	debian/meta-tracker-utils.examples \
+	debian/meta-tracker-utils.install \
+	debian/rules
+
 EXTRA_DIST = \
 	$(pkgconfig_DATA) \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	configure.in \
-	rdf-query-examples/*.rdf
+	rdf-query-examples/*.rdf \
+	$(debian_files)