~ubuntu-branches/ubuntu/natty/gourmet/natty

Viewing all changes in revision 15.

  • Committer: Bazaar Package Importer
  • Author(s): Stefano Rivera
  • Date: 2010-10-17 20:26:17 UTC
  • mfrom: (2.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20101017202617-qhc1yedaiptygdou
Tags: 0.15.6-1ubuntu1
* Merge from Debian unstable (LP: #618643), remaining changes:
  - debian/patches/03_dont_remove_nonexistent_plugin.patch: don't remove an
    inactive plugin in plugin_loader.py and don't deactivate a plugin from a
    non-existent database
* Dropped changes, superseded in Debian:
  - debian/control:
    + Recommend python-gtkspell for printing
  - debian/patches/01_fix_raise_str.patch: don't raise str exception
    in src/lib/plugin_gui.py
  - Don't set debian/pyversions to 2.5, this is obviously wrong.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: