lp:ubuntu/utopic-proposed/k3b

Created by Ubuntu Package Importer and last modified
Get this branch:
bzr branch lp:ubuntu/utopic-proposed/k3b
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Development

Recent revisions

109. By Jonathan Riddell

Add -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF to fix compile LP: #1332591

108. By Jonathan Riddell

* Merge with Debian, remaining changes:
  - Suggest, not recommend libk3b6-extracodecs (Cannot be on the CD)
  - Do not ship k3b documentation, it's for the KDE3 version.
  - Do not install unused scalable icons to save space
  - Keep kubuntu_02_kubuntu_restricted.diff
  - Keep kubuntu_03_no_missing_mp3_warn.diff
  - Keep kubuntu_05_no_system_settings.diff
  - Keep kubuntu_07_quicklists.diff
  - Disable 111_advice_debian_libk3b3-extracodes.diff and
    112_dont_require_mp3.diff which aren't required due to our mp3 patches.
  - swap kubuntu_06_libav_0.7.diff for Debian's
    Fixed_compilation_with_new_FFMPEG.patch

107. By Jonathan Thomas

* Merge with Debian unstable, remaining changes:
  - Suggest, not recommend libk3b6-extracodecs (Cannot be on the CD)
  - Do not ship k3b documentation, it's for the KDE3 version.
  - Do not install unused scalable icons to save space
  - Keep kubuntu_02_kubuntu_restricted.diff
  - Keep kubuntu_03_no_missing_mp3_warn.diff
  - Keep kubuntu_05_no_system_settings.diff
  - Keep kubuntu_06_libav_0.7.diff and disable Debian's
    Fixed_compilation_with_new_FFMPEG.patch
  - Keep kubuntu_07_quicklists.diff
  - Disable 111_advice_debian_libk3b3-extracodes.diff and
    112_dont_require_mp3.diff which aren't required due to our mp3 patches.

106. By Jonathan Thomas

* Merge with Debian unstable, remaining changes:
  - Suggest, not recommend libk3b6-extracodecs (Cannot be on the CD)
  - Do not ship k3b documentation, it's for the KDE3 version.
  - Do not install unused scalable icons to save space
  - Keep kubuntu_02_kubuntu_restricted.diff
  - Keep kubuntu_03_no_missing_mp3_warn.diff
  - Keep kubuntu_05_no_system_settings.diff
  - Keep kubuntu_06_libav_0.7.diff and disable Debian's
    Fixed_compilation_with_new_FFMPEG.patch
  - Keep kubuntu_07_quicklists.diff
  - Disable 111_advice_debian_libk3b3-extracodes.diff and
    112_dont_require_mp3.diff which aren't required due to our mp3 patches.

105. By Jonathan Thomas

* Merge with Debian unstable, remaining changes:
  - Remove build depends on libdvdread-dev, libmusicbrainz4-dev from
    universe.
  - Suggest, not recommend libk3b6-extracodecs (multiverse)
  - Suggest, not recommend vcdimager (universe)
  - Disable the k3b-i18n package. Rosetta handles the translations since
    k3b is in main, and we aren't shipping docs at the moment for k3b
  - Do not install unused scalable icons to save space
  - Keep kubuntu_02_kubuntu_restricted.diff
  - Keep kubuntu_03_no_missing_mp3_warn.diff
  - Keep kubuntu_05_no_system_settings.diff
  - Keep kubuntu_06_libav_0.7.diff and disable Debian's
    Fixed_compilation_with_new_FFMPEG.patch
  - Keep kubuntu_07_quicklists.diff
  - Disable 111_advice_debian_libk3b3-extracodes.diff and
    112_dont_require_mp3.diff which aren't required due to our mp3 patches.

104. By Michael Terry

* debian/patches/kubuntu_07_quicklists.diff:
  - Add some quicklist actions. Patch by Graham Castleton.

103. By Scott Kitterman

Drop obsolete build-dep on libmusicbrainz4-dev (no longer supported by
musicbrainz)

102. By Matthias Klose

k3b: Drop vcdimager to a suggestion (universe).

101. By Jonathan Riddell

* Merge from Debian Unstable. Remaining Ubuntu changes:
  - Do not add build-depend on libdvdread-dev (universe)
  - Suggest, not recommend libk3b6-extracodecs (multiverse)
  - Do not install unused scalable icons to save space
  - Keep kubuntu_02_kubuntu_restricted.diff
  - Keep kubuntu_03_no_missing_mp3_warn.diff
  - Disable 111_advice_debian_libk3b3-extracodes.diff, the above two patches
    take care of this for us (without string changes, too)
  - Keep kubuntu_06_libav_0.7.diff port to libav 0.7 instead of
    Fixed_compilation_with_new_FFMPEG.patch
  - Disable 112_dont_require_mp3.diff, it causes the package to FTBFS
  - Keep Kubuntu l10n stuff in debian/rules
  - Don't ship docs, as of 2.0 they are not so good
  - Disable the k3b-i18n package. Rosetta handles the translations since
    k3b is in main, and we aren't shipping docs at the moment for k3b
  - Add kubuntu_05_no_system_settings.diff, no point putting it in
    system settings which you can configure it through the application
  - in k3b-data.install do not include k3b_videodvd_rip.desktop

100. By Harald Sitter

No-change rebuild to stop desktop file stripping (LP: #851953)

Branch metadata

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

Subscribers