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

Proposed by Micah Gersten on 2011-01-07
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp:~micahg/gnome-python-extras/maverick
Merge into: lp:~ubuntu-desktop/gnome-python-extras/maverick
Diff against target: 26 lines (+11/-0)
2 files modified
debian/changelog (+8/-0)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~micahg/gnome-python-extras/maverick
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2011-01-07 Pending
Review via email: mp+45520@code.launchpad.net

Description of the change

Have dh_xulrunner install a binary depends for python-gtkmozembed again

To post a comment you must log in.
Micah Gersten (micahg) wrote :

This is meant for maverick-proposed

Robert Ancell (robert-ancell) wrote :

Uploaded to maverick-proposed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-25 15:04:35 +0000
3+++ debian/changelog 2011-01-07 15:42:48 +0000
4@@ -1,3 +1,11 @@
5+gnome-python-extras (2.25.3-5ubuntu2.1) UNRELEASED; urgency=low
6+
7+ * Have dh_xulrunner install a dependency on xulrunner for python-gtkmozembed
8+ again (LP: #695728)
9+ - update debian/rules
10+
11+ -- Micah Gersten <micahg@ubuntu.com> Fri, 07 Jan 2011 09:21:14 -0600
12+
13 gnome-python-extras (2.25.3-5ubuntu2) maverick; urgency=low
14
15 * Don't call gtk_moz_embed_push_startup when the gtkmozembed module is
16
17=== modified file 'debian/rules'
18--- debian/rules 2010-06-11 06:42:20 +0000
19+++ debian/rules 2011-01-07 15:42:48 +0000
20@@ -18,3 +18,6 @@
21 DEB_CONFIGURE_EXTRA_FLAGS += \
22 --with-gtkmozembed=xulrunner-1.9 \
23 --enable-docs
24+
25+binary-predeb/python-gtkmozembed::
26+ dh_xulrunner -ppython-gtkmozembed

Subscribers

People subscribed via source and target branches

to all changes: