lp:ubuntu/vivid/k3b

Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/vivid/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
Status:
Mature

Recent revisions

111. By Jonathan Riddell

* Update headers in kubuntu_02_kubuntu_restricted.diff
* Fix K3B -> K3b typo in kubuntu_02_kubuntu_restricted.diff

110. By Scarlett Gately Moore

* Merge from Debian unstable. Remaining changes:
  - Suggest, not recommend libk3b6-extracodecs (Cannot be on the CD)
  - 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_01_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.
* New upstream release.
  - Remove patches applied upstream:
    Fixed_compilation_with_new_FFMPEG.patch
    114_bug587996_bdr_capacity_fix.diff
    k3bsetup-put-the-shebang-in-the-first-line.patch
    fix-sox-detection-with-sox-14.4.0.patch
    Fix-K3B-to-build-with-recent-FFMPEG-versions.patch
    Prefer-growisofs-to-wodim-for-DVD-BluRay-burning.patch
  - Remove patches that do not apply:
    k3bscsicommand_bsd-Do-not-access-the-scsi_sense_data.patch
    This was rewritten using switch case and this patch
    could not be applied in any way, if it is even required anymore.
    ffmpeg-more.diff
    Code was rewritten upstream and this patch could not be applied in
    any way.
  - Recreated kubuntu_05_no_system_settings.diff (could not get it
    to apply) as kubuntu_01_no_system_settings.diff and
    included DEP3 headers.
  - Added DEP3 Headers for the remain kubuntu_* patches.

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).

Branch metadata

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

Subscribers