zeitgeist team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 356
committer: Michal Hruby <michal.mhr@xxxxxxxxx>
branch nick: bluebird
timestamp: Sat 2011-12-31 14:30:23 +0100
message:
  Move stuff around
renamed:
  extra/ => data/
  extra/python/ => python/
modified:
  .bzrignore
  Makefile.am
  configure.ac
  data/Makefile.am
  python/Makefile.am
  src/Makefile.am


--
lp:zeitgeist
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird

Your team Zeitgeist Framework Team is subscribed to branch lp:zeitgeist.
To unsubscribe from this branch go to https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription

=== modified file '.bzrignore'
--- .bzrignore	2011-12-31 00:31:17 +0000
+++ .bzrignore	2011-12-31 13:30:23 +0000
@@ -33,11 +33,11 @@
 src/zeitgeist
 src/bluebird
 test/direct/where-clause-test
-extra/ontology/*.py
+data/ontology/*.py
 query-operators-test
 src/ontology.vala
 src/ontology-uris.vala
-extra/org.gnome.zeitgeist.service
+data/org.gnome.zeitgeist.service
 extensions/.deps
 extensions/.libs
 extensions/*.c
@@ -51,7 +51,7 @@
 src/zeitgeist-engine.h
 extensions/fts-python/org.gnome.zeitgeist.fts.service
 py-compile
-extra/python/_ontology.py
+python/_ontology.py
 test/direct/*.c
 src/zeitgeist-daemon
 mimetype-test

=== modified file 'Makefile.am'
--- Makefile.am	2011-11-01 19:38:11 +0000
+++ Makefile.am	2011-12-31 13:30:23 +0000
@@ -3,7 +3,8 @@
 SUBDIRS = \
 	src \
 	extensions \
-	extra \
+	data \
+	python \
 	test \
 	po \
 	doc \

=== modified file 'configure.ac'
--- configure.ac	2011-11-03 14:52:14 +0000
+++ configure.ac	2011-12-31 13:30:23 +0000
@@ -60,13 +60,13 @@
 	src/Makefile
 	extensions/Makefile
 	extensions/fts-python/Makefile
-	extra/Makefile
-	extra/ontology/Makefile
-    extra/python/Makefile
+	data/Makefile
+	data/ontology/Makefile
+	python/Makefile
 	test/Makefile
 	test/dbus/Makefile
 	test/direct/Makefile
-    doc/Makefile
+	doc/Makefile
 	po/Makefile.in
 ])
 

=== renamed directory 'extra' => 'data'
=== modified file 'data/Makefile.am'
--- extra/Makefile.am	2011-10-29 13:31:12 +0000
+++ data/Makefile.am	2011-12-31 13:30:23 +0000
@@ -2,7 +2,6 @@
 
 SUBDIRS = \
 	ontology \
-	python \
 	$(NULL)
 
 servicedir = $(DBUS_SERVICES_DIR)

=== renamed directory 'extra/python' => 'python'
=== modified file 'python/Makefile.am'
--- extra/python/Makefile.am	2011-10-29 13:31:12 +0000
+++ python/Makefile.am	2011-12-31 13:30:23 +0000
@@ -13,7 +13,7 @@
 # FIXME: can we make this depend on $(ontology_trig_DATA)?
 _ontology.py:
 	@echo -e "#\n# Auto-generated from .trig files. Do not edit.\n#" > $@
-	$(AM_V_GEN)$(top_srcdir)/extra/ontology2code --dump-python >> $@
+	$(AM_V_GEN)$(top_srcdir)/data/ontology2code --dump-python >> $@
 
 CLEANFILES = \
 	_ontology.py \

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-12-31 00:22:58 +0000
+++ src/Makefile.am	2011-12-31 13:30:23 +0000
@@ -73,7 +73,7 @@
 
 # FIXME: can we make this depend on $(ontology_trig_DATA)?
 ontology_vala.stamp: ontology.vala.in ontology-uris.vala.in
-	$(AM_V_GEN)$(top_srcdir)/extra/ontology2code --vala
+	$(AM_V_GEN)$(top_srcdir)/data/ontology2code --vala
 	@touch "$@"
 
 ontology.vala ontology-uris.vala: ontology_vala.stamp