-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2006-11-29 14:07:37 UTC
-
mfrom:
(3.1.1 etch)
-
Revision ID:
james.westby@ubuntu.com-20061129140737-zawfayjimoihkwdf
Tags: 1.2.5.dfsg-5ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
- debian/control: Demote python-imaging-tk dependency to Suggests: (it's
in universe).
- debian/scribus.desktop: Add X-Ubuntu-Gettext-Domain.
- Scribus.pot: Add strings from desktop file.