-
Committer:
Jonathan Thomas
-
Date:
2012-05-20 18:10:43 UTC
-
Revision ID:
echidnaman@kubuntu.org-20120520181043-taoafltlhvhqywj4
Tags: 2.0.2-4ubuntu1
* 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.
* debian/patches/kubuntu_07_quicklists.diff:
- Add some quicklist actions. Patch by Graham Castleton.
* Team upload.
* Add k3bscsicommand_bsd-Do-not-access-the-scsi_sense_data.patch (backported
from upstream branch 2.0) to fix compatibility with FreeBSD >= 9.0
libraries. (Closes: #660398)
* Update patch 101_rename_normalize.diff to properly consider "normalize"
the identifier to use for the normalize-audio version (thus fixing the
normalize-audio detection). (Closes: #597155)
* Add k3bsetup-put-the-shebang-in-the-first-line.patch (backported from
upstream) to fix the detection of k3bsetup as shell script.
* control: remove ${shlibs:Depends} from k3b-data and k3b-extrathemes.
* Drop obsolete build-dep on libmusicbrainz4-dev (no longer supported by
musicbrainz)
* k3b: Drop vcdimager to a suggestion (universe).
* 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
* Add Fixed_compilation_with_new_FFMPEG.patch. (Closes: #638546)
* Update debian/control: fix hardcoded list of kFreeBSD architectures.
(Closes: 634736)
* Update debian/rules: turn off HAL support using K3B_ENABLE_HAL_SUPPORT=OFF.
* Add libqtwebkit-dev build dependency. (Closes: #618170)
* Fix lintian warning: description-synopsis-starts-with-article.
* Update debian/k3b-data.install: add HTML doc.
* New upstream release.
* Turn off HAL support by default - patch cherry-picked upstream.
* Drop hal dependency.
* Update debian/k3b-data.install file.
* Acknowledge NMU (closes: #486112)
* k3b: Add a versioned dependency on libk3b3 (closes: #486093)
* Non-maintainer upload, acked by uploader Fathi Boudra.
* Add various missing replaces. (Closes: #486112)
* Moved changes in file src/k3b.desktop to a patch under debian/patches.
* Sync with Ubuntu
- Add kfile_k3b.so to k3b.install
- libk3b3-extracodecs replaces libk3b2-extracodecs
* Bump Standards-Version up to 3.8.0 (no changes)
* Remove the KUBUNTU difference file