Zeitgeist Data-Sources

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

  1. debian
  2. Merge into debian
Proposed by Michal Hruby
Status: Superseded
Proposed branch: lp://staging/~gilir/zeitgeist-datasources/debian
Merge into: lp://staging/~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://staging/~gilir/zeitgeist-datasources/debian
Reviewer Review Type Date Requested Status
Siegfried Gevatter Needs Fixing
Manish Sinha (मनीष सिन्हा) build install Approve
Review via email: mp+52338@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2011-03-09.

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

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)
Revision history for this message
Siegfried Gevatter (rainct) wrote :

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
Revision history for this message
Michal Hruby (mhr3) wrote :

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. :)

Revision history for this message
Julien Lavergne (gilir) wrote :

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

lp://staging/~gilir/zeitgeist-datasources/debian updated
95. By Julien Lavergne

 - Update to use --with xul-ext.
 - Add ${xpi:Depends}, ${xpi:Recommends}, Provides: ${xpi:Provides} and
   ${xpi:Enhances} to xul-ext-zeitgeist-datasource.
 - Build-depends on mozilla-devscripts to use xpi rules.

96. By Julien Lavergne

Set build-depends xulrunner-dev (>= 1.9.2)

97. By Julien Lavergne

Update debian/rules
Remove debian/xul-ext-zeitgeist-datasource.install

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches