-
Committer:
Bazaar Package Importer
-
Author(s):
Philip Muškovac, Philip Muškovac, Felix Geyer
-
Date:
2011-06-07 00:52:20 UTC
-
mfrom:
(0.1.12 sid)
-
Revision ID:
james.westby@ubuntu.com-20110607005220-vvxuceku1xegr73s
Tags: 4:4.6.3-1ubuntu1
[ Philip Muškovac ]
* Merge from debian. Remaining changes:
- Keep our patch
- Add debian/xinput folder
- Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
plasma-widget-kimpanel-backend-ibus
- plasma-wallpapers-addons depends on plasma-dataengines-workspace,
kdewallpapers, kdebase-workspace-wallpapers
- Add plasma-widget-kimpanel-backend-ibus.{install, postinst, prerm}
- Don't install kimpanel in plasma-widget-addons
- Build against libboost1.46-dev
- plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
plasma-widgets-addons (<< 4:4.4.60)
- plasma-widgets-addons suggests plasma-widget-lancelot instead of
recommends
- plasma-widgets-addons Breaks/Replaces plasma-widget-system-status
- Build-depend on shared-mime-info and libglib2.0-dev
* Update Vcs- links as the branch is now owned by kubuntu-packagers
[ Felix Geyer ]
* Add python to plasma-widget-kimpanel-backend-ibus dependencies.