aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-11-30 17:29:09 +0000
committerTarmac <Unknown>2012-11-30 17:29:09 +0000
commit7b3703e6ed6bec9f2880a4b40371551077314430 (patch)
treee5503e13d2b8c9a217b99b17e5b766573fe001ae
parent355e2614158629582092c1cd4779419ffaa6dcff (diff)
parent434e53697c99fbe7070671855b7fef97ca7499bc (diff)
downloadayatana-indicator-session-7b3703e6ed6bec9f2880a4b40371551077314430.tar.gz
ayatana-indicator-session-7b3703e6ed6bec9f2880a4b40371551077314430.tar.bz2
ayatana-indicator-session-7b3703e6ed6bec9f2880a4b40371551077314430.zip
i-session doesn't use polkit or packagekit anymore, so don't refer to them in configure.ac or debian/*. Fixes: https://bugs.launchpad.net/bugs/1085100.
Approved by PS Jenkins bot, Mathieu Trudel-Lapierre.
-rw-r--r--configure.ac17
-rw-r--r--debian/changelog3
-rw-r--r--debian/control3
3 files changed, 11 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 390f091..aeff7d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,6 @@ GLIB_REQUIRED_VERSION=2.33
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 @@ PKG_CHECK_MODULES(SESSIONSERVICE, glib-2.0 >= $GLIB_REQUIRED_VERSION
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_SUBST(GUDEV_LIBS)
###########################
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
diff --git a/debian/changelog b/debian/changelog
index 6228ac4..060d8a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ indicator-session (12.10.5-0ubuntu1) UNRELEASED; urgency=low
- 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)
diff --git a/debian/control b/debian/control
index 1dad5b0..d910c9c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,6 @@ Build-Depends: debhelper (>= 9),
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 @@ Depends: ${shlibs:Depends},
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