gedit

Merge lp://qastaging/~manishsinha/gedit/enable-zeitgeist-datasource-plugin into lp://qastaging/~ubuntu-desktop/gedit/ubuntu

  1. enable-zeitgeist-datasource-plugin
  2. Merge into ubuntu
Status: Merged
Merged at revision: 85
Proposed branch: lp://qastaging/~manishsinha/gedit/enable-zeitgeist-datasource-plugin
Merge into: lp://qastaging/~ubuntu-desktop/gedit/ubuntu
Diff against target: 62 lines (+15/-4)
3 files modified
debian/changelog (+7/-0)
debian/control (+4/-2)
debian/control.in (+4/-2)
To merge this branch: bzr merge lp://qastaging/~manishsinha/gedit/enable-zeitgeist-datasource-plugin
Reviewer Review Type Date Requested Status
Jeremy Bícha Approve
Review via email: mp+80561@code.qastaging.launchpad.net

Commit message

Append libzeitgeist-dev as build-depends and libzeitgeist-1.0-1 as gedit dependency to enable zeitgeist-dataprovider plugin

Description of the change

Append libzeitgeist-dev as build-depends and libzeitgeist-1.0-1 as gedit dependency to enable zeitgeist-dataprovider plugin

To post a comment you must log in.
Revision history for this message
Jeremy Bícha (jbicha) wrote :

Thank you! I've merged this into our packaging branch but I think we should figure out whether to enable this by default before we push a package update.

review: Approve
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Some additional comment on the merge req (same for the totem one that has been merged as well):
+ libzeitgeist-1.0-1
-> this isn't needed and in addition, should be avoided at soon as possible. You are forcing a dependency on a versionned libzeitgeist soname, which means that if we have a new libzeitgeist, we need to change the gedit packaging (and all other packages depending on libzeitgeist, which will be a lot). Basically we just rebuild them.
libzeitgeist-1.0-1 (>= 0.3.2) is automatically added by dh_shlibdeps which expands ${shlibs:Depends}, and replace with library dependencies.

I fixed it directly in gedit upload and going to fix totem as well. If you want more info on that, please use man dh_shlibdeps ;)

I activated the plugin by default as well.
Thanks for your work there!

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