~ubuntu-branches/ubuntu/natty/moin/natty-security

« back to all changes in this revision

Viewing changes to debian/patches/use_systemwide_libs.patch

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2010-08-11 12:35:34 UTC
  • mfrom: (0.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20100811123534-q8zu7qrwqul6cvec
Tags: 1.9.3-1ubuntu1
* 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
Last-Update: 2009-12-01
7
7
--- a/setup.py
8
8
+++ b/setup.py
9
 
@@ -307,19 +307,20 @@ Topic :: Text Processing :: Markup""".splitlines(),
 
9
@@ -307,19 +307,20 @@
10
10
         'MoinMoin.security',
11
11
         'MoinMoin.stats',
12
12
         'MoinMoin.support',