tracker r2098 - branches/indexer-split

From: mr svn gnome org
To: svn-commits-list gnome org
Subject: tracker r2098 - branches/indexer-split
Date: Tue, 19 Aug 2008 09:27:16 +0000 (UTC)
Author: mr
Date: Tue Aug 19 09:27:16 2008
New Revision: 2098
URL: http://svn.gnome.org/viewvc/tracker?rev=2098&view=rev

Log:
	* Makefile.decl:
	* tracker.spec:
	* README:
	* configure.ac:
	* acinclude.m4:
	* libtracker-gtk.pc.in: Fixed some trailing whitespace issues.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/Makefile.decl
   branches/indexer-split/README
   branches/indexer-split/acinclude.m4
   branches/indexer-split/configure.ac
   branches/indexer-split/libtracker-gtk.pc.in
   branches/indexer-split/tracker.spec

Modified: branches/indexer-split/Makefile.decl
==============================================================================
--- branches/indexer-split/Makefile.decl	(original)
+++ branches/indexer-split/Makefile.decl	Tue Aug 19 09:27:16 2008
@@ -1,6 +1,6 @@
 #
 # Testing rules for make
-# Original file: http://svn.gnome.org/svn/glib/trunk/Makefile.decl 
+# Original file: http://svn.gnome.org/svn/glib/trunk/Makefile.decl
 #
 # test: run all tests in cwd and subdirs
 # test-report: run tests in subdirs and generate report
@@ -9,7 +9,7 @@
 #
 
 GTESTER = gtester 			# for non-GLIB packages
-GTESTER_REPORT = gtester-report	
+GTESTER_REPORT = gtester-report
 
 # initialize variables for unconditional += appending
 TEST_PROGS =

Modified: branches/indexer-split/README
==============================================================================
--- branches/indexer-split/README	(original)
+++ branches/indexer-split/README	Tue Aug 19 09:27:16 2008
@@ -21,71 +21,71 @@
 
 1 Introduction
 
-  Tracker is a powerful desktop-neutral first class object 
-  database, tag/metadata database, search tool and indexer. 
+  Tracker is a powerful desktop-neutral first class object
+  database, tag/metadata database, search tool and indexer.
 
-  Tracker is also extremely fast and very memory-efficient 
+  Tracker is also extremely fast and very memory-efficient
   when compared with some other competing frameworks and has by
   far the fastest and most memory-efficient Nautilus search and
   Deskbar backends currently available.
 
-  It consists of a common object database that allows entities to 
-  have an almost infinte number of properties, metadata (both 
-  embedded/harvested as well as user definable), a comprehensive 
+  It consists of a common object database that allows entities to
+  have an almost infinte number of properties, metadata (both
+  embedded/harvested as well as user definable), a comprehensive
   database of keywords/tags and links to other entities.
 
-  It provides additional features for file-based objects 
+  It provides additional features for file-based objects
   including context linking and audit trails for a file object.
 
-  It has the ability to index, store, harvest metadata, retrieve 
+  It has the ability to index, store, harvest metadata, retrieve
   and search all types of files and other first class objects.
 
   Supported first class objects include:
 
-  * Files, Documents, Music, Images, Videos, Applications, Emails, 
+  * Files, Documents, Music, Images, Videos, Applications, Emails,
     Conversations, History
 
   Planned support:
 
-  * Appointments, Contacts, Projects, Tasks, Bookmarks, Playlists, 
+  * Appointments, Contacts, Projects, Tasks, Bookmarks, Playlists,
     Notes
 
-  All discussion related to tracker happens on the Tracker 
-  mailing list 
-  (http://mail.gnome.org/mailman/listinfo/tracker-list) and/or 
+  All discussion related to tracker happens on the Tracker
+  mailing list
+  (http://mail.gnome.org/mailman/listinfo/tracker-list) and/or
   IRC channel #tracker on irc.gimp.net
 
   Bugs should be filed at http://bugzilla.gnome.org.
 
-  More infomation on Tracker can be found at 
+  More infomation on Tracker can be found at
   http://tracker-project.org.
 
 
 
 2 Use Cases
 
-  Tracker is the most powerful open source metadata database and 
-  indexer framework currently available and because it is built 
-  around a combination indexer and sql database and not a 
+  Tracker is the most powerful open source metadata database and
+  indexer framework currently available and because it is built
+  around a combination indexer and sql database and not a
   dedicated indexer, it has much more powerful use cases:
 
-  * Provide search and indexing facilities similiar to those on 
+  * Provide search and indexing facilities similiar to those on
   other systems (Windows Vista and Mac OS X).
 
-  * Common database storage for all first class objects (EG a 
-  common music/photo/contacts/email/bookmarks/history database) 
+  * Common database storage for all first class objects (EG a
+  common music/photo/contacts/email/bookmarks/history database)
   complete with additional metadata and tags/keywords.
 
-  * Comprehensive one stop solution for all applications needing 
-  an object database, powerful search (via RDF Query), first class 
+  * Comprehensive one stop solution for all applications needing
+  an object database, powerful search (via RDF Query), first class
   methods, related metadata and user-definable metadata/tags.
 
   * Can provide a full semantic desktop with metadata everywhere.
 
-  * Can provide powerful criteria-based searching suitable for 
+  * Can provide powerful criteria-based searching suitable for
   creating smart file dialogs and vfolder systems.
 
-  * Can provide a more intelligent desktop using statistical 
+  * Can provide a more intelligent desktop using statistical
   metadata.
 
 
@@ -96,28 +96,28 @@
   around other freedesktop technologies like D-Bus and XDGMime
   but contains no GNOME-specific dependencies besides GLib).
 
-  * Very memory efficient and non-leaking (typical RAM usage 4 - 30 
-  MB). Unlike some other indexers, Tracker is designed and built 
-  to run well on systems with lower memory (256MB or less). It 
+  * Very memory efficient and non-leaking (typical RAM usage 4 - 30
+  MB). Unlike some other indexers, Tracker is designed and built
+  to run well on systems with lower memory (256MB or less). It
   should even be efficient enough to use on some mobile devices.
 
   * Non-bloated and written in C for maximum efficiency.
 
-  * Small size and minimal dependencies makes it easy to bundle 
+  * Small size and minimal dependencies makes it easy to bundle
   into various distros, including live cds.
 
-  * Fast indexing and unobtrusive - no need to index stuff 
-  overnight. Tracker runs at nice+10 so it should have a minimal 
-  impact on your system. With the addition of detection of mouse 
-  and keyboard events via tracker-applet (described below), there 
-  is an option to auto-pause indexing in order to improve 
-  responsiveness. This is in addition to Tracker's built-in check 
-  if there's heavy disk I/O in order to auto-pause, so not to 
+  * Fast indexing and unobtrusive - no need to index stuff
+  overnight. Tracker runs at nice+10 so it should have a minimal
+  impact on your system. With the addition of detection of mouse
+  and keyboard events via tracker-applet (described below), there
+  is an option to auto-pause indexing in order to improve
+  responsiveness. This is in addition to Tracker's built-in check
+  if there's heavy disk I/O in order to auto-pause, so not to
   slow other processes.
 
   * Provides option to disable indexing when running on battery.
 
-  * Implements the freedesktop specification for metadata 
+  * Implements the freedesktop specification for metadata
   (http://freedesktop.org/wiki/Standards/shared-filemetadata-spec).
 
   * Extracts embedded File, Image, Document and Audio type
@@ -125,19 +125,19 @@
 
   * Supports the WC3's RDF Query syntax for querying metadata
 
-  * Provides support for both free text search (like Beagle/Google) 
+  * Provides support for both free text search (like Beagle/Google)
   as well as structured searches using RDF Query.
 
-  * Responds in real time to file system changes to keep its 
+  * Responds in real time to file system changes to keep its
   metadata database up to date and in sync.
 
-  * Fully extensible with custom metadata - you can store, 
-  retrieve, register and search via RDF Query all your own custom 
+  * Fully extensible with custom metadata - you can store,
+  retrieve, register and search via RDF Query all your own custom
   metadata.
 
   * Can extract a file's contents as plain text and index them.
 
-  * Provides text filters for PDF, MS Office, OpenOffice (all 
+  * Provides text filters for PDF, MS Office, OpenOffice (all
   versions), HTML and PS files.
 
   * Can provide thumbnailing on the fly.
@@ -188,7 +188,7 @@
 
 4.4 Optional run-time dependency
 
-  * xdg-utils (provides some functionality needed by 
+  * xdg-utils (provides some functionality needed by
   tracker-search-tool when in a non-GNOME environment)
 
 
@@ -201,28 +201,28 @@
         make
         sudo make install
 
-  If you install using any other prefix, you might have problems 
-  with files not being installed correctly. (You may need to copy 
-  and amend the dbus service file to the correct directory and/or 
-  might need to update ld_conf if you install into non-standard 
+  If you install using any other prefix, you might have problems
+  with files not being installed correctly. (You may need to copy
+  and amend the dbus service file to the correct directory and/or
+  might need to update ld_conf if you install into non-standard
   directories.)
 
 
 5.1 Notes on Solaris
 
-  To compile Tracker with GCC on Solaris uses the following 
+  To compile Tracker with GCC on Solaris uses the following
   commands :
 
-        ./configure --prefix=/usr --sysconfdir=/etc --with-pic \ 
+        ./configure --prefix=/usr --sysconfdir=/etc --with-pic \
         CFLAGS=-D_POSIX_PTHREAD_SEMANTICS
         make
         sudo make install
 
-  To compile Tracker with SUN Studio on Solaris uses the 
-  following commands, because there are some problems to compile 
+  To compile Tracker with SUN Studio on Solaris uses the
+  following commands, because there are some problems to compile
   exiv2 using SUN C++ compiler :
 
-        ./configure --prefix=/usr --sysconfdir=/etc --with-pic \ 
+        ./configure --prefix=/usr --sysconfdir=/etc --with-pic \
         --disable-warnings \
         --disable-exiv2 CFLAGS=-D_POSIX_PTHREAD_SEMANTICS
         make
@@ -231,8 +231,8 @@
 
 5.2 Compile Options
 
-  Tracker has several compiler options to enable/disable certain 
-  features. The following is a (hopefully complete) listing of 
+  Tracker has several compiler options to enable/disable certain
+  features. The following is a (hopefully complete) listing of
   what's available:
 
   --enable-debug-code : build with debug symbols
@@ -243,14 +243,14 @@
 
   --disable-preferences : disables tracker-preferences capplet
 
-  --enable-deskbar-applet=(auto, handler, module) : enables 
-  Deskbar-applet support; 'auto' should do since it automatically 
-  chooses whether to install the 'handler' (for Deskbar-applet 
+  --enable-deskbar-applet=(auto, handler, module) : enables
+  Deskbar-applet support; 'auto' should do since it automatically
+  chooses whether to install the 'handler' (for Deskbar-applet
   >=2.16) or the 'module' (for Deskbar-applet >=2.19)
 
   --with-deskbar-applet-dir=(directory where Deskbar-applet
   should find tracker-handler; this should be automatically
-  detected, perhaps in 
+  detected, perhaps in
   /usr/lib/deskbar-applet/{handlers,modules-2.20-compatible})
 
   --disable-gui : disables tracker-search-tool build
@@ -272,10 +272,10 @@
 
   --disable-xmp : disables XMP extraction
 
-  --with-session-bus-services-dir=(path to D-Bus services 
-  directory): this should be automatically detected 
+  --with-session-bus-services-dir=(path to D-Bus services
+  directory): this should be automatically detected
 
-  --enable-external-qdbm : use system qdbm instead of one included 
+  --enable-external-qdbm : use system qdbm instead of one included
   in Tracker
 
   --disable-hal : disables HAL support for ac-power detection
@@ -286,54 +286,54 @@
 
 6 Running Tracker
 
-  To run Tracker, you need to manually start the Tracker daemon, 
-  trackerd. By default trackerd will index your entire home 
+  To run Tracker, you need to manually start the Tracker daemon,
+  trackerd. By default trackerd will index your entire home
   directory.
 
-  You can also pass a directory root to be indexed as a command 
-  line parameter if you dont want your entire home directory 
-  indexed. EG "trackerd -i /home/jamie/Documents" (if you want 
-  your home directory indexed when explicily specifying index 
-  directory roots then you must add your home directory to the 
+  You can also pass a directory root to be indexed as a command
+  line parameter if you dont want your entire home directory
+  indexed. EG "trackerd -i /home/jamie/Documents" (if you want
+  your home directory indexed when explicily specifying index
+  directory roots then you must add your home directory to the
   arguments: EG trackerd -i /home/jamie -i /mnt/share)
 
   You can disable indexing by passing "--no-indexing"
 
-  You can enable a low memory usage mode (recommended for 
-  machines with less than 256MB of RAM) by passing 
+  You can enable a low memory usage mode (recommended for
+  machines with less than 256MB of RAM) by passing
   "--enable-low-memory"
 
-  You can artificially throttle indexing by passing 
+  You can artificially throttle indexing by passing
   "--throttle=VALUE" where VALUE is in the range 0-20 (with 0,
   the default, being fastest and 20 being slowest). Default is
   0. You should only change this value if you want to prevent
   noisy fans or hot laptops arising from cpu intensive indexing.
   Tracker should have a negligible impact on the system (as it
-  is scheduled) so you can safely work with it on full throttle 
+  is scheduled) so you can safely work with it on full throttle
   without experiencing slow downs.
 
-  You can specify directory roots to be excluded from being 
+  You can specify directory roots to be excluded from being
   watched or indexed by passing "--exclude=DIRECTORY" for each
   directory root.
 
-  You can specify logging verbosity by passing "--verbosity". Valid 
-  values are from 0 to 3, ranging from least to most verbose 
+  You can specify logging verbosity by passing "--verbosity". Valid
+  values are from 0 to 3, ranging from least to most verbose
   respectively.
 
-  Yet another option is "--language" which allows for specifying 
+  Yet another option is "--language" which allows for specifying
   the language to use for stemmer and stop-words list.
 
-  All the above options (and more) can be set by editing Tracker 
-  config file "~/.config/tracker/tracker.cfg" which is created 
-  with specific defaults when non-existent (EG when trackerd is 
-  ran for the first time). Ensure that you restart trackerd for 
-  the changes to take effect. "tracker.cfg" also provides options 
-  that allows Tracker to only index a subset of your home 
-  directory as well as other folders not in your home directory 
-  by setting WatchDirectoryRoots to a semicolon-delimited list of 
-  directories (full path required!) 
+  All the above options (and more) can be set by editing Tracker
+  config file "~/.config/tracker/tracker.cfg" which is created
+  with specific defaults when non-existent (EG when trackerd is
+  ran for the first time). Ensure that you restart trackerd for
+  the changes to take effect. "tracker.cfg" also provides options
+  that allows Tracker to only index a subset of your home
+  directory as well as other folders not in your home directory
+  by setting WatchDirectoryRoots to a semicolon-delimited list of
+  directories (full path required!)
 
-  EG: 
+  EG:
 
   "WatchDirectoryRoots=directory1;directory2;directory3""
 
@@ -341,25 +341,25 @@
   user data from scratch, removing the need to remove Tracker
   database manually.
 
-  On the first run, Tracker will automatically create a new 
-  database and start populating it with metadata by browsing 
-  through the user's home directory and/or the root folder(s) 
+  On the first run, Tracker will automatically create a new
+  database and start populating it with metadata by browsing
+  through the user's home directory and/or the root folder(s)
   specified.
 
-  On subsequent runs, Tracker will start up much much faster and 
-  will only ever incrementally index files (IE files that have 
+  On subsequent runs, Tracker will start up much much faster and
+  will only ever incrementally index files (IE files that have
   changed since last index).
 
-  If installed correctly, the Tracker daemon (trackerd) can also 
-  be started automatically via Dbus activation (EG by running 
+  If installed correctly, the Tracker daemon (trackerd) can also
+  be started automatically via Dbus activation (EG by running
   tracker-search SEARCHTERM)
-  
+
 
 6.1 Setting Inotify Watch Limit
 
   When watching large numbers of folders, its ppossible to exceed
-  the default number of inotify watches. In order to get real time 
-  updates when this value is exceeded it is necessary to increase 
+  the default number of inotify watches. In order to get real time
+  updates when this value is exceeded it is necessary to increase
   the number of allowed watches. This can be done as follows:
 
   1. Add this line to /etc/sysctl.conf:
@@ -373,24 +373,24 @@
 
 7 Tracker & Nautilus Search
 
-  Once you have installed Tracker and have some indexed contents, 
-  you should now compile Nautilus (ver 2.13.4 or higher) which 
-  should auto-detect that Tracker is installed and automatically 
-  compile in Tracker support. You are now ready to appreciate a 
-  powerful and super efficient C-based indexer in all its 
+  Once you have installed Tracker and have some indexed contents,
+  you should now compile Nautilus (ver 2.13.4 or higher) which
+  should auto-detect that Tracker is installed and automatically
+  compile in Tracker support. You are now ready to appreciate a
+  powerful and super efficient C-based indexer in all its
   glory... happy hunting!
 
-  To make sure trackerd always starts when you login to GNOME, 
-  you will need to add it to gnome-session (select sessions from 
-  preferences menu, select startup program tab and then add 
-  /usr/bin/trackerd). For non-GNOME installations, see the 
+  To make sure trackerd always starts when you login to GNOME,
+  you will need to add it to gnome-session (select sessions from
+  preferences menu, select startup program tab and then add
+  /usr/bin/trackerd). For non-GNOME installations, see the
   desktop docs for how to achieve similar.
 
 
 
 8 Tracker & Deskbar applet
 
-  Tracker is also integrated in GNOME's deskbar applet. See 
+  Tracker is also integrated in GNOME's deskbar applet. See
   Compile Options above on how to get it built.
 
 
@@ -399,35 +399,35 @@
 
   Tracker comes with a number of utilities that you can use:
 
-  * "tracker-applet" - notification applet which has various 
-  utilities like displaying Tracker status, indexing progress, 
-  and live statistics, pausing indexing, and launching both 
+  * "tracker-applet" - notification applet which has various
+  utilities like displaying Tracker status, indexing progress,
+  and live statistics, pausing indexing, and launching both
   tracker-search-tool and tracker-preferences
 
-  * "tracker-extract FILE" - this extracts embedded metadata from 
+  * "tracker-extract FILE" - this extracts embedded metadata from
   FILE and prints to stdout
 
-  * "tracker-files" - returns files filtered by the mime type or 
+  * "tracker-files" - returns files filtered by the mime type or
   their category (see the manpage)
 
-  * "tracker-meta-folder" - return list of files indexed by Tracker 
+  * "tracker-meta-folder" - return list of files indexed by Tracker
   for a folder
 
   * "tracker-preferences" - GUI tool to set Tracker preferences
 
-  * "tracker-query" - this reads an RDF Query that specifies the 
-  search criteria for various fields. It prints to STDOUT all 
-  matching files. You can see some example queries in the 
-  RDF-Query-examples folder. You can run the examples as 
+  * "tracker-query" - this reads an RDF Query that specifies the
+  search criteria for various fields. It prints to STDOUT all
+  matching files. You can see some example queries in the
+  RDF-Query-examples folder. You can run the examples as
   "tracker-query < RDFFILE"
 
-  * "tracker-search SEARCHTERM" - this perfoms a google like search 
-  using SEARCHTERM to retrieve all matching files where 
+  * "tracker-search SEARCHTERM" - this perfoms a google like search
+  using SEARCHTERM to retrieve all matching files where
   SEARCHTERM appears in any searchable metadata
 
   * "tracker-search-tool SEARCHTERM" - GUI search utility
 
-  * "tracker-stats" - this displays the current number of indexed 
+  * "tracker-stats" - this displays the current number of indexed
   items by category
 
   * "tracker-status" - queries status of trackerd

Modified: branches/indexer-split/acinclude.m4
==============================================================================
--- branches/indexer-split/acinclude.m4	(original)
+++ branches/indexer-split/acinclude.m4	Tue Aug 19 09:27:16 2008
@@ -4,9 +4,9 @@
   ax_compare_version=false
 
   # Convert the two version strings to be compared into a format that
-  # allows a simple string comparison.  The end result is that a version 
-  # string of the form 1.12.5-r617 will be converted to the form 
-  # 0001001200050617.  In other words, each number is zero padded to four 
+  # allows a simple string comparison.  The end result is that a version
+  # string of the form 1.12.5-r617 will be converted to the form
+  # 0001001200050617.  In other words, each number is zero padded to four
   # digits, and non digits are removed.
   AS_VAR_PUSHDEF([A],[ax_compare_version_A])
   A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
@@ -22,8 +22,8 @@
                      -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
                      -e 's/[[^0-9]]//g'`
 
-  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary 
-  dnl # then the first line is used to determine if the condition is true. 
+  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
+  dnl # then the first line is used to determine if the condition is true.
   dnl # The sed right after the echo is to remove any indented white space.
   m4_case(m4_tolower($2),
   [lt],[
@@ -49,13 +49,13 @@
       # Determine the number of characters in A and B.
       ax_compare_version_len_A=`echo "$A" | awk '{print(length)}'`
       ax_compare_version_len_B=`echo "$B" | awk '{print(length)}'`
- 
+
       # Set A to no more than B's length and B to no more than A's length.
       A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
       B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
     ],
     [[0-9]+],[
-      # A count greater than zero means use only that many subversions 
+      # A count greater than zero means use only that many subversions
       A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
       B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
     ],

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Tue Aug 19 09:27:16 2008
@@ -206,7 +206,7 @@
 fi
 
 ####################################################################
-# gettext/intltool support 
+# gettext/intltool support
 ####################################################################
 
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
@@ -228,9 +228,9 @@
 
 have_xesam_glib=no
 
-AC_ARG_ENABLE(unit_tests, 
+AC_ARG_ENABLE(unit_tests,
 	AS_HELP_STRING([--enable-unit-tests=@<:@no/yes/auto@:>@],
-			[Enable unit tests (if available)]), , 
+			[Enable unit tests (if available)]), ,
 			[enable_unit_tests=auto])
 
 if test "x$enable_unit_tests" != "xno" ; then
@@ -245,7 +245,7 @@
           AC_MSG_ERROR([Could not find 'sqlite3'])
       fi
 
-      glib_pkgconfig=$glib_pkgconfig_tmp 
+      glib_pkgconfig=$glib_pkgconfig_tmp
       AC_PATH_PROG(GTESTER, [gtester], [no] )
       if test "x$GTESTER" = "xno" ; then
 	 AC_MSG_ERROR([*** Gtester is not in the path])
@@ -274,7 +274,7 @@
 
 QDBM_REQUIRED=1.8
 
-AC_ARG_ENABLE(external_qdbm, 
+AC_ARG_ENABLE(external_qdbm,
 	AS_HELP_STRING(
 		[--enable-external-qdbm],
 		[build using system's qdbm]),,
@@ -287,7 +287,7 @@
 	QDBM_CFLAGS="-I\$(top_srcdir)/src/qdbm"
 	QDBM_LIBS="\$(top_builddir)/src/qdbm/libqdbm-private.la"
 	AM_CONDITIONAL(USING_EXTERNAL_QDBM, false)
-fi		
+fi
 
 AC_SUBST(QDBM_CFLAGS)
 AC_SUBST(QDBM_LIBS)
@@ -297,7 +297,7 @@
 ##################################################################
 # Check for libxml2
 ##################################################################
-  
+
 LIBXML2_REQUIRED=0.6
 
 AC_ARG_ENABLE(libxml2, AS_HELP_STRING([--disable-libxml2],[Disable HTML/XML extractors (full-text will still be available)]),,[enable_libxml2=yes])
@@ -320,7 +320,7 @@
 ##################################################################
 # Check for HAL
 ##################################################################
-  
+
 AC_ARG_ENABLE(hal, AS_HELP_STRING([--disable-hal],[Disable HAL support for ac power detection]),,[enable_hal=yes])
 if test "x$enable_hal" = "xyes"; then
 	PKG_CHECK_MODULES(HAL, [hal >= 0.5 hal-storage], [have_hal=yes] , [have_hal=no])
@@ -347,13 +347,13 @@
 		[enables one of the (gstreamer, xine, external, auto) video extractor backends]),,
 	[enable_video_extractor=auto])
 
-PKG_CHECK_MODULES(GSTREAMER, 
+PKG_CHECK_MODULES(GSTREAMER,
 	[gstreamer-0.10 >= 0.10.0],
 	[have_libgstreamer=yes] , [have_libgstreamer=no])
 AC_SUBST(GSTREAMER_CFLAGS)
 AC_SUBST(GSTREAMER_LIBS)
 
-PKG_CHECK_MODULES(XINE, 
+PKG_CHECK_MODULES(XINE,
 	[libxine >= 1.0],
 	[have_libxine=yes] , [have_libxine=no])
 AC_SUBST(XINE_CFLAGS)
@@ -460,7 +460,7 @@
     	AC_SUBST([LIBTRACKERGTK_CFLAGS])
     	AC_SUBST([LIBTRACKERGTK_LIBS])
 
-	
+
 else
 	enable_libtrackergtk="no (disabled)"
 fi
@@ -490,7 +490,7 @@
     	AC_SUBST([TRACKERAPPLET_CFLAGS])
     	AC_SUBST([TRACKERAPPLET_LIBS])
 
-	
+
 else
 	enable_trackerapplet="no (disabled)"
 fi
@@ -509,7 +509,7 @@
 
     	AC_SUBST([UNAC_CFLAGS])
     	AC_SUBST([UNAC_LIBS])
-	
+
 else
 	enable_unac="no (disabled)"
 fi
@@ -538,7 +538,7 @@
 	        [have_gnome=yes] , [have_gnome=no])
 	#there is the slight possibility to have gnome-vfs and not libgnome for example
 	#so we should check and not overwrite have_gnome
-	if test "$have_gnome" = "yes"; then 
+	if test "$have_gnome" = "yes"; then
 		PKG_CHECK_MODULES(GNOMEVFS, [
         		gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED
 		        gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED],
@@ -562,7 +562,7 @@
 
 # do not build if libtracker-gtk is not being built
 if test "x$enable_libtrackergtk" != "xyes"; then
-	have_gnome="no (disabled as libtracker-gtk is not being built)"	
+	have_gnome="no (disabled as libtracker-gtk is not being built)"
 fi
 
 AM_CONDITIONAL(HAVE_GNOME, test "$have_gnome" = "yes")
@@ -588,13 +588,13 @@
    	AC_SUBST([GLIB2_CFLAGS])
    	AC_SUBST([GLIB2_LIBS])
 
-	if test "$enable_preferences" = "yes"; then 
+	if test "$enable_preferences" = "yes"; then
 		PKG_CHECK_MODULES(GTK2, [ gtk+-2.0 >= $PREFERENCES_GTK_REQUIRED ],[enable_preference=yes] , [enable_preference=no])
 		AC_SUBST([GTK2_CFLAGS])
    		AC_SUBST([GTK2_LIBS])
 	fi
 
-	if test "$enable_preferences" = "yes"; then 
+	if test "$enable_preferences" = "yes"; then
 
 	   	PKG_CHECK_MODULES(LIBGLADE, [ libglade-2.0 >= $PREFERENCES_GLADE_REQUIRED ], [enable_preferences=yes], [enable_preferences=no])
 		AC_SUBST([LIBGLADE_CFLAGS])
@@ -743,7 +743,7 @@
 AC_RUN_IFELSE([ AC_LANG_PROGRAM(
    [[
 #include <stdlib.h>
-#include <errno.h> 
+#include <errno.h>
 #include <sys/syscall.h>
 #include <unistd.h>
    ]],
@@ -848,7 +848,7 @@
 	src/tracker-indexer/Makefile
 	src/tracker-indexer/modules/Makefile
 	src/tracker-preferences/Makefile
-	src/tracker-preferences/tracker-preferences.desktop.in	
+	src/tracker-preferences/tracker-preferences.desktop.in
 	src/tracker-search-tool/Makefile
 	src/tracker-search-tool/tracker-search-tool.desktop.in
 	src/tracker-thumbnailer/Makefile

Modified: branches/indexer-split/libtracker-gtk.pc.in
==============================================================================
--- branches/indexer-split/libtracker-gtk.pc.in	(original)
+++ branches/indexer-split/libtracker-gtk.pc.in	Tue Aug 19 09:27:16 2008
@@ -9,4 +9,4 @@
 Requires.private: cairo
 Requires: tracker gtk+-2.0 glib-2.0
 Libs: -L${libdir} -ltracker-gtk
-Cflags: -I${includedir}/libtracker-gtk 
+Cflags: -I${includedir}/libtracker-gtk

Modified: branches/indexer-split/tracker.spec
==============================================================================
--- branches/indexer-split/tracker.spec	(original)
+++ branches/indexer-split/tracker.spec	Tue Aug 19 09:27:16 2008
@@ -20,7 +20,7 @@
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
-tag/metadata database, search tool and indexer. 
+tag/metadata database, search tool and indexer.
 
 It consists of a common object database that allows entities to have an
 almost infinte number of properties, metadata (both embedded/harvested as
@@ -30,7 +30,7 @@
 It provides additional features for file based objects including context
 linking and audit trails for a file object.
 
-It has the ability to index, store, harvest metadata. retrieve and search  
+It has the ability to index, store, harvest metadata. retrieve and search
 all types of files and other first class objects
 
 %package devel
@@ -55,7 +55,7 @@
 # make %{?_smp_mflags} fails
 make
 
-										
+
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
@@ -102,10 +102,10 @@
 - Fix up the RPM group
 
 * Mon Nov 06 2006 Deji Akingunola <dakingun gmail com> - 0.5.0-6
-- Explicitly require dbus-devel and dbus-glib (needed for FC < 6) 
+- Explicitly require dbus-devel and dbus-glib (needed for FC < 6)
 
 * Sun Nov 05 2006 Deji Akingunola <dakingun gmail com> - 0.5.0-5
-- Remove unneeded BRs (gnome-utils-devel and openssl-devel) 
+- Remove unneeded BRs (gnome-utils-devel and openssl-devel)
 
 * Sun Nov 05 2006 Deji Akingunola <dakingun gmail com> - 0.5.0-4
 - Add autostart desktop file.
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]