-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Riddell, Jonathan Thomas, Jonathan Riddell
-
Date:
2009-08-24 13:35:15 UTC
-
Revision ID:
james.westby@ubuntu.com-20090824133515-1hejw8jph7o321jk
Tags: 2:2.1.1orig-0ubuntu2
[ Jonathan Thomas ]
* Merge from Debian Unstable, remaining changes:
- Build-depend on cdbs
- Build-depend on libgpod-nogtk-dev | libgpod-dev
- Keep conflicts/replaces on amarok-kde4* packages
- Amarok replaces amarok-common (<< 2:2.1.1orig-0ubuntu2) 'til karmic+1
- amarok-common replaces mysql-server-data-5.1 until karmic+1
- Keep the following patches:
+ kubuntu_03_restricted_install.diff
+ kubuntu_04_gpod_compile.diff
[ Jonathan Riddell ]
* Build-dep on pkg-kde-tools 0.4.11ubuntu4 which has i18n support for
debhelper 7