-
Committer:
Bazaar Package Importer
-
Author(s):
Scott Kitterman, Tarun Kumar Mall, Philip Muškovac, Jordan Mantha, Scott Kitterman
-
Date:
2011-06-06 09:52:34 UTC
-
mfrom:
(1.2.59 upstream)
(2.1.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20110606095234-irh259ss48qs2ams
Tags: 4:4.6.3-1ubuntu1
[ Tarun Kumar Mall ]
* Removed patch kubuntu_03_kmix_pulseaudio_fixes.diff, applied
upstream
[ Philip Muškovac ]
* Update Vcs links as the branch is owned by kubuntu-packagers now
[ Jordan Mantha ]
* Merge from debian unstable. Remaining changes:
- Build-Depend on libtag-extras-dev to make juk read MP4 tags
- Suggest not recommend/depend ffmpegthumbs, mplayerthumbs in kdemultimedia
can't go on the DVD
- The mplayerthumbs package depends on mplayer or mplayer-nogui
- Don't link dragonplayer against xine. Drop libxine-dev from build-deps.
Don't run dh_xine.
[ Scott Kitterman ]
* Port to latest libav api, add debian/patches/kubuntu_libav0_7.diff
- Use AVMEDIA_TYPE_VIDEO instead of CODEC_TYPE_VIDEO