diff options
| author | Rico Tzschichholz <ricotz@t-online.de> | 2013-03-16 15:39:35 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2013-03-16 15:39:35 +0100 |
| commit | 079167a9fe73d938dba4a9ee6bcc08d900abcd58 (patch) | |
| tree | b6bbdde4084efe80c1daa9abd739e12c6d71af96 | |
| parent | 42c0727646b00d6e90d18f076be984259ffc3b0e (diff) | |
More clean ups for datahub merge
013e2f4e5ec27301d30bd8412f2374976f2f81ab was not approved by me :\
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | data/zeitgeist-datahub.desktop | 10 | ||||
| -rw-r--r-- | datahub/Makefile.am | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
4 files changed, 5 insertions, 13 deletions
@@ -37,6 +37,7 @@ src/*.c src/*.stamp datahub/*.c datahub/*.stamp +datahub/zeitgeist-datahub examples/*.c examples/*.stamp src/zeitgeist @@ -45,6 +46,7 @@ test/direct/where-clause-test data/ontology/*.py query-operators-test data/org.gnome.zeitgeist.service +data/zeitgeist-datahub.desktop extensions/*.c extensions/*.stamp extensions/*.la diff --git a/data/zeitgeist-datahub.desktop b/data/zeitgeist-datahub.desktop deleted file mode 100644 index 2f5ec510..00000000 --- a/data/zeitgeist-datahub.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=Zeitgeist Datahub -Comment=Start the Zeitgeist Datahub for passive loggers -Exec=zeitgeist-datahub -Terminal=false -Type=Application -Categories= -GenericName= diff --git a/datahub/Makefile.am b/datahub/Makefile.am index 931f4603..7dead02b 100644 --- a/datahub/Makefile.am +++ b/datahub/Makefile.am @@ -18,7 +18,7 @@ AM_VALAFLAGS = \ $(top_builddir)/libzeitgeist/zeitgeist-datamodel-2.0.vapi \ $(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \ $(top_srcdir)/config.vapi \ - $(top_srcdir)/datahub/glib-extra.vapi \ + $(srcdir)/glib-extra.vapi \ -C \ $(NULL) @@ -35,7 +35,6 @@ zeitgeist_datahub_VALASOURCES = \ recent-manager-provider.vala \ utils.vala \ zeitgeist-datahub.vala \ - glib-extra.vapi \ $(NULL) if ENABLE_TELEPATHY @@ -59,6 +58,7 @@ zeitgeist_datahub_vala.stamp: $(zeitgeist_datahub_VALASOURCES) Makefile EXTRA_DIST = \ $(zeitgeist_datahub_VALASOURCES) \ + glib-extra.vapi \ $(NULL) CLEANFILES = \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 48d43988..407684e9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ [encoding: UTF-8] # List of source files which contain translatable strings. +data/zeitgeist-datahub.desktop.in src/zeitgeist-daemon.vala tools/zeitgeist-explorer/details.py tools/zeitgeist-explorer/ontology.py -data/zeitgeist-datahub.desktop.in |