~ubuntu-branches/ubuntu/trusty/k3b/trusty

Viewing all changes in revision 107.

  • Committer: Package Import Robot
  • Author(s): Jonathan Thomas
  • Date: 2012-10-29 13:49:44 UTC
  • mfrom: (2.1.19 sid)
  • Revision ID: package-import@ubuntu.com-20121029134944-l93w1h62qzx5g3fi
Tags: 2.0.2-6ubuntu1
* 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: