-
Committer:
Bazaar Package Importer
-
Author(s):
Kees Cook
-
Date:
2009-12-23 15:38:43 UTC
-
mfrom:
(1.1.11 upstream)
(2.2.5 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20091223153843-rjy20s7ea3jxp0q5
Tags: 0.47.0-1ubuntu1
* Merge with Debian testing (LP: #498150). Remaining changes:
- debian/control:
- promote python-lxml, python-numpy, python-uniconvertor to Recommends.
- demote pstoedit to Suggests (universe package).
- drop libssl-dev, no longer needed (Debian bug 484527).
- debian/rules:
- Handle parallel builds via -j (Debian bug 562226).
- Run intltool-update on build (Ubuntu-specific).
- Add translation domain to .desktop files (Ubuntu-specific).
- debian/watch:
- Correctly handle "pre" versions (Debian bug 562225).
* 50-poppler-API.patch, debian/control: poppler 0.12.2 changed the
GfxColorSpace API (LP: #487038).