-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2010-06-07 00:14:10 UTC
-
mfrom:
(13.1.5 maverick)
-
Revision ID:
james.westby@ubuntu.com-20100607001410-1asehz2hgc5gdk07
* Merge from Debian unstable, remaining changes:
* 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
* 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:
- Drop forcing of python2.5
- debian/control: bump Standards-Version to 3.8.3
- debian/compat: bump to 5
- debian/control: Depends on python-poppler (needed for printing)
- add debian/README.source
* Don't set debian/pyversions to 2.5, this is obviously wrong.