Viewing all changes in revision 34.
- Committer: Bazaar Package Importer
- Date: 2010-08-11 12:35:34 UTC
- mfrom: (0.1.19 sid)
- Revision ID: james.westby@ubuntu.com-20100811123534-q8zu7qrwqul6cvec
* Merge from Debian unstable (LP: #586518). 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: fckeditor has a
   number of security problems and so this change probably needs to be
   carried indefinitely.
  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.
- files added:
- MoinMoin/script/import/wikipage.py
- MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_scayt
- files removed:
- .pc/CVE-2010-0828.patch
- .pc/CVE-2010-0828.patch/MoinMoin
- .pc/CVE-2010-0828.patch/MoinMoin/action
- .pc/ubuntu_use_embedded_for_main.patch
- debian/cdbs
- debian/cdbs/1
- debian/cdbs/1/rules
- files modified:
- .pc/applied-patches
- MoinMoin/web/static/htdocs/applets/FCKeditor/editor/_source/commandclasses/fckremoveformatcommand.js
- MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/browser/default/frmactualfolder.html
- MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/browser/default/frmcreatefolder.html
expand all
collapse all
added
removed
