Merge lp:~micahg/gnome-python-extras/maverick into lp:~ubuntu-desktop/gnome-python-extras/maverick

[Micah Gersten]

Have dh_xulrunner install a binary depends for python-gtkmozembed again

[Micah Gersten (micahg)]

This is meant for maverick-proposed

[Robert Ancell (robert-ancell)]

Uploaded to maverick-proposed

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-25 15:04:35 +0000
+++ debian/changelog	2011-01-07 15:42:48 +0000
@@ -1,3 +1,11 @@
+gnome-python-extras (2.25.3-5ubuntu2.1) UNRELEASED; urgency=low
+
+  * Have dh_xulrunner install a dependency on xulrunner for python-gtkmozembed
+    again (LP: #695728)
+    - update debian/rules 
+
+ -- Micah Gersten <[e-mail]>  Fri, 07 Jan 2011 09:21:14 -0600
+
 gnome-python-extras (2.25.3-5ubuntu2) maverick; urgency=low
 
   * Don't call gtk_moz_embed_push_startup when the gtkmozembed module is

=== modified file 'debian/rules'
--- debian/rules	2010-06-11 06:42:20 +0000
+++ debian/rules	2011-01-07 15:42:48 +0000
@@ -18,3 +18,6 @@
 DEB_CONFIGURE_EXTRA_FLAGS +=				\
 		--with-gtkmozembed=xulrunner-1.9	\
 		--enable-docs
+
+binary-predeb/python-gtkmozembed::
+	dh_xulrunner -ppython-gtkmozembed