-
Committer:
Package Import Robot
-
Author(s):
Jamie Strandboge
-
Date:
2013-01-03 10:58:34 UTC
-
mfrom:
(0.1.32 sid)
-
Revision ID:
package-import@ubuntu.com-20130103105834-wjn21r89xk8jcbfh
Tags: 1.9.5-4ubuntu1
* Merge from Debian unstable. Remaining changes:
- debian/rules: remove python-xml from CDBS_SUGGESTS field, the package
isn't in sys.path any more.
- debian/rules: demote fckeditor from CDBS_RECOMMENDS to CDBS_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:
fckeditor has a number of security problems and so this change probably
needs to be carried indefinitely.
* Dropped the following patches, no longer needed:
- debian/patches/CVE-2012-XXXX.patch
- debian/patches/CVE-2012-YYYY.patch