-
Committer:
Bazaar Package Importer
-
Author(s):
Jamie Strandboge
-
Date:
2010-03-30 12:55:34 UTC
-
mfrom:
(0.1.17 sid)
-
Revision ID:
james.westby@ubuntu.com-20100330125534-4c2ufc1rok24447l
Tags: 1.9.2-2ubuntu1
* Merge from Debian testing (LP: #521834). Based on work by Stefan Ebner.
Remaining changes:
- Remove python-xml from Suggests field, the package isn't anymore in
sys.path.
- Demote fckeditor from Recommends to Suggests; the code was previously
embedded in moin, but it was also disabled, so there's no reason for us
to pull this in by default currently. Note: This isn't necessary anymore
but needs a MIR for fckeditor, so postpone dropping this change until
lucid+1
* debian/rules:
- Replace hardcoded python2.5 with python* and hardcore python2.6 for ln
* debian/control.in: drop versioned depends on cdbs