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

Proposed by Charles Kerr on 2012-11-30
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2012-11-30
Approved revision: 382
Merged at revision: 379
Proposed branch: lp:~charlesk/indicator-session/lp-1085100
Merge into: lp:indicator-session/13.04
Diff against target: 78 lines (+11/-12)
3 files modified
configure.ac (+8/-9)
debian/changelog (+3/-0)
debian/control (+0/-3)
To merge this branch: bzr merge lp:~charlesk/indicator-session/lp-1085100
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2012-11-30
Mathieu Trudel-Lapierre 2012-11-30 Approve on 2012-11-30
Review via email: mp+137252@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Seems fine if it's indeed not used anymore.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-11-29 22:09:57 +0000
3+++ configure.ac 2012-11-30 16:35:26 +0000
4@@ -30,7 +30,6 @@
5 GTK_REQUIRED_VERSION=3.0
6 INDICATOR_REQUIRED_VERSION=0.3.19
7 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
8-POLKIT_REQUIRED_VERSION=0.92
9 DBUSTEST_REQUIRED_VERSION=0.0.5
10 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
11
12@@ -47,8 +46,7 @@
13 dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
14 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
15 gio-unix-2.0
16- indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
17- packagekit-glib2)
18+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION)
19 AC_SUBST(SESSIONERVICE_CFLAGS)
20 AC_SUBST(SESSIONERVICE_LIBS)
21
22@@ -60,14 +58,15 @@
23 ###########################
24
25 AC_ARG_ENABLE([gtklogouthelper],
26- AS_HELP_STRING([--enable-gtklogouthelper], [enable GTK Logout Helper]),,
27- enable_gtklogouthelper=auto)
28+ [AS_HELP_STRING([--enable-gtklogouthelper], [enable GTK Logout Helper])],
29+ [],
30+ [enable_gtklogouthelper=auto])
31
32 if test x"$enable_gtklogouthelper" != x"no" ; then
33- PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK_REQUIRED_VERSION
34- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
35- [have_gtklogouthelper=yes],
36- [have_gtklogouthelper=no])
37+ PKG_CHECK_MODULES([GTKLOGOUTHELPER],
38+ [gtk+-3.0 >= $GTK_REQUIRED_VERSION],
39+ [have_gtklogouthelper=yes],
40+ [have_gtklogouthelper=no])
41 if test x${have_gtklogouthelper} = xyes; then
42 AC_DEFINE(HAVE_GTKLOGOUTHELPER, 1, [Define to 1 to enable GTK Logout Helper])
43 fi
44
45=== modified file 'debian/changelog'
46--- debian/changelog 2012-11-30 11:03:09 +0000
47+++ debian/changelog 2012-11-30 16:35:26 +0000
48@@ -11,6 +11,9 @@
49 - Add libgtest-dev, libdbustest1-dev, dbus-test-runner to Build-Depends.
50 - Adjust style to be consistent and use trailing commas in lists.
51 - Update Vcs-Bzr and Vcs-Browser fields and add notice for uploaders.
52+ - Remove libpackagekit-glib2-dev and libpolkit-gobject-1-dev
53+ from Build-Depends. (LP: #1085100)
54+ - Remove packagekit from Recommends
55 * Automatic snapshot from revision 373 (bootstrap):
56 - Check to make sure that create_display_proxy() succeeded before using the
57 proxy pointer that gets returned. (LP: #1078119)
58
59=== modified file 'debian/control'
60--- debian/control 2012-11-30 11:03:09 +0000
61+++ debian/control 2012-11-30 16:35:26 +0000
62@@ -16,8 +16,6 @@
63 libindicator3-dev (>= 0.3.90),
64 libdbusmenu-glib-dev (>= 0.5.90),
65 libdbusmenu-gtk3-dev (>= 0.5.90),
66- libpackagekit-glib2-dev,
67- libpolkit-gobject-1-dev,
68 Standards-Version: 3.9.3
69 Homepage: https://launchpad.net/indicator-session
70 # If you aren't a member of ~indicator-applet-developers but need to upload
71@@ -33,7 +31,6 @@
72 upower,
73 gnome-settings-daemon,
74 Recommends: indicator-applet (>= 0.2) | indicator-renderer,
75- packagekit-system-interface | packagekit,
76 Suggests: lightdm
77 Description: indicator showing session management, status and user switching
78 This indicator is designed to be placed on the right side of a panel and

Subscribers

People subscribed via source and target branches