Zeitgeist Data-Sources

Merge lp:~thekorn/zeitgeist-datasources/fixed-distcheck into lp:zeitgeist-datasources/0.8

  1. fixed-distcheck
  2. Merge into trunk
Proposed by Markus Korn
Status: Merged
Merged at revision: 93
Proposed branch: lp:~thekorn/zeitgeist-datasources/fixed-distcheck
Merge into: lp:zeitgeist-datasources/0.8
Diff against target: 305 lines (+102/-33)
11 files modified
Makefile.am (+1/-0)
bzr/Makefile.am (+1/-1)
chrome/Makefile.am (+16/-7)
configure.ac (+58/-16)
eog/Makefile.am (+1/-1)
firefox-libzg/extension/Makefile.am (+3/-3)
firefox-libzg/extension/components/Makefile.am (+10/-0)
gedit/Makefile.am (+1/-1)
rhythmbox/Makefile.am (+1/-1)
totem-libzg/Makefile.am (+9/-2)
vim/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~thekorn/zeitgeist-datasources/fixed-distcheck
Reviewer Review Type Date Requested Status
Manish Sinha (मनीष सिन्हा) Approve
Michal Hruby (community) Approve
Siegfried Gevatter Approve
Review via email: mp+39897@code.launchpad.net

Description of the change

Fixed `make distcheck`

To post a comment you must log in.
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

It fails on Totem.

The log is attached http://paste.ubuntu.com/524674/

review: Needs Fixing (build distcheck)
lp:~thekorn/zeitgeist-datasources/fixed-distcheck updated
98. By Markus Korn

fixed totem-libzg

Revision history for this message
Siegfried Gevatter (rainct) wrote :

Excellent work, Markus. Please push to trunk :).

I'm unsure about the Chrome plugin (especially the line below), but this can be fixed later.
+chromeresourcedir = $(datadir)/opt/google/chrome/resources/zeitgeist_plugin

review: Approve
Revision history for this message
Michal Hruby (mhr3) wrote :

Distcheck worked fine here, and it looks good.

review: Approve
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

Looks like I was late. It has been merged. Yes. It works

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.am'
--- Makefile.am 2010-06-08 00:24:42 +0000
+++ Makefile.am 2010-11-02 21:34:46 +0000
@@ -1,4 +1,5 @@
1SUBDIRS = $(PLUGINS)1SUBDIRS = $(PLUGINS)
2EXTRA_DIST = $(EXTRA_SUBDIRS)
23
3local-install:4local-install:
4 for d in $(PLUGINS); \5 for d in $(PLUGINS); \
56
=== modified file 'bzr/Makefile.am'
--- bzr/Makefile.am 2010-06-07 19:50:44 +0000
+++ bzr/Makefile.am 2010-11-02 21:34:46 +0000
@@ -1,5 +1,5 @@
1bzrplugindir = $(datadir)/pyshared/bzrlib/plugins/zeitgeist1bzrplugindir = $(datadir)/pyshared/bzrlib/plugins/zeitgeist
2bzrplugin_DATA = __init__.py2dist_bzrplugin_DATA = __init__.py
33
4# we want to allow also local install4# we want to allow also local install
5BZR_PLUGIN_HOME_DIR = ~/.bazaar/plugins/zeitgeist5BZR_PLUGIN_HOME_DIR = ~/.bazaar/plugins/zeitgeist
66
=== modified file 'chrome/Makefile.am'
--- chrome/Makefile.am 2010-07-10 18:02:48 +0000
+++ chrome/Makefile.am 2010-11-02 21:34:46 +0000
@@ -1,5 +1,5 @@
1chromeresourcedir = /opt/google/chrome/resources/zeitgeist_plugin1chromeresourcedir = $(datadir)/opt/google/chrome/resources/zeitgeist_plugin
2chromeresource_DATA = \2dist_chromeresource_DATA = \
3 background.html \3 background.html \
4 content_script.js \4 content_script.js \
5 manifest.json \5 manifest.json \
@@ -9,15 +9,15 @@
9pluginbinary_LTLIBRARIES = libzeitgeist-npapi-plugin.la9pluginbinary_LTLIBRARIES = libzeitgeist-npapi-plugin.la
1010
11libzeitgeist_npapi_plugin_la_SOURCES = \11libzeitgeist_npapi_plugin_la_SOURCES = \
12 plugin/np-zeitgeist.cc \12 $(top_srcdir)/npapi-plugin/np-zeitgeist.cc \
13 $(NULL)13 $(NULL)
1414
15libzeitgeist_npapi_plugin_la_CXXFLAGS = \15libzeitgeist_npapi_plugin_la_CXXFLAGS = \
16 -pedantic -fPIC -Wall -std=c++0x -O2 \16 -pedantic -fPIC -Wall -std=c++0x -O2 \
17 $(ZEITGEIST_CFLAGS) \17 $(ZEITGEIST_CFLAGS) \
18 -I./plugin \18 -I$(top_srcdir)/npapi-plugin \
19 -I./plugin/third_party \19 -I$(top_srcdir)/npapi-plugin/third_party \
20 -I./plugin/third_party/npapi \20 -I$(top_srcdir)/npapi-plugin/third_party/npapi \
21 $(NULL)21 $(NULL)
2222
23libzeitgeist_npapi_plugin_la_LIBADD = \23libzeitgeist_npapi_plugin_la_LIBADD = \
@@ -28,9 +28,18 @@
28 -Wl,--no-undefined \28 -Wl,--no-undefined \
29 -module -avoid-version \29 -module -avoid-version \
30 $(NULL)30 $(NULL)
31
32EXTRA_DIST = \
33 $(top_srcdir)/npapi-plugin/third_party/webkit/glue/plugins/nphostapi.h \
34 $(top_srcdir)/npapi-plugin/third_party/npapi/bindings/npapi.h \
35 $(top_srcdir)/npapi-plugin/third_party/npapi/bindings/npruntime.h \
36 $(top_srcdir)/npapi-plugin/base/port.h \
37 $(top_srcdir)/npapi-plugin/base/basictypes.h \
38 $(top_srcdir)/npapi-plugin/build/build_config.h \
39 $(NULL)
3140
32# we want to allow also local install41# we want to allow also local install
33local-install: all42local-install: all
34 ln -s $(abs_srcdir)/.libs/libzeitgeist-npapi-plugin.so plugin/libzeitgeist-npapi-plugin.so43 ln -s $(abs_srcdir)/.libs/libzeitgeist-npapi-plugin.so $(top_srcdir)/npapi-plugin/libzeitgeist-npapi-plugin.so
3544
36local-uninstall: all45local-uninstall: all
3746
=== modified file 'configure.ac'
--- configure.ac 2010-08-05 20:45:47 +0000
+++ configure.ac 2010-11-02 21:34:46 +0000
@@ -203,30 +203,69 @@
203AC_SUBST([AM_CXXFLAGS])203AC_SUBST([AM_CXXFLAGS])
204AC_SUBST([AM_LDFLAGS])204AC_SUBST([AM_LDFLAGS])
205205
206AC_OUTPUT([206AC_CONFIG_FILES([Makefile])
207Makefile
208bzr/Makefile
209chrome/Makefile
210eog/Makefile
211firefox-libzg/Makefile
212firefox-libzg/extension/Makefile
213firefox-libzg/extension/components/Makefile
214geany/Makefile
215gedit/Makefile
216rhythmbox/Makefile
217totem-libzg/Makefile
218vim/Makefile
219emacs/Makefile
220])
221207
222AC_MSG_NOTICE([Zeitgeist-dataproviders was configured with the following options:])208AC_MSG_NOTICE([Zeitgeist-dataproviders was configured with the following options:])
223209
210extra_subdirs=""
211
224if test "x${PLUGINS}" != "x" ; then212if test "x${PLUGINS}" != "x" ; then
225 for allowed_plugin in ${ALL_PLUGINS}; do213 for allowed_plugin in ${ALL_PLUGINS}; do
226 for plugin in ${PLUGINS}; do214 for plugin in ${PLUGINS}; do
227 case ${allowed_plugin} in215 case ${allowed_plugin} in
228 ${plugin})216 ${plugin})
229 AC_MSG_NOTICE([** ${allowed_plugin} plugin enabled])217 AC_MSG_NOTICE([** ${allowed_plugin} plugin enabled])
218 case ${allowed_plugin} in
219 bzr)
220 AC_CONFIG_FILES([bzr/Makefile])
221 continue 2
222 ;;
223 chrome)
224 AC_CONFIG_FILES([chrome/Makefile])
225 extra_subdirs="${extra_subdirs} npapi-plugin"
226 continue 2
227 ;;
228 eog)
229 AC_CONFIG_FILES([eog/Makefile])
230 continue 2
231 ;;
232 firefox-libzg)
233 AC_CONFIG_FILES([
234 firefox-libzg/Makefile
235 firefox-libzg/extension/Makefile
236 firefox-libzg/extension/components/Makefile
237 ])
238 continue 2
239 ;;
240 geany)
241 AC_CONFIG_FILES([geany/Makefile])
242 continue 2
243 ;;
244 gedit)
245 AC_CONFIG_FILES([gedit/Makefile])
246 continue 2
247 ;;
248 rhythmbox)
249 AC_CONFIG_FILES([rhythmbox/Makefile])
250 continue 2
251 ;;
252 totem-libzg)
253 AC_CONFIG_FILES([totem-libzg/Makefile])
254 continue 2
255 ;;
256 vim)
257 AC_CONFIG_FILES([vim/Makefile])
258 continue 2
259 ;;
260 emacs)
261 AC_CONFIG_FILES([emacs/Makefile])
262 continue 2
263 ;;
264 *)
265 AC_MSG_ERROR([cannot configure ${allowed_plugin}])
266 continue 2
267 ;;
268 esac
230 continue 2269 continue 2
231 ;;270 ;;
232 *);;271 *);;
@@ -237,4 +276,7 @@
237else276else
238 AC_MSG_NOTICE([ No plugins enabled])277 AC_MSG_NOTICE([ No plugins enabled])
239fi278fi
240 279
280EXTRA_SUBDIRS=$extra_subdirs
281AC_SUBST([EXTRA_SUBDIRS])
282AC_OUTPUT
241283
=== modified file 'eog/Makefile.am'
--- eog/Makefile.am 2010-06-07 19:50:44 +0000
+++ eog/Makefile.am 2010-11-02 21:34:46 +0000
@@ -1,7 +1,7 @@
1PLUGIN_FILES = zeitgeist.eog-plugin zeitgeist_plugin.py1PLUGIN_FILES = zeitgeist.eog-plugin zeitgeist_plugin.py
22
3eogplugindir = $(libdir)/eog/plugins3eogplugindir = $(libdir)/eog/plugins
4eogplugin_DATA = $(PLUGIN_FILES)4dist_eogplugin_DATA = $(PLUGIN_FILES)
55
6# we want to allow also local install6# we want to allow also local install
7EOG_PLUGIN_HOME_DIR = ~/.gnome2/eog/plugins7EOG_PLUGIN_HOME_DIR = ~/.gnome2/eog/plugins
88
=== modified file 'firefox-libzg/extension/Makefile.am'
--- firefox-libzg/extension/Makefile.am 2010-07-10 18:05:00 +0000
+++ firefox-libzg/extension/Makefile.am 2010-11-02 21:34:46 +0000
@@ -4,20 +4,20 @@
4EXTENSIONS_SYMLINK = $(extensiondir)/xpcom_firefox@zeitgeist-project.com4EXTENSIONS_SYMLINK = $(extensiondir)/xpcom_firefox@zeitgeist-project.com
55
6xul_extdir = $(datadir)/xul-ext-zeitgeist6xul_extdir = $(datadir)/xul-ext-zeitgeist
7xul_ext_DATA = \7dist_xul_ext_DATA = \
8 license.txt \8 license.txt \
9 chrome.manifest \9 chrome.manifest \
10 install.rdf \10 install.rdf \
11 $(NULL)11 $(NULL)
1212
13contentdir = $(xul_extdir)/chrome/content13contentdir = $(xul_extdir)/chrome/content
14content_DATA = \14dist_content_DATA = \
15 chrome/content/zeitgeist.xul \15 chrome/content/zeitgeist.xul \
16 chrome/content/zeitgeist.png \16 chrome/content/zeitgeist.png \
17 $(NULL)17 $(NULL)
1818
19prefsdir = $(xul_extdir)/defaults/preferences19prefsdir = $(xul_extdir)/defaults/preferences
20prefs_DATA = \20dist_prefs_DATA = \
21 defaults/preferences/zeitgeist.js \21 defaults/preferences/zeitgeist.js \
22 $(NULL)22 $(NULL)
2323
2424
=== modified file 'firefox-libzg/extension/components/Makefile.am'
--- firefox-libzg/extension/components/Makefile.am 2010-07-10 18:05:00 +0000
+++ firefox-libzg/extension/components/Makefile.am 2010-11-02 21:34:46 +0000
@@ -29,6 +29,16 @@
29 zeitgeist.h \29 zeitgeist.h \
30 zeitgeist.xpt \30 zeitgeist.xpt \
31 $(NULL)31 $(NULL)
32
33EXTRA_DIST = \
34 zeitgeist.idl \
35 zeitgeistextend.h \
36 $(NULL)
37
38DISTCLEANFILES = \
39 $(BUILT_SOURCES) \
40 $(NULL)
41
3242
33zeitgeist.h: zeitgeist.idl43zeitgeist.h: zeitgeist.idl
34 $(AM_V_GEN)$(XPIDL_BIN) -m header -I $(XUL_IDLDIR) -o zeitgeist $<44 $(AM_V_GEN)$(XPIDL_BIN) -m header -I $(XUL_IDLDIR) -o zeitgeist $<
3545
=== modified file 'gedit/Makefile.am'
--- gedit/Makefile.am 2010-06-07 20:15:41 +0000
+++ gedit/Makefile.am 2010-11-02 21:34:46 +0000
@@ -1,7 +1,7 @@
1PLUGIN_FILES = zeitgeist.gedit-plugin zeitgeist_plugin.py1PLUGIN_FILES = zeitgeist.gedit-plugin zeitgeist_plugin.py
22
3geditplugindir = $(libdir)/gedit-2/plugins3geditplugindir = $(libdir)/gedit-2/plugins
4geditplugin_DATA = $(PLUGIN_FILES)4dist_geditplugin_DATA = $(PLUGIN_FILES)
55
6# we want to allow also local install6# we want to allow also local install
7GEDIT_PLUGIN_HOME_DIR = ~/.gnome2/gedit/plugins7GEDIT_PLUGIN_HOME_DIR = ~/.gnome2/gedit/plugins
88
=== modified file 'rhythmbox/Makefile.am'
--- rhythmbox/Makefile.am 2010-06-07 19:50:44 +0000
+++ rhythmbox/Makefile.am 2010-11-02 21:34:46 +0000
@@ -1,7 +1,7 @@
1PLUGIN_FILES = zeitgeist.rb-plugin __init__.py1PLUGIN_FILES = zeitgeist.rb-plugin __init__.py
22
3rhythmboxplugindir = $(libdir)/rhythmbox/plugins/zeitgeist-plugin3rhythmboxplugindir = $(libdir)/rhythmbox/plugins/zeitgeist-plugin
4rhythmboxplugin_DATA = $(PLUGIN_FILES)4dist_rhythmboxplugin_DATA = $(PLUGIN_FILES)
55
6# we want to allow also local install6# we want to allow also local install
7RHYTHMBOX_PLUGIN_HOME_DIR = ~/.local/share/rhythmbox/plugins/zeitgeist-plugin7RHYTHMBOX_PLUGIN_HOME_DIR = ~/.local/share/rhythmbox/plugins/zeitgeist-plugin
88
=== modified file 'totem-libzg/Makefile.am'
--- totem-libzg/Makefile.am 2010-06-07 19:50:44 +0000
+++ totem-libzg/Makefile.am 2010-11-02 21:34:46 +0000
@@ -1,5 +1,5 @@
1totemplugindir = $(libdir)/totem/plugins/zeitgeist1totemplugindir = $(libdir)/totem/plugins/zeitgeist
2totemplugin_DATA = zeitgeist.totem-plugin2dist_totemplugin_DATA = zeitgeist.totem-plugin
3totemplugin_LTLIBRARIES = libtotem-zeitgeist-plugin.la3totemplugin_LTLIBRARIES = libtotem-zeitgeist-plugin.la
44
5AM_VALAFLAGS = \5AM_VALAFLAGS = \
@@ -16,7 +16,7 @@
16 $(ZEITGEIST_CFLAGS) \16 $(ZEITGEIST_CFLAGS) \
17 $(GTK_CFLAGS) \17 $(GTK_CFLAGS) \
18 $(TOTEM_PLPARSER_CFLAGS) \18 $(TOTEM_PLPARSER_CFLAGS) \
19 -I./headers \19 -I$(top_srcdir)/totem-libzg/headers \
20 $(NULL)20 $(NULL)
21 21
22libtotem_zeitgeist_plugin_la_LIBADD = \22libtotem_zeitgeist_plugin_la_LIBADD = \
@@ -26,6 +26,13 @@
26libtotem_zeitgeist_plugin_la_LDFLAGS = \26libtotem_zeitgeist_plugin_la_LDFLAGS = \
27 -module -avoid-version \27 -module -avoid-version \
28 $(NULL)28 $(NULL)
29
30EXTRA_DIST = \
31 $(top_srcdir)/totem-libzg/headers/totem.h \
32 $(top_srcdir)/totem-libzg/headers/totem-plugin.h \
33 $(top_srcdir)/totem-libzg/headers/totem-playlist.h \
34 $(top_srcdir)/totem-libzg/headers/bacon-video-widget.h \
35 $(NULL)
2936
3037
31# we want to allow also local install38# we want to allow also local install
3239
=== modified file 'vim/Makefile.am'
--- vim/Makefile.am 2010-06-29 20:40:15 +0000
+++ vim/Makefile.am 2010-11-02 21:34:46 +0000
@@ -1,7 +1,7 @@
1PLUGIN_FILES = zeitgeist.vim1PLUGIN_FILES = zeitgeist.vim
22
3vimplugindir = $(datadir)/vim/vim72/plugin3vimplugindir = $(datadir)/vim/vim72/plugin
4vimplugin_DATA = $(PLUGIN_FILES)4dist_vimplugin_DATA = $(PLUGIN_FILES)
55
6# we want to allow also local install6# we want to allow also local install
7VIM_PLUGIN_HOME_DIR = ~/.vim/plugin7VIM_PLUGIN_HOME_DIR = ~/.vim/plugin

Subscribers

People subscribed via source and target branches