Merge lp://staging/~noskcaj/ubuntu/vivid/banshee-community-extensions/merge into lp://staging/ubuntu/vivid/banshee-community-extensions
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~noskcaj/ubuntu/vivid/banshee-community-extensions/merge |
| Merge into: | lp://staging/ubuntu/vivid/banshee-community-extensions |
| Diff against target: |
2071 lines (+22/-1964) 11 files modified
.pc/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp (+0/-367) .pc/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch/src/Mirage/libmirageaudio/gst-mirageaudio.c (+0/-513) .pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/build/m4/extensions/lastfmfingerprint.m4 (+0/-44) .pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp (+0/-363) .pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint/liblastfmfpbridge/lastfmfpbridgetest.cpp (+0/-47) .pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/README (+0/-86) .pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/build/m4/extensions/mirage.m4 (+0/-38) .pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/src/Mirage/libmirageaudio/gst-mirageaudio.c (+0/-502) .pc/applied-patches (+0/-4) debian/changelog (+21/-0) debian/control (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/vivid/banshee-community-extensions/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian, dropping dbus#2 change since our banshee is still on version 1.
Makes the package function again. Ignore lp:1268331
To post a comment you must log in.
Unmerged revisions
- 33. By Jackson Doak
-
Use dbus#1 for the moment
- 32. By Jackson Doak
-
* Merge from Debian Unstable, remaining changes:
+ Enable AppIndicator extension
* [10ace16] Use DBus#2 API
* Rebuild against taglib-sharp 2.1
* [ef676d16] Add dependency against banshee 2.6.1-3 to sync taglib-sharp usage
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.