-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Thomas, Jonathan Thomas, Michał Zając, Philip Muškovac
-
Date:
2011-05-30 16:52:59 UTC
-
mfrom:
(1.1.60 upstream)
(0.1.15 sid)
-
Revision ID:
james.westby@ubuntu.com-20110530165259-i29f9ezfmqwteikq
Tags: 4:4.6.3-1ubuntu1
[ Jonathan Thomas ]
* Merge with Debian Unstable, remaining changes:
- Keep bumped replace/conflicts versions where necessary
- Do not re-add optional, unsatisfiable kdesktop dependency for libkonq5a
- Suggest instead of recommend ruby in dolphin
- Reduce the x-www-browser priority for konqueror to 30 as rekonq is the
default Kubuntu browser.
[ Michał Zając ]
* New upstream release
- Bump on kde-sc-dev-latest
[ Philip Muškovac ]
* Update Vcs links as the branch is owned by kubuntu-packagers now