-
Committer:
Bazaar Package Importer
-
Author(s):
Alessandro Ghersi
-
Date:
2009-05-26 03:38:19 UTC
-
Revision ID:
james.westby@ubuntu.com-20090526033819-y7o0ser2gckatu5w
Tags: 1:0.11.1a-1ubuntu1
* Merge with debian unstable (LP: #380449), remaining changes:
- drop cmake from build-deps
- add kmplayer-base transitional package
- add kmplayer.install
- conflicts kmplayer-base << 1:0.11.1a-1ubuntu1
- debian/rules: use '/usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk'
instead '/usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk'
- debian/watch: we don't need to run 'debian svn-upgrade'