aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-28 14:38:39 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-06-28 14:38:39 -0500
commitc62d5ade70d276f1d50e63cc0cb9c4311d6c9cea (patch)
treed6e0c9555e5b13a6df87fcd617cb3cc3a4c86cc1 /debian
parent4850b1b6ba8a1438d8c0903592108fcefc35235e (diff)
parentbb9304ef80222c41dec17418f745fdb98939da25 (diff)
downloadayatana-indicator-session-c62d5ade70d276f1d50e63cc0cb9c4311d6c9cea.tar.gz
ayatana-indicator-session-c62d5ade70d276f1d50e63cc0cb9c4311d6c9cea.tar.bz2
ayatana-indicator-session-c62d5ade70d276f1d50e63cc0cb9c4311d6c9cea.zip
sync with trunk to resolve conflicts
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog50
-rw-r--r--debian/control5
2 files changed, 53 insertions, 2 deletions
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