Merge lp:~gilir/policykit-1-gnome/fix-789333 into lp:~ubuntu-desktop/policykit-1-gnome/ubuntu

[Julien Lavergne]

Fix for bug 789333, see the bug report details.

[Martin Pitt (pitti)]

There are a bunch of GTK3 reverse depends: gnome-session, gnome-control-center, jockey-gtk. I know that the latter only talks to the daemon through D-BUS, and I suppose the other two do as well, I'll test these before merging.

[Martin Pitt (pitti)]

Works fine, thanks for fixing this!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-20 15:24:45 +0000
+++ debian/changelog	2011-08-19 12:17:39 +0000
@@ -1,3 +1,10 @@
+policykit-1-gnome (0.101-2ubuntu5) UNRELEASED; urgency=low
+
+  * debian/control, debian/rules: Build against GTK2, all reverse-depends still
+    use GTK2 (LP: #789333).
+
+ -- Julien Lavergne <[e-mail]>  Thu, 18 Aug 2011 20:22:40 +0200
+
 policykit-1-gnome (0.101-2ubuntu4) oneiric; urgency=low
 
   * debian/polkit-gnome-authentication-agent-1.desktop:
 
=== modified file 'debian/control'
--- debian/control	2011-05-16 13:15:25 +0000
+++ debian/control	2011-08-19 12:17:39 +0000
@@ -9,7 +9,7 @@
  pkg-config,
  dh-autoreconf,
  libdbus-glib-1-dev (>= 0.71),
- libgtk-3-dev,
+ libgtk2.0-dev (>= 2.17.1),
  libpolkit-agent-1-dev (>= 0.97),
  libpolkit-gobject-1-dev (>= 0.97),
  gtk-doc-tools (>= 1.3)
 
=== modified file 'debian/rules'
--- debian/rules	2011-05-16 14:46:12 +0000
+++ debian/rules	2011-08-19 12:17:39 +0000
@@ -9,7 +9,6 @@
 	dh_auto_configure -- \
 		--disable-examples \
 		--enable-gtk-doc \
-		--with-gtk=3.0 \
 		--disable-introspection
 
 override_dh_auto_test: