Merge ~khurshid-alam/ubuntu/+source/rhythmbox:master into ~ubuntu-desktop/ubuntu/+source/rhythmbox:ubuntu/master

Proposed by Khurshid Alam
Status: Needs review
Proposed branch: ~khurshid-alam/ubuntu/+source/rhythmbox:master
Merge into: ~ubuntu-desktop/ubuntu/+source/rhythmbox:ubuntu/master
Diff against target: 238 lines (+198/-0)
4 files modified
debian/control (+3/-0)
debian/control.in (+3/-0)
debian/patches/series (+1/-0)
debian/patches/zeitgeist-Use-zeitgeist-via-Gobject-introspection.patch (+191/-0)
Reviewer Review Type Date Requested Status
Jeremy Bícha Needs Fixing
Review via email: mp+362491@code.staging.launchpad.net

Commit message

Port zeitgeist plugin to Python3

Zeitgeist already provides python bindings. Convert them to python3 and use them in rbzeitgeist plugin. That way we can avoid using gir bindings and various manual mappings from zeitgeist interpretation to string. Fixes LP: #1813813

To post a comment you must log in.
Revision history for this message
fossfreedom (fossfreedom) wrote :

I know I am not a reviewer ...

From a quick look it seems like a good conversion.

Given that no one uses this plugin other than Unity wouldn't this be a good opportunity to split the plugin into its own package? This would align more to the current Debian rhythmbox package that no longer ships zeitgeist and reduce the overhead of ubuntu specific patches.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

@fossfreedom

Perhaps so. But that means finding a repo, work on makefile etc which will take more time. I would appreciate some help regarding this.

Meanwhile this can go into disco and perhaps @jbicha can merge it back on debian.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

@fossfreedom Also synapse used to use it. Though I don't know if they still uses but their zeitgeist plugin should still work as the there hasn't been any API change for zeitgeist in recent years.

Revision history for this message
Jeremy Bícha (jbicha) wrote :

Debian might accept our rhythmbox-plugin-zeitgeist package once we get the plugin working.

I would normally expect something like this to be forwarded to https://gitlab.gnome.org/GNOME/rhythmbox/merge_requests

Are you aware of this comment from the zeitgeist Debian changelog?
https://tracker.debian.org/news/939461/accepted-zeitgeist-101-02-source-amd64-all-into-unstable/

  "Drop python3-zeitgeist package as the binding is not compatible with
  python3, for python3, GIR binding should be used instead. Reintroduce the
  python2 binding for now as we still have one rdependency"

Maybe those extra files you added should be shipped by the zeitgeist package instead?

Maybe Ricotz has some time to help review what you're trying to do here.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

@jbicha

Ah. Right. It has already been ported. See https://gitlab.gnome.org/GNOME/rhythmbox/merge_requests/18/

Perhaps you could cherry pick the merge into debian and then it can re-sync into Ubuntu ?

Force pushed with author's commit.

And it's working. I checked.

Revision history for this message
Jeremy Bícha (jbicha) wrote :

Khurshid, have you ever used git-buildpackage's patch-queue feature (gbp pq)?

https://wiki.ubuntu.com/DesktopTeam/git#Pick_some_upstream_commits
https://manpages.debian.org/unstable/gbp-pq

Specifically, we don't edit upstream directly, but we use debian/patches/ so gbp pq helps create and modify those patches.

review: Needs Fixing
Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

Never used gbp-pq, but trying now.

Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

I simply added the patch with gbp pq and modify debian/control. I left updating changelog, because I never do that for other upstream merge.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

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

to all changes: