-
Committer:
Chris Coulson
-
Date:
2011-01-27 15:41:52 UTC
-
mfrom:
(23.1.1 ubuntu)
-
Revision ID:
chrisccoulson@ubuntu.com-20110127154152-mv5wm2674yh4odo2
* Merge from debian unstable. Remaining changes: (LP: #708357)
- debian/control:
+ Build-Depends on gnome-common, needed for autotools in rules.
+ Bump build-depends on python-gnome2-dev.
+ Remove stray comma from python-gtk2 depends.
- debian/patches/01_xul19.patch:
+ Replaced with 01_xulrunner_ubuntu.patch, support xulrunner 2.0.
- debian/patches/04_use_PYTHON-config_check.patch:
+ Use python-config.
- debian/patches/70_autotools.patch:
+ Dropped, autotools now runs on build.
- debian/rules:
+ Run autotools on build.
+ Support xulrunner 2.0.
* 01_xulrunner_ubuntu.patch: Updated to get it more professionally.
* Patch from Micah Gersten to add missing dependency on xulrunner.
Closes: #609189.
* 06_gda_libpython.patch: don’t link the gda module with libpython.
* 70_autotools.patch: updated accordingly.