-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2010-11-30 09:38:22 UTC
-
mfrom:
(5.1.8 sid)
-
Revision ID:
james.westby@ubuntu.com-20101130093822-bnwig51n1ht0b9xn
Tags: 2.30.3-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
- debian/control.in:
+ Build-depend on dh-autoreconf, gnome-common
+ Add Vcs-Bzr link
- debian/rules:
+ Run autotools on build
+ Generate POT files on build
- debian/patches/01_gettext_not_xml.patch: Switch to using gettext to
- Switch to using gettext to
find localized names for locations, instead of shipping very large
locale-specific XML files with lots of duplicate information.
- debian/watch: Watch unstable series
* Add 02_gcc45_linking.patch: Fix building with gcc-4.5.
* debian/rules: Pass $(DEB_CONFIGURE_SCRIPT_ENV) as configure option, not
just as environment, since otherwise configure does not properly pick up
the PYTHON= variable and always builds with the default Python. Fixes
building of the python2.7 module.