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

Viewing all changes in revision 84.

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-05-31 09:23:36 UTC
  • mfrom: (2.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100531092336-2190hc4msrxz721j
Tags: 1.92.0~rc3-1ubuntu1
* Merge with Debian unstable, remaining changes:
  - Do not add build-depend on libdvdread-dev
  - Suggest, not recommend libk3b6-extracodecs
  - 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)
  - 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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: