~ubuntu-branches/ubuntu/vivid/moin/vivid

Viewing all changes in revision 37.

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-11-23 09:18:37 UTC
  • mfrom: (0.1.30 sid)
  • Revision ID: package-import@ubuntu.com-20121123091837-4u12h753y8jpm6s5
Tags: 1.9.5-1ubuntu1
* Merge from Debian unstable (LP: #1046616). 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: fckeditor has a
   number of security problems and so this change probably needs to be
   carried indefinitely.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: