Merge lp:~ari-tczew/ubuntu/utopic/brasero/merge into lp:ubuntu/utopic/brasero
Status: | Rejected |
---|---|
Rejected by: | Iain Lane |
Proposed branch: | lp:~ari-tczew/ubuntu/utopic/brasero/merge |
Merge into: | lp:ubuntu/utopic/brasero |
Diff against target: |
142 lines (+58/-6) 6 files modified
debian/changelog (+39/-0) debian/control (+3/-3) debian/control.in (+2/-2) debian/patches/01_tracker-1.0.patch (+13/-0) debian/patches/series (+1/-0) debian/rules (+0/-1) |
To merge this branch: | bzr merge lp:~ari-tczew/ubuntu/utopic/brasero/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Sponsors | Pending | ||
Review via email: mp+221300@code.launchpad.net |
Unmerged revisions
- 115. By Artur Rona
-
Fix merge Debian revision 3.8.0-2.
- 114. By Artur Rona
-
* Merge from Debian unstable. Remaining changes:
- debian/control{ .in}:
+ Build-Depends on libappindicator3-dev and libunity-dev.
+ Don't {Build-}Depends on Tracker.
+ brasero Recommends: brasero-cdrkit.
+ libbrasero-media3-1 Depend on dvd+rw-tools and
Suggest rather than Recommend gstreamer plugins & cdrdao
+ Also suggest gstreamer fluendo mp3 plugin
+ Have brasero-cdrkit Suggest, not Recommend, dvdauthor as it isn't
in main.
- debian/patches/ 012_appindicato r.patch,
debian/libbrasero- media3- 1.symbols:
+ Use application indicators.
- debian/patches/ 013_unity_ launcher_ progress:
+ Display burn progress in Brasero's Unity launcher icon.
- debian/rules:
+ Don't build search (requires Tracker) but build Unity support.
* New upstream release.
* Remove patches, all merged upstream.
* Switch to tracker 1.0. (Closes: #741428)
* Update symbols file, add new brasero_utils_get_ option_ group symbol.
* Bump Standards-Version to 3.9.5. No further changes.
* Drop obsolete --disable-scrollkeeper configure flag.
* Build against tracker 0.16.
Thanks, we'll take the ubuntu-desktop merge as this is the branch that we use