>From f0936a61b4ac108ede71b30ec62538a5a7f1171c Mon Sep 17 00:00:00 2001 From: Juan A. Suarez Romero Date: Fri, 20 Nov 2009 08:55:00 +0000 Subject: [PATCH] Allow Tracker 0.7 to be installed together with Tracker 0.6. This patch does some renames and moves some files so it can be installed together with Tracker 0.6, avoiding overwrittings of common files. --- configure.ac | 8 ++-- data/db/Makefile.am | 2 +- data/dbus/Makefile.am | 2 +- data/icons/16x16/Makefile.am | 2 +- data/icons/16x16/{tracker.png => tracker-0.7.png} | Bin 997 -> 997 bytes data/icons/22x22/Makefile.am | 2 +- data/icons/22x22/{tracker.png => tracker-0.7.png} | Bin 1334 -> 1334 bytes data/icons/24x24/Makefile.am | 2 +- data/icons/24x24/{tracker.png => tracker-0.7.png} | Bin 1484 -> 1484 bytes data/icons/32x32/Makefile.am | 2 +- data/icons/32x32/{tracker.png => tracker-0.7.png} | Bin 2242 -> 2242 bytes data/icons/48x48/Makefile.am | 2 +- data/icons/48x48/{tracker.png => tracker-0.7.png} | Bin 4145 -> 4145 bytes data/icons/scalable/Makefile.am | 2 +- .../scalable/{tracker.svg => tracker-0.7.svg} | 0 data/languages/Makefile.am | 2 +- data/miners/Makefile.am | 2 +- data/ontologies/Makefile.am | 2 +- docs/manpages/Makefile.am | 10 +++--- docs/manpages/tracker-extract.1 | 4 +- docs/manpages/tracker-import.1 | 2 +- .../{tracker-info.1 => tracker-info-0.7.1} | 8 ++-- docs/manpages/tracker-miner-fs.1 | 2 +- .../{tracker-search.1 => tracker-search-0.7.1} | 14 ++++---- docs/manpages/tracker-search-tool.1 | 2 +- docs/manpages/tracker-sparql.1 | 2 +- .../{tracker-stats.1 => tracker-stats-0.7.1} | 12 ++++---- .../{tracker-status.1 => tracker-status-0.7.1} | 10 +++--- docs/manpages/tracker-status-icon.cfg.5 | 2 +- docs/manpages/tracker-store.1 | 10 +++--- docs/manpages/{tracker-tag.1 => tracker-tag-0.7.1} | 12 ++++---- src/libtracker-common/tracker-language.c | 2 +- src/libtracker-data/tracker-data-manager.c | 2 +- src/libtracker-db/tracker-db-manager.c | 2 +- src/libtracker-miner/Makefile.am | 2 +- src/tracker-preferences/Makefile.am | 2 +- ...in.in => tracker-0.7-preferences.desktop.in.in} | 0 src/tracker-search-bar/tracker-search-bar.ui | 2 +- src/tracker-status-icon/tracker-main.c | 2 +- src/tracker-utils/Makefile.am | 30 ++++++++++---------- 40 files changed, 82 insertions(+), 82 deletions(-) rename data/icons/16x16/{tracker.png => tracker-0.7.png} (100%) rename data/icons/22x22/{tracker.png => tracker-0.7.png} (100%) rename data/icons/24x24/{tracker.png => tracker-0.7.png} (100%) rename data/icons/32x32/{tracker.png => tracker-0.7.png} (100%) rename data/icons/48x48/{tracker.png => tracker-0.7.png} (100%) rename data/icons/scalable/{tracker.svg => tracker-0.7.svg} (100%) rename docs/manpages/{tracker-info.1 => tracker-info-0.7.1} (71%) rename docs/manpages/{tracker-search.1 => tracker-search-0.7.1} (84%) rename docs/manpages/{tracker-stats.1 => tracker-stats-0.7.1} (65%) rename docs/manpages/{tracker-status.1 => tracker-status-0.7.1} (60%) rename docs/manpages/{tracker-tag.1 => tracker-tag-0.7.1} (88%) rename src/tracker-preferences/{tracker-preferences.desktop.in.in => tracker-0.7-preferences.desktop.in.in} (100%) diff --git a/configure.ac b/configure.ac index 6024fdf..b844c66 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ m4_define([tracker_lt_current_minus_age], # TRACKER_BINARY_VERSION=$TRACKER_MAJOR_VERSION.$TRACKER_MINOR_VERSION.$LT_CURRENT m4_define([tracker_binary_version], [0.7.6]) -AC_INIT([tracker], [tracker_version], +AC_INIT([tracker-0.7], [tracker_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=tracker], [tracker]) @@ -1388,8 +1388,8 @@ AC_CHECK_FILE("${prefix}/bin/tracker-indexer", old_exec_tracker_indexer=yes,,) AC_CHECK_FILE("${prefix}/bin/tracker-extract", old_exec_tracker_extract=yes,,) AC_CHECK_FILE("${prefix}/bin/tracker-thumbnailer", old_exec_tracker_thumbnailer=yes,,) AC_CHECK_FILE("${DBUS_SERVICES_DIR}/tracker.service", old_data_dbus_service=yes,) -AC_CHECK_FILE("${prefix}/share/tracker/tracker-introspect.xml", old_data_dbus_xml=yes,,) -AC_CHECK_FILE("${prefix}/share/tracker/sqlite-service-stored-procs.sql", old_data_stored_procs=yes,,) +AC_CHECK_FILE("${prefix}/share/tracker-0.7/tracker-introspect.xml", old_data_dbus_xml=yes,,) +AC_CHECK_FILE("${prefix}/share/tracker-0.7/sqlite-service-stored-procs.sql", old_data_stored_procs=yes,,) if test "x$old_exec_trackerd" == "xyes" -o \ "x$old_exec_tracker_indexer" == "xyes" -o \ @@ -1466,7 +1466,7 @@ AC_CONFIG_FILES([ src/tracker-extract/Makefile src/tracker-miner-fs/Makefile src/tracker-preferences/Makefile - src/tracker-preferences/tracker-preferences.desktop.in + src/tracker-preferences/tracker-0.7-preferences.desktop.in src/tracker-search-bar/Makefile src/tracker-search-tool/Makefile src/tracker-search-tool/tracker-search-tool.desktop.in diff --git a/data/db/Makefile.am b/data/db/Makefile.am index 9a192cd..a4b6e70 100644 --- a/data/db/Makefile.am +++ b/data/db/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -configdir = $(datadir)/tracker +configdir = $(datadir)/tracker-$(TRACKER_API_VERSION) config_DATA = \ sqlite-contents.sql \ diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am index b759f69..78fe6ef 100644 --- a/data/dbus/Makefile.am +++ b/data/dbus/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -configdir = $(datadir)/tracker +configdir = $(datadir)/tracker-$(TRACKER_API_VERSION) config_DATA = \ tracker-backup.xml \ diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am index 4db0c1f..287736c 100644 --- a/data/icons/16x16/Makefile.am +++ b/data/icons/16x16/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl icondir = $(datadir)/icons/hicolor/16x16/apps -icon_DATA = tracker.png +icon_DATA = tracker-0.7.png EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/16x16/tracker.png b/data/icons/16x16/tracker-0.7.png similarity index 100% rename from data/icons/16x16/tracker.png rename to data/icons/16x16/tracker-0.7.png diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am index da11195..c0bf453 100644 --- a/data/icons/22x22/Makefile.am +++ b/data/icons/22x22/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl icondir = $(datadir)/icons/hicolor/22x22/apps -icon_DATA = tracker.png +icon_DATA = tracker-0.7.png EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/22x22/tracker.png b/data/icons/22x22/tracker-0.7.png similarity index 100% rename from data/icons/22x22/tracker.png rename to data/icons/22x22/tracker-0.7.png diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am index 070b021..fa17916 100644 --- a/data/icons/24x24/Makefile.am +++ b/data/icons/24x24/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl icondir = $(datadir)/icons/hicolor/24x24/apps -icon_DATA = tracker.png +icon_DATA = tracker-0.7.png EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/24x24/tracker.png b/data/icons/24x24/tracker-0.7.png similarity index 100% rename from data/icons/24x24/tracker.png rename to data/icons/24x24/tracker-0.7.png diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am index a0ea85a..dd20425 100644 --- a/data/icons/32x32/Makefile.am +++ b/data/icons/32x32/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl icondir = $(datadir)/icons/hicolor/32x32/apps -icon_DATA = tracker.png +icon_DATA = tracker-0.7.png EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/32x32/tracker.png b/data/icons/32x32/tracker-0.7.png similarity index 100% rename from data/icons/32x32/tracker.png rename to data/icons/32x32/tracker-0.7.png diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am index 2101cb6..d7ca10d 100644 --- a/data/icons/48x48/Makefile.am +++ b/data/icons/48x48/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl icondir = $(datadir)/icons/hicolor/48x48/apps -icon_DATA = tracker.png +icon_DATA = tracker-0.7.png EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/48x48/tracker.png b/data/icons/48x48/tracker-0.7.png similarity index 100% rename from data/icons/48x48/tracker.png rename to data/icons/48x48/tracker-0.7.png diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am index 5583008..e928f3f 100644 --- a/data/icons/scalable/Makefile.am +++ b/data/icons/scalable/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl icondir = $(datadir)/icons/hicolor/scalable/apps -icon_DATA = tracker.svg +icon_DATA = tracker-0.7.svg EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/scalable/tracker.svg b/data/icons/scalable/tracker-0.7.svg similarity index 100% rename from data/icons/scalable/tracker.svg rename to data/icons/scalable/tracker-0.7.svg diff --git a/data/languages/Makefile.am b/data/languages/Makefile.am index 4d8ab3b..d3c82cd 100644 --- a/data/languages/Makefile.am +++ b/data/languages/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -configdir = $(datadir)/tracker/languages +configdir = $(datadir)/tracker-$(TRACKER_API_VERSION)/languages config_DATA = \ stopwords.da \ diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am index cdb1db4..a0b7c9b 100644 --- a/data/miners/Makefile.am +++ b/data/miners/Makefile.am @@ -4,7 +4,7 @@ desktop_in_files = \ tracker-miner-applications.desktop.in \ tracker-miner-files.desktop.in -tracker_minersdir = $(datadir)/tracker/miners +tracker_minersdir = $(datadir)/tracker-$(TRACKER_API_VERSION)/miners tracker_miners_DATA = \ tracker-miner-applications.desktop \ diff --git a/data/ontologies/Makefile.am b/data/ontologies/Makefile.am index 712d2b0..8e400a5 100644 --- a/data/ontologies/Makefile.am +++ b/data/ontologies/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -configdir = $(datadir)/tracker/ontologies +configdir = $(datadir)/tracker-$(TRACKER_API_VERSION)/ontologies config_DATA = \ 10-xsd.ontology \ diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am index a1da95b..dd1f586 100644 --- a/docs/manpages/Makefile.am +++ b/docs/manpages/Makefile.am @@ -17,18 +17,18 @@ man_MANS = \ tracker-extract.cfg.5 \ tracker-fts.cfg.5 \ tracker-import.1 \ - tracker-info.1 \ + tracker-info-0.7.1 \ tracker-miner-fs.1 \ tracker-miner-fs.cfg.5 \ tracker-control.1 \ - tracker-search.1 \ + tracker-search-0.7.1 \ tracker-search-bar.1 \ tracker-sparql.1 \ - tracker-stats.1 \ - tracker-status.1 \ + tracker-stats-0.7.1 \ + tracker-status-0.7.1 \ tracker-store.1 \ tracker-store.cfg.5 \ - tracker-tag.1 \ + tracker-tag-0.7.1 \ $(tst) \ $(ta) \ $(tp) diff --git a/docs/manpages/tracker-extract.1 b/docs/manpages/tracker-extract.1 index a908ff5..8ee49b1 100644 --- a/docs/manpages/tracker-extract.1 +++ b/docs/manpages/tracker-extract.1 @@ -52,7 +52,7 @@ $ echo -e "/x/y/z.mp3\\naudio/mpeg" | tracker-extract .SH SEE ALSO .BR tracker-store (1), .BR tracker-sparql (1), -.BR tracker-stats (1), -.BR tracker-info (1). +.BR tracker-stats-0.7 (1), +.BR tracker-info-0.7 (1). .TP .BR tracker-extract.cfg (5). diff --git a/docs/manpages/tracker-import.1 b/docs/manpages/tracker-import.1 index 58dc2e5..9abddd6 100644 --- a/docs/manpages/tracker-import.1 +++ b/docs/manpages/tracker-import.1 @@ -26,6 +26,6 @@ Show summary of options. .SH SEE ALSO .BR tracker-store (1), .BR tracker-sparql (1), -.BR tracker-info (1). +.BR tracker-info-0.7 (1). .TP .BR Turtle. diff --git a/docs/manpages/tracker-info.1 b/docs/manpages/tracker-info-0.7.1 similarity index 71% rename from docs/manpages/tracker-info.1 rename to docs/manpages/tracker-info-0.7.1 index 9eb831c..31e46b4 100644 --- a/docs/manpages/tracker-info.1 +++ b/docs/manpages/tracker-info-0.7.1 @@ -1,13 +1,13 @@ -.TH tracker-info 1 "Oct 2008" GNU "User Commands" +.TH tracker-info-0.7 1 "Oct 2008" GNU "User Commands" .SH NAME -tracker-info \- Retrieve all information available for a certain file. +tracker-info-0.7 \- Retrieve all information available for a certain file. .SH SYNOPSIS -\fBtracker-info\fR [\fIOPTION\fR...] \fIFILE\fR... +\fBtracker-info-0.7\fR [\fIOPTION\fR...] \fIFILE\fR... .SH DESCRIPTION -.B tracker-info +.B tracker-info-0.7 asks for all the known metadata available for the given \fIFILE\fR. Multiple \fIFILE\fR arguments can be provided to retrieve information diff --git a/docs/manpages/tracker-miner-fs.1 b/docs/manpages/tracker-miner-fs.1 index fffe428..d7789d6 100644 --- a/docs/manpages/tracker-miner-fs.1 +++ b/docs/manpages/tracker-miner-fs.1 @@ -35,6 +35,6 @@ Sets the initial sleep time before crawling the file system is started. .SH SEE ALSO .BR tracker-store (1), -.BR tracker-info (1). +.BR tracker-info-0.7 (1). .TP .BR tracker-miner-fs.cfg (5). diff --git a/docs/manpages/tracker-search.1 b/docs/manpages/tracker-search-0.7.1 similarity index 84% rename from docs/manpages/tracker-search.1 rename to docs/manpages/tracker-search-0.7.1 index 93537e9..26783d0 100644 --- a/docs/manpages/tracker-search.1 +++ b/docs/manpages/tracker-search-0.7.1 @@ -1,13 +1,13 @@ -.TH tracker-search 1 "July 2009" GNU "User Commands" +.TH tracker-search-0.7 1 "July 2009" GNU "User Commands" .SH NAME -tracker-search \- Search all content for keywords +tracker-search-0.7 \- Search all content for keywords .SH SYNOPSIS -\fBtracker-search\fR [\fIOPTION\fR...] \fIEXPRESSION\fR [\fIEXPRESSION\fR...] +\fBtracker-search-0.7\fR [\fIOPTION\fR...] \fIEXPRESSION\fR [\fIEXPRESSION\fR...] .SH DESCRIPTION -.B tracker-search +.B tracker-search-0.7 searches all indexed content for \fIEXPRESSION\fR. .TP \fIEXPRESSION\fR @@ -70,6 +70,6 @@ Search for documents in ascending order. This returns a list of files. .SH SEE ALSO .BR tracker-store (1), -.BR tracker-stats (1), -.BR tracker-tag (1), -.BR tracker-info (1). +.BR tracker-stats-0.7 (1), +.BR tracker-tag-0.7 (1), +.BR tracker-info-0.7 (1). diff --git a/docs/manpages/tracker-search-tool.1 b/docs/manpages/tracker-search-tool.1 index ad4a376..1506df7 100644 --- a/docs/manpages/tracker-search-tool.1 +++ b/docs/manpages/tracker-search-tool.1 @@ -47,7 +47,7 @@ for more information. X display to use .SH SEE ALSO -.BR tracker-search (1), +.BR tracker-search-0.7 (1), .BR tracker-store (1), .BR tracker-services (1). diff --git a/docs/manpages/tracker-sparql.1 b/docs/manpages/tracker-sparql.1 index cb949cb..8215777 100644 --- a/docs/manpages/tracker-sparql.1 +++ b/docs/manpages/tracker-sparql.1 @@ -182,7 +182,7 @@ $ tracker-sparql -q "SELECT ?image ?date WHERE { .SH SEE ALSO .BR tracker-store (1), -.BR tracker-info (1). +.BR tracker-info-0.7 (1). .TP .BR http://nepomuk.semanticdesktop.org/ .TP diff --git a/docs/manpages/tracker-stats.1 b/docs/manpages/tracker-stats-0.7.1 similarity index 65% rename from docs/manpages/tracker-stats.1 rename to docs/manpages/tracker-stats-0.7.1 index 5a692ec..128dd42 100644 --- a/docs/manpages/tracker-stats.1 +++ b/docs/manpages/tracker-stats-0.7.1 @@ -1,13 +1,13 @@ -.TH tracker-stats 1 "July 2009" GNU "User Commands" +.TH tracker-stats-0.7 1 "July 2009" GNU "User Commands" .SH NAME -tracker-stats \- Provides statistics on the data available for querying +tracker-stats-0.7 \- Provides statistics on the data available for querying .SH SYNOPSIS -\fBtracker-stats\fR [\fIOPTION\fR...] +\fBtracker-stats-0.7\fR [\fIOPTION\fR...] .SH DESCRIPTION -.B tracker-stats +.B tracker-stats-0.7 takes no arguments and returns statistics based on the ontology classes outlined in the .B Nepomuk @@ -24,9 +24,9 @@ Show a brief help message. .SH SEE ALSO .BR tracker-store (1), -.BR tracker-status (1), +.BR tracker-status-0.7 (1), .BR tracker-sparql (1), -.BR tracker-info (1). +.BR tracker-info-0.7 (1). .TP .BR http://nepomuk.semanticdesktop.org/ .TP diff --git a/docs/manpages/tracker-status.1 b/docs/manpages/tracker-status-0.7.1 similarity index 60% rename from docs/manpages/tracker-status.1 rename to docs/manpages/tracker-status-0.7.1 index 7288bb8..abae208 100644 --- a/docs/manpages/tracker-status.1 +++ b/docs/manpages/tracker-status-0.7.1 @@ -1,15 +1,15 @@ -.TH tracker-status 1 "July 2009" GNU "User Commands" +.TH tracker-status-0.7 1 "July 2009" GNU "User Commands" .SH NAME -tracker-status \- Report the +tracker-status-0.7 \- Report the .B tracker-store status .SH SYNOPSIS -.B tracker-status +.B tracker-status-0.7 .SH DESCRIPTION -.B tracker-status +.B tracker-status-0.7 shows the status of .B tracker-store which can be one of the following: @@ -18,4 +18,4 @@ Initializing, Watching, Indexing, Pending, Optimizing, Idle, Shutdown. .SH SEE ALSO .BR tracker-store (1), -.BR tracker-stats (1) +.BR tracker-stats-0.7 (1) diff --git a/docs/manpages/tracker-status-icon.cfg.5 b/docs/manpages/tracker-status-icon.cfg.5 index 3953bf3..3e4959d 100644 --- a/docs/manpages/tracker-status-icon.cfg.5 +++ b/docs/manpages/tracker-status-icon.cfg.5 @@ -24,5 +24,5 @@ by a data miner. Values for this setting are: 0=Never, 1=When active, .SH SEE ALSO .BR tracker-status-icon (1), -.BR tracker-status (1), +.BR tracker-status-0.7 (1), .BR tracker-preferences (1). diff --git a/docs/manpages/tracker-store.1 b/docs/manpages/tracker-store.1 index 31ce83b..02b4aa6 100644 --- a/docs/manpages/tracker-store.1 +++ b/docs/manpages/tracker-store.1 @@ -83,12 +83,12 @@ for more information. .SH SEE ALSO .BR tracker-applet (1), .BR tracker-search-tool (1), -.BR tracker-search (1), -.BR tracker-tag (1), -.BR tracker-stats (1), +.BR tracker-search-0.7 (1), +.BR tracker-tag-0.7 (1), +.BR tracker-stats-0.7 (1), .BR tracker-services (1), -.BR tracker-info (1), -.BR tracker-status (1). +.BR tracker-info-0.7 (1), +.BR tracker-status-0.7 (1). .BR tracker-store.cfg (5), .BR tracker-fts.cfg (5). diff --git a/docs/manpages/tracker-tag.1 b/docs/manpages/tracker-tag-0.7.1 similarity index 88% rename from docs/manpages/tracker-tag.1 rename to docs/manpages/tracker-tag-0.7.1 index 0ede262..c52688c 100644 --- a/docs/manpages/tracker-tag.1 +++ b/docs/manpages/tracker-tag-0.7.1 @@ -1,14 +1,14 @@ -.TH tracker-tag 1 "July 2009" GNU "User Commands" +.TH tracker-tag-0.7 1 "July 2009" GNU "User Commands" .SH NAME -tracker-tag \- Add, remove and list tags. +tracker-tag-0.7 \- Add, remove and list tags. .SH SYNOPSIS -\fBtracker-tag\fR +\fBtracker-tag-0.7\fR [\fIOPTION...\fR] FILE [\fIFILE...\fR] .SH DESCRIPTION -.B tracker-tag +.B tracker-tag-0.7 allows the caller add tags, remove tags and list tags by URN or to list all tags and the files associated with them. @@ -65,5 +65,5 @@ deleted. .SH SEE ALSO .BR tracker-store (1), .BR tracker-sparql (1), -.BR tracker-search (1), -.BR tracker-info (1). +.BR tracker-search-0.7 (1), +.BR tracker-info-0.7 (1). diff --git a/src/libtracker-common/tracker-language.c b/src/libtracker-common/tracker-language.c index a470615..4a53275 100644 --- a/src/libtracker-common/tracker-language.c +++ b/src/libtracker-common/tracker-language.c @@ -222,7 +222,7 @@ language_get_stopword_filename (const gchar *language_code) str = g_strconcat ("stopwords.", language_code, NULL); filename = g_build_filename (SHAREDIR, - "tracker", + "tracker-0.7", "languages", str, NULL); diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c index 6ffb8af..5c3648e 100644 --- a/src/libtracker-data/tracker-data-manager.c +++ b/src/libtracker-data/tracker-data-manager.c @@ -837,7 +837,7 @@ tracker_data_manager_init (TrackerDBManagerFlags flags, if (G_LIKELY (!env_path)) { ontologies_dir = g_build_filename (SHAREDIR, - "tracker", + "tracker-0.7", "ontologies", NULL); } else { diff --git a/src/libtracker-db/tracker-db-manager.c b/src/libtracker-db/tracker-db-manager.c index d3f54d4..d47493a 100644 --- a/src/libtracker-db/tracker-db-manager.c +++ b/src/libtracker-db/tracker-db-manager.c @@ -1130,7 +1130,7 @@ tracker_db_manager_init (TrackerDBManagerFlags flags, if (G_UNLIKELY (!env_path)) { sql_dir = g_build_filename (SHAREDIR, - "tracker", + "tracker-0.7", NULL); } else { sql_dir = g_strdup (env_path); diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am index 1cf3c61..75bd81d 100644 --- a/src/libtracker-miner/Makefile.am +++ b/src/libtracker-miner/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"Tracker\" \ -DTRACKER_COMPILATION \ -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \ - -DTRACKER_MINERS_DIR=\""$(datadir)/tracker/miners"\" \ + -DTRACKER_MINERS_DIR=\""$(datadir)/tracker-$(TRACKER_API_VERSION)/miners"\" \ -I$(top_srcdir)/src \ $(WARN_CFLAGS) \ $(GLIB2_CFLAGS) \ diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am index c734724..7a3406d 100644 --- a/src/tracker-preferences/Makefile.am +++ b/src/tracker-preferences/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.decl bin_PROGRAMS = tracker-preferences desktopdir = $(datadir)/applications -desktop_DATA = tracker-preferences.desktop +desktop_DATA = tracker-0.7-preferences.desktop pkgdata_DATA = tracker-preferences.ui diff --git a/src/tracker-preferences/tracker-preferences.desktop.in.in b/src/tracker-preferences/tracker-0.7-preferences.desktop.in.in similarity index 100% rename from src/tracker-preferences/tracker-preferences.desktop.in.in rename to src/tracker-preferences/tracker-0.7-preferences.desktop.in.in diff --git a/src/tracker-search-bar/tracker-search-bar.ui b/src/tracker-search-bar/tracker-search-bar.ui index 5737488..2857b58 100644 --- a/src/tracker-search-bar/tracker-search-bar.ui +++ b/src/tracker-search-bar/tracker-search-bar.ui @@ -58,7 +58,7 @@ Tom <tpgww at onepost net> Tshepang Lekhonkhobe <tshepang at gmail com> Ulrik Mikaelsson <ulrik mikaelsson gmail com> - tracker + tracker-0.7 True diff --git a/src/tracker-status-icon/tracker-main.c b/src/tracker-status-icon/tracker-main.c index aa43698..98af62e 100644 --- a/src/tracker-status-icon/tracker-main.c +++ b/src/tracker-status-icon/tracker-main.c @@ -62,7 +62,7 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); tomboy_keybinder_init (); - gtk_window_set_default_icon_name ("tracker"); + gtk_window_set_default_icon_name ("tracker-0.7"); g_set_application_name ("tracker-status-icon"); icon = tracker_status_icon_new (); diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am index 2ccaf1e..5902ad4 100644 --- a/src/tracker-utils/Makefile.am +++ b/src/tracker-utils/Makefile.am @@ -25,27 +25,27 @@ libs = \ bin_PROGRAMS = \ tracker-import \ - tracker-info \ - tracker-search \ + tracker-info-0.7 \ + tracker-search-0.7 \ tracker-sparql \ - tracker-stats \ - tracker-status \ - tracker-tag + tracker-stats-0.7 \ + tracker-status-0.7 \ + tracker-tag-0.7 -tracker_search_SOURCES = tracker-search.c -tracker_search_LDADD = $(libs) +tracker_search_0_7_SOURCES = tracker-search.c +tracker_search_0_7_LDADD = $(libs) -tracker_stats_SOURCES = tracker-stats.c -tracker_stats_LDADD = $(libs) +tracker_stats_0_7_SOURCES = tracker-stats.c +tracker_stats_0_7_LDADD = $(libs) -tracker_tag_SOURCES = tracker-tag.c -tracker_tag_LDADD = $(libs) +tracker_tag_0_7_SOURCES = tracker-tag.c +tracker_tag_0_7_LDADD = $(libs) -tracker_status_SOURCES = tracker-status.c -tracker_status_LDADD = $(libs) +tracker_status_0_7_SOURCES = tracker-status.c +tracker_status_0_7_LDADD = $(libs) -tracker_info_SOURCES = tracker-info.c -tracker_info_LDADD = $(libs) +tracker_info_0_7_SOURCES = tracker-info.c +tracker_info_0_7_LDADD = $(libs) tracker_sparql_SOURCES = tracker-sparql.c tracker_sparql_LDADD = $(libs) -- 1.5.6.1