-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Thomas
-
Date:
2010-02-08 16:38:36 UTC
-
mfrom:
(1.1.22 upstream)
(2.1.5 sid)
-
Revision ID:
james.westby@ubuntu.com-20100208163836-3iiu9xef2yzmfbmi
Tags: 1.70.0~beta1+svn1087124-0ubuntu1
* Merge with Debian Unstable, remaining changes:
- Do not add build-depend on libdvdread-dev
- Keep Kubuntu VCS entries
- Suggest, not recommend libk3b6-extracodecs
- Keep conflicts/replaces on older k3b versions
- 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
* New upstream svn snapshot:
- Depend on polkit-kde-1 or policykit-1-gnome instead of
kdebase-workspace-bin now that K3b Setup has been ported to KAuth which
uses Polkit-1 (LP: #459058)
- Remove dependency on libpolkit-qt-dev for the above
- Drop 114_fix_ftbfs_kfreebsd.diff and 113_add_kfreebsd_support.diff,
applied upstream
- Update .install files