tracker r2261 - in branches/indexer-split: . data/services po

[mr svn gnome org]

Author: mr
Date: Thu Sep 25 09:27:15 2008
New Revision: 2261
URL: http://svn.gnome.org/viewvc/tracker?rev=2261&view=rev

Log:
	* Makefile.am:
	* data/services/Makefile.am: Added install hooks to clean up old
	locations for binaries from TRUNK. This way when replacing TRUNK
	with indexer-split, people shouldn't get run the wrong binaries if
	they are still in their $prefix.

	* ar.po:
	* es.po:
	* fi.po:
	* fr.po:
	* nb.po:
	* nl.po:
	* oc.po:
	* pl.po:
	* pt.po:
	* pt_BR.po:
	* sk.po:
	* sv.po:
	* zh_CN.po: Updated from TRUNK for indexer-split->TRUNK merge
	preparations.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/Makefile.am
   branches/indexer-split/data/services/Makefile.am
   branches/indexer-split/po/ChangeLog
   branches/indexer-split/po/ar.po
   branches/indexer-split/po/es.po
   branches/indexer-split/po/fi.po
   branches/indexer-split/po/fr.po
   branches/indexer-split/po/nb.po
   branches/indexer-split/po/nl.po
   branches/indexer-split/po/oc.po
   branches/indexer-split/po/pl.po
   branches/indexer-split/po/pt.po
   branches/indexer-split/po/pt_BR.po
   branches/indexer-split/po/sk.po
   branches/indexer-split/po/sv.po
   branches/indexer-split/po/zh_CN.po

Modified: branches/indexer-split/Makefile.am
==============================================================================
--- branches/indexer-split/Makefile.am	(original)
+++ branches/indexer-split/Makefile.am	Thu Sep 25 09:27:15 2008
@@ -25,3 +25,11 @@
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-session-bus-services-dir="\$(datadir)"/dbus-1/services \
 	--disable-deskbar-applet
+
+# Clean up any old trunk files that might exist which we don't use now
+all-local:
+	rm -Rf $(bindir)/trackerd
+	rm -Rf $(bindir)/tracker-indexer
+	rm -Rf $(bindir)/tracker-thumbnailer
+	rm -Rf $(bindir)/tracker-extract
+	rm -Rf $(datadir)/tracker

Modified: branches/indexer-split/data/services/Makefile.am
==============================================================================
--- branches/indexer-split/data/services/Makefile.am	(original)
+++ branches/indexer-split/data/services/Makefile.am	Thu Sep 25 09:27:15 2008
@@ -1,20 +1,21 @@
 configdir = $(datadir)/tracker/services
 
-config_DATA =   application.metadata \
-		audio.metadata \
-		default.metadata \
-		document.metadata \
-		email.metadata \
-		file.metadata \
-		image.metadata \
-		video.metadata \
-		default.service \
-		xesam-convenience.metadata \
-		xesam-convenience.service \
-		xesam.metadata \
-		xesam.service \
-		xesam-virtual.metadata \
-		xesam-service.smapping \
-		xesam-metadata.mmapping
+config_DATA = 				\
+	application.metadata 		\
+	audio.metadata 			\
+	default.metadata 		\
+	default.service 		\
+	document.metadata 		\
+	email.metadata 			\
+	file.metadata 			\
+	image.metadata 			\
+	video.metadata 			\
+	xesam-convenience.metadata 	\
+	xesam-convenience.service 	\
+	xesam.metadata 			\
+	xesam.service 			\
+	xesam-virtual.metadata 		\
+	xesam-service.smapping 		\
+	xesam-metadata.mmapping
 
 EXTRA_DIST = $(config_DATA)