lp:~ari-tczew/ubuntu/utopic/brasero/merge

Created by Artur Rona and last modified
Get this branch:
bzr branch lp:~ari-tczew/ubuntu/utopic/brasero/merge
Only Artur Rona can upload to this branch. If you are Artur Rona please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Artur Rona
Status:
Merged

Recent 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_appindicator.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.

113. By Robert Ancell

* New upstream release:
  - Fixed drawing issues in media selection combo boxes
  - Fix several crashers
  - Fixes for new autotools
  - Disable audio normalisation - it's broken since GStreamer 1.0
* debian/libbrasero-media3-1.symbols:
  - Updated
* debian/patches/01_grafted_folders.patch:
* debian/patches/03_cue-invalid-frame-75.patch:
* debian/patches/04_tracker-0.16.patch:
* debian/patches/05_populate-tree-model-after-construction.patch:
  - Applied upstream

112. By Robert Ancell

No-change rebuild for libtotem-plparser18

111. By Phillip Susi

debian/patches/05_populate-tree-model-after-construction.patch:
backport upstream commit to fix drive selection not showing
up correctly (LP: #1237169).

110. By Jeremy Bícha

Fix configure flags from last upload

109. By Jeremy Bícha

* Sync with Debian. Remaining changes:
  - debian/control.in:
    + Build-Depend on libappindicator3-dev and libunity-dev
    + Don't build-depend on tracker
    + 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_appindicator.patch:
    + Use application indicators
    + And add symbols to libbrasero-media3-1.symbols
  - 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
* Bump breaks/replaces as we didn't take the brasero-cdkit split until now

108. By Matt Fischer

* New upstream release (LP: #1184409)
  - Documentation fixes
  - Translation updates
  - Add a question mark to a question
  - Support notification filtering
  - Remove nonexisting options from the man page
  - Fix while loop in `brasero_libisofs_write_image_to_fd_thread
* Refreshed patches
* 99_fix-mp3-projects.patch: Removed, already applied upstream

107. By Jeremy Bícha

* 99_fix-mp3-projects.patch:
  - Bugzilla patch to fix "not suitable for audio or video media"
    error when trying to create a mp3 audio project (LP: #1072151)

106. By Iain Lane

[ Iain Lane ]
* New upstream release 3.6.1.
  - Port to new documentation infrastructure
  - Port brasero to GStreamer 1.0
  - Add Desktop Actions for Unity
* debian/patches/011_static_quicklist.patch,
  debian/patches/git_burn_libisofs.patch: Remove, now upstream
* Refresh other patches
* Clean up duplicate libnotify-dev BD
* debian/rules: Fail when upstream files (except .la files) aren't installed

[ Robert Ancell ]
 * New upstream release (LP: #1052711)
 * debian/control:
   - Build-depend on yelp-tools instead of gnome-doc-utils
   - Use GStreamer 1.0 build-depends
 * debian/brasero-common.install:
   - Use new help location

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/utopic/brasero
This branch contains Public information 
Everyone can see this information.

Subscribers