Merge lp:~charlesk/indicator-session/lp-1085100 into lp:indicator-session/13.04

[Charles Kerr]

i-session doesn't use polkit or packagekit anymore, so don't refer to them in configure.ac or debian/*.

i-session doesn't use polkit or packagekit anymore, so don't refer to them in configure.ac or debian/*.

[Mathieu Trudel-Lapierre (cyphermox)]

Seems fine if it's indeed not used anymore.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:382
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=amd64/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./build=pbuilder,distribution=raring,flavor=i386/39/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/39//rebuild/?

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2012-11-29 22:09:57 +0000
+++ configure.ac	2012-11-30 16:35:26 +0000
@@ -30,7 +30,6 @@
 GTK_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.19
 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
-POLKIT_REQUIRED_VERSION=0.92
 DBUSTEST_REQUIRED_VERSION=0.0.5
 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
 
@@ -47,8 +46,7 @@
                                   dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
                                   dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
                                   gio-unix-2.0
-                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                                  packagekit-glib2)
+                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION)
 AC_SUBST(SESSIONERVICE_CFLAGS)
 AC_SUBST(SESSIONERVICE_LIBS)
 
@@ -60,14 +58,15 @@
 ###########################
 
 AC_ARG_ENABLE([gtklogouthelper],
-            AS_HELP_STRING([--enable-gtklogouthelper], [enable GTK Logout Helper]),,
-            enable_gtklogouthelper=auto)
+              [AS_HELP_STRING([--enable-gtklogouthelper], [enable GTK Logout Helper])],
+              [],
+              [enable_gtklogouthelper=auto])
 
 if test x"$enable_gtklogouthelper" != x"no" ; then
-   PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK_REQUIRED_VERSION
-                                      polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
-	                              [have_gtklogouthelper=yes],
-	                              [have_gtklogouthelper=no])
+   PKG_CHECK_MODULES([GTKLOGOUTHELPER],
+                     [gtk+-3.0 >= $GTK_REQUIRED_VERSION],
+                     [have_gtklogouthelper=yes],
+                     [have_gtklogouthelper=no])
    if test x${have_gtklogouthelper} = xyes; then
       AC_DEFINE(HAVE_GTKLOGOUTHELPER, 1, [Define to 1 to enable GTK Logout Helper])
    fi
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-11-30 11:03:09 +0000
+++ debian/changelog	2012-11-30 16:35:26 +0000
@@ -11,6 +11,9 @@
     - Add libgtest-dev, libdbustest1-dev, dbus-test-runner to Build-Depends.
     - Adjust style to be consistent and use trailing commas in lists. 
     - Update Vcs-Bzr and Vcs-Browser fields and add notice for uploaders.
+    - Remove libpackagekit-glib2-dev and libpolkit-gobject-1-dev
+      from Build-Depends. (LP: #1085100)
+    - Remove packagekit from Recommends
   * Automatic snapshot from revision 373 (bootstrap):
     - Check to make sure that create_display_proxy() succeeded before using the
       proxy pointer that gets returned. (LP: #1078119)
 
=== modified file 'debian/control'
--- debian/control	2012-11-30 11:03:09 +0000
+++ debian/control	2012-11-30 16:35:26 +0000
@@ -16,8 +16,6 @@
                libindicator3-dev (>= 0.3.90),
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
-               libpackagekit-glib2-dev,
-               libpolkit-gobject-1-dev,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-session
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -33,7 +31,6 @@
          upower,
          gnome-settings-daemon,
 Recommends: indicator-applet (>= 0.2) | indicator-renderer, 
-            packagekit-system-interface | packagekit,
 Suggests: lightdm
 Description: indicator showing session management, status and user switching
  This indicator is designed to be placed on the right side of a panel and