Merge lp:~gilir/zeitgeist-datasources/debian into lp:~zeitgeist-dataproviders/zeitgeist-datasources/debian

Proposed by Julien Lavergne on 2011-03-09
Status: Merged
Merged at revision: 95
Proposed branch: lp:~gilir/zeitgeist-datasources/debian
Merge into: lp:~zeitgeist-dataproviders/zeitgeist-datasources/debian
Diff against target: 110 lines (+50/-18) (has conflicts)
4 files modified
debian/changelog (+19/-0)
debian/control (+18/-15)
debian/rules (+13/-1)
debian/zeitgeist-datasource-firefox.install (+0/-2)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~gilir/zeitgeist-datasources/debian
Reviewer Review Type Date Requested Status
Siegfried Gevatter 2011-03-09 Approve on 2011-03-23
Manish Sinha (मनीष सिन्हा) build install 2011-03-09 Pending
Review via email: mp+52768@code.launchpad.net

This proposal supersedes a proposal from 2011-03-06.

To post a comment you must log in.

I checked the deb given by ~mhr3 in this link[1] which is built using this branch. Works fine

[1] - https://launchpad.net/~gilir/+archive/unstable/+files/xul-ext-zeitgeist-datasource_0.1.0%7Ebzr20110210-0%7Eppa1_amd64.deb

review: Approve (build install)
Siegfried Gevatter (rainct) wrote : Posted in a previous version of this proposal

Thank you for working on this. A couple comments:

a) I don't like uploading any new CDBS packages. According to http://wiki.debian.org/mozilla-devscripts it seems like dh7 should work too.

b) This is failing to build on my system (Debian unstable):
-------------------------------------------------------
make[4]: Entering directory `/home/rainct/Desenvolupament/Packaging_Debian/zeitgeist-datasources/build-area/zeitgeist-datasources-0.1.0~bzr20110307/firefox-libzg/extension/components'
ln -s "`/usr/bin/pkg-config --variable includedir zeitgeist-1.0`/zeitgeist-1.0/zeitgeist.h" zeitgeist-library.h
/usr/lib/xulrunner-devel-1.9.1/bin/xpidl -m header -I /usr/share/idl/xulrunner-1.9.1 -o zeitgeist zeitgeist.idl
./zeitgeist.idl:25: can't open included file nsISupports.idl for reading

input callback returned failure
make[4]: *** [zeitgeist.h] Error 2
-------------------------------------------------------

review: Needs Fixing
Michal Hruby (mhr3) wrote : Posted in a previous version of this proposal

As for > b) This is failing to build on my system (Debian unstable):

This would be a build system issue, but looking that you're using xul 1.9.1, that's for FF 3.5 which is quite old now, let's say we only support FF 3.6 and therefore xul 1.9.2. :)

Julien Lavergne (gilir) wrote : Posted in a previous version of this proposal

Cool ! I wasn't aware dh7 have support for xul extension. I'll try to update the branch later with the fix.

Siegfried Gevatter (rainct) wrote :

Awesome, thanks for working on this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-07 14:11:29 +0000
3+++ debian/changelog 2011-03-09 21:58:58 +0000
4@@ -1,4 +1,23 @@
5+<<<<<<< TREE
6 zeitgeist-datasources (0.1.0~bzr20110307-1) unstable; urgency=low
7+=======
8+zeitgeist-datasources (0.1.0~bzr20110210-0~ppa1) UNRELEASED; urgency=low
9+
10+ * debian/rules:
11+ - Update to use --with xul-ext.
12+ * debian/control:
13+ - Enable xul-ext-zeitgeist-datasource
14+ - Add ${xpi:Depends}, ${xpi:Recommends}, Provides: ${xpi:Provides} and
15+ ${xpi:Enhances} to xul-ext-zeitgeist-datasource.
16+ - Build-depends on mozilla-devscripts to use xpi rules.
17+ - Set build-depends xulrunner-dev (>= 1.9.2)
18+ * debian/xul-ext-zeitgeist-datasource.install
19+ - Remove
20+
21+ -- Julien Lavergne <gilir@ubuntu.com> Sun, 06 Mar 2011 17:47:28 +0100
22+
23+zeitgeist-datasources (0.1.0~bzr20101102-0~ppa1) experimental; urgency=low
24+>>>>>>> MERGE-SOURCE
25
26 * Initial packaging (Closes: #617247).
27 Thanks to Frederic Brin for the initial work on this package.
28
29=== modified file 'debian/control'
30--- debian/control 2010-11-03 10:43:13 +0000
31+++ debian/control 2011-03-09 21:58:58 +0000
32@@ -3,10 +3,11 @@
33 Priority: optional
34 Maintainer: Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
35 Build-Depends: debhelper (>= 7.0.50~),
36+ mozilla-devscripts (>= 0.22~),
37 libzeitgeist-dev,
38 libgtk2.0-dev,
39 valac (>= 0.7.10),
40- xulrunner-dev,
41+ xulrunner-dev (>= 1.9.2),
42 libtotem-plparser-dev,
43 geany,
44 emacs
45@@ -46,20 +47,22 @@
46 # This package contains an extension for the Chromium browser that will
47 # log events such as page visits into Zeitgeist.
48
49-#Package: xul-ext-zeitgeist-datasource
50-#Architecture: any
51-#Depends: ${shlibs:Depends}, ${misc:Depends}, zeitgeist-core, libzeitgeist-1.0-0, iceweasel | firefox
52-#Enhances: zeitgeist-core, iceweasel, firefox
53-#Description: Zeitgeist Dataprovider for Firefox
54-# Zeitgeist is a service which logs the user's activities and events (files
55-# opened, websites visited, conversations hold with other people, etc.) and
56-# makes the relevant information available to other applications.
57-# .
58-# It serves as a comprehensive activity log and also makes it possible to
59-# determine relationships between items based on usage patterns.
60-# .
61-# This package contains an extension for Firefox/Iceweasel that will log events
62-# such as page visits into Zeitgeist.
63+Package: xul-ext-zeitgeist-datasource
64+Architecture: any
65+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xpi:Depends}, zeitgeist-core, libzeitgeist-1.0-0, iceweasel | firefox
66+Recommends: ${xpi:Recommends}
67+Provides: ${xpi:Provides}
68+Enhances: zeitgeist-core, iceweasel, firefox, ${xpi:Enhances}
69+Description: Zeitgeist Dataprovider for Firefox
70+ Zeitgeist is a service which logs the user's activities and events (files
71+ opened, websites visited, conversations hold with other people, etc.) and
72+ makes the relevant information available to other applications.
73+ .
74+ It serves as a comprehensive activity log and also makes it possible to
75+ determine relationships between items based on usage patterns.
76+ .
77+ This package contains an extension for Firefox/Iceweasel that will log events
78+ such as page visits into Zeitgeist.
79
80 Package: zeitgeist-datasource-emacs
81 Architecture: all
82
83=== modified file 'debian/rules'
84--- debian/rules 2010-10-30 15:08:50 +0000
85+++ debian/rules 2011-03-09 21:58:58 +0000
86@@ -1,4 +1,16 @@
87 #!/usr/bin/make -f
88
89 %:
90- dh $@
91+ dh $@ --with xul-ext
92+
93+override_dh_auto_build:
94+ dh_auto_build
95+ xpi-pack $(CURDIR)/firefox-libzg/extension/ xul-ext-zeitgeist-datasource.xpi
96+
97+override_dh_auto_install:
98+ dh_auto_install
99+ install-xpi -pxul-ext-zeitgeist-datasource xul-ext-zeitgeist-datasource.xpi
100+
101+override_dh_auto_clean:
102+ dh_auto_clean
103+ rm -f *.xpi
104
105=== removed file 'debian/zeitgeist-datasource-firefox.install'
106--- debian/zeitgeist-datasource-firefox.install 2010-11-02 22:58:46 +0000
107+++ debian/zeitgeist-datasource-firefox.install 1970-01-01 00:00:00 +0000
108@@ -1,2 +0,0 @@
109-usr/share/mozilla/extensions
110-usr/share/xul-ext-zeitgeist

Subscribers

People subscribed via source and target branches