Merging trunk

3 files changed, 124 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index 32a029d..d4f1a25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,117 @@
+indicator-session (12.10.5+13.10.20130823-0ubuntu1) saucy; urgency=low
+
+  [ Charles Kerr ]
+  * use an a{sv}, rather than the obsoleted (sssb), for the root
+    action's state.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 410
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Fri, 23 Aug 2013 22:07:25 +0000
+
+indicator-session (12.10.5+13.10.20130822-0ubuntu1) saucy; urgency=low
+
+  [ Charles Kerr ]
+  * remove deprecated GSimpleActionGroup API use.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 408
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 22 Aug 2013 20:30:19 +0000
+
+indicator-session (12.10.5+13.10.20130821-0ubuntu1) saucy; urgency=low
+
+  [ Charles Kerr ]
+  * Lock the current session before switching to the guest session. This
+    is done by modifying IndicatorSessionActionsDbus::switch_to_guest()
+    to call org.gnome.ScreenSaver's Lock function before switching to
+    the guest session. (LP: #1205273)
+
+  [ Ritesh Khadgaray ]
+  * Lock the current session before switching to the guest session. This
+    is done by modifying IndicatorSessionActionsDbus::switch_to_guest()
+    to call org.gnome.ScreenSaver's Lock function before switching to
+    the guest session. (LP: #1205273)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 406
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 21 Aug 2013 06:07:34 +0000
+
+indicator-session (12.10.5+13.10.20130812-0ubuntu1) saucy; urgency=low
+
+  [ Charles Kerr ]
+  * Ensure that GCov CFLAGS & LIBS are set before cmake traverses into
+    the src/ directory.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 404
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 12 Aug 2013 18:39:36 +0000
+
+indicator-session (12.10.5+13.10.20130717-0ubuntu1) saucy; urgency=low
+
+  [ Charles Kerr ]
+  * Fix a test failure on PPC architectures.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 402
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 17 Jul 2013 02:01:46 +0000
+
+indicator-session (12.10.5+13.10.20130716-0ubuntu1) saucy; urgency=low
+
+  [ Charles Kerr ]
+  * This is the GMenu, login1 version of indicator-session. This
+    resubmission removes the prerequisite branch because the entire diff
+    is contained in this ng-login1 branch.
+
+  [ Lars Uebernickel ]
+  * This is the GMenu, login1 version of indicator-session. This
+    resubmission removes the prerequisite branch because the entire diff
+    is contained in this ng-login1 branch.
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Add the python build-dep, as gdbus-codegen needs it to work
+    properly.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 400
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 16 Jul 2013 02:02:05 +0000
+
+indicator-session (12.10.5+13.10.20130703.1-0ubuntu1) saucy; urgency=low
+
+  [ Lars Uebernickel ]
+  * session-menu-mgr.c: don't leak user menu items. (LP: #1195595)
+  * I know the new session indicator is coming soon, but I think having
+    this for the next week or so is worthwhile anyway. Not having the
+    session indicator on the trailing edge of the panel is unnerving :).
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 397
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 03 Jul 2013 14:17:07 +0000
+
+indicator-session (12.10.5daily13.06.19-0ubuntu2) saucy; urgency=low
+
+  * Backport a fix for high resources usage issue, thanks Lars (lp: #1195595)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 01 Jul 2013 13:05:15 +0200
+
+indicator-session (12.10.5daily13.06.19-0ubuntu1) saucy; urgency=low
+
+  [ Mathieu Trudel-Lapierre ]
+  * Fix linking with pthreads for gtest.
+
+  [ Jeremy Bicha ]
+  * recommend gnome-screensaver for the Lock Screen feature.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 393
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 19 Jun 2013 02:01:25 +0000
+
 indicator-session (12.10.5daily13.05.06.1-0ubuntu1) saucy; urgency=low
 
   [ Iain Lane ]
diff --git a/debian/control b/debian/control
index f65df35..9772a81 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,14 @@ Source: indicator-session
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
+Build-Depends: cmake,
+               dbus,
+               debhelper (>= 9),
                dh-translations,
                intltool,
-               gnome-common,
+               libglib2.0-dev (>= 2.36),
                libgtest-dev,
-               libxorg-gtest-dev,
-               libdbustest1-dev,
-               dbus-test-runner,
-               libgtk-3-dev,
-               libglib2.0-dev (>= 2.35.4),
-               gnome-doc-utils,
-               libindicator3-dev (>= 0.3.90),
-               libdbusmenu-glib-dev (>= 0.5.90),
-               libdbusmenu-gtk3-dev (>= 0.5.90),
+               python,
 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
@@ -32,8 +25,10 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          systemd-services,
          gnome-settings-daemon,
-Recommends: indicator-applet (>= 0.2) | indicator-renderer, 
-Suggests: lightdm
+Recommends: indicator-applet (>= 0.2) | indicator-renderer,
+            gnome-screensaver
+Suggests: lightdm,
+          zenity
 Description: indicator showing session management, status and user switching
  This indicator is designed to be placed on the right side of a panel and
  give the user easy control for changing their instant message status.  
diff --git a/debian/rules b/debian/rules
index f679369..e64aff1 100644
--- a/debian/rules
+++ b/debian/rules
@@ -3,19 +3,13 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with translations,autoreconf
-
-override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+	dh $@ --with translations
 
 override_dh_install:
 	find debian/indicator-session/usr/lib -name *.la -delete
 	find debian/indicator-session/usr/lib -name *.a -delete
 	dh_install --fail-missing
 
-override_dh_auto_configure:
-	dh_auto_configure -- --libexecdir="\$${prefix}/lib/indicator-session"
-
 # Hack as it seems it's not possible to easy run that under dbus-test-runner
 override_dh_auto_test:
 	env -u LD_PRELOAD dh_auto_test