sync with trunk to resolve conflicts

3 files changed, 53 insertions, 5 deletions

diff --git a/.bzrignore b/.bzrignore
index 3f895ca..992e18f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -57,7 +57,6 @@ indicator-session-[0-9].[0-9].tar.gz.asc
 src/consolekit-manager-client.h
 src/gen-session-dbus.xml.c
 src/gen-session-dbus.xml.h
-src/upower-client.h
 src/display-manager-client.h
 src/consolekit-session-client.h
 INSTALL
@@ -251,8 +250,6 @@ dbus-consolekit-session.c
 dbus-consolekit-session.h
 dbus-display-manager.c
 dbus-display-manager.h
-dbus-upower.c
-dbus-upower.h
 dbus-user.c
 dbus-user.h
 tests/test-service
diff --git a/debian/changelog b/debian/changelog
index 09b38af..ef1cd53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,53 @@
+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 ]
+  * Remove upower dependency and depend on systemd-services.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 390
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 06 May 2013 19:23:24 +0000
+
+indicator-session (12.10.5daily13.05.02-0ubuntu1) saucy; urgency=low
+
+  * Automatic snapshot from revision 388
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 02 May 2013 22:59:05 +0000
+
+indicator-session (12.10.5daily13.03.08-0ubuntu1) raring; urgency=low
+
+  [ Marco Trevisan (Treviño) ]
+  * New unity style shutdown dialogues (LP: #882041)
+
+  [ Automatic PS uploader ]
+  * Automatic snapshot from revision 386
+
+ -- Automatic PS uploader <ps-jenkins@lists.canonical.com>  Fri, 08 Mar 2013 02:02:14 +0000
+
+indicator-session (12.10.5daily13.03.06-0ubuntu1) raring; urgency=low
+
+  [ Mathieu Trudel-Lapierre ]
+  * Jenkins build failure on gtest "undefined reference to symbol
+    'pthread_key_delete@@GLIBC_2.2.5'" (LP: #1126362)
+
+  [ Automatic PS uploader ]
+  * Automatic snapshot from revision 384
+
+ -- Automatic PS uploader <ps-jenkins@lists.canonical.com>  Wed, 06 Mar 2013 02:02:00 +0000
+
 indicator-session (12.10.5daily13.01.25-0ubuntu1) raring; urgency=low
 
   [ Mathieu Trudel-Lapierre ]
diff --git a/debian/control b/debian/control
index 7e4b609..ff581db 100644
--- a/debian/control
+++ b/debian/control
@@ -24,9 +24,10 @@ Package: indicator-session
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         upower,
+         systemd-services,
          gnome-settings-daemon,
-Recommends: indicator-applet (>= 0.2) | indicator-renderer, 
+Recommends: indicator-applet (>= 0.2) | indicator-renderer,
+            gnome-screensaver
 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