aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-23 08:53:58 -0600
committerTed Gould <ted@gould.cx>2012-02-23 08:53:58 -0600
commitd37d11adeb30b3ef5c9668a67fd906e79a69286b (patch)
treefd3087a343a1ef4e929e01336ae6394b295a2545 /debian
parentfb82208c7c5a593eb89f1a53174978b562fcdae7 (diff)
parent1d8f0ba5ee4fcd54f51ad8727429add3639d2444 (diff)
downloadayatana-indicator-session-d37d11adeb30b3ef5c9668a67fd906e79a69286b.tar.gz
ayatana-indicator-session-d37d11adeb30b3ef5c9668a67fd906e79a69286b.tar.bz2
ayatana-indicator-session-d37d11adeb30b3ef5c9668a67fd906e79a69286b.zip
Updating to U. Desktop
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog27
-rw-r--r--debian/control3
-rw-r--r--debian/source/format2
3 files changed, 29 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 8badbaf..c4f7a8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,29 @@
-indicator-session (0.3.90-0ubuntu1~ppa1) precise; urgency=low
+indicator-session (0.3.91-0ubuntu2) UNRELEASED; urgency=low
+
+ * debian/control: Add alternative packagekit dependency, since this ought to
+ work with either the aptdaemon pkcompat or packagekit itself.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 15 Feb 2012 07:26:43 +0100
+
+indicator-session (0.3.91-0ubuntu1) precise; urgency=low
+
+ * Backport "Don't lock the session when switching to another one"
+ work from Robert Ancell, the screen locking is already done by
+ consolekit and enforcing it there is problematic to i.e use the
+ lightdm greeter as a lock screen (lp: #878836)
+ * debian/control:
+ - recommends python-aptdaemon.pkcompat so packagekit doesn't get installed
+ * debian/source/format:
+ - use v1, v3 doesn't play nicely with vcs backports
+
+ [ Ken VanDine ]
+ * New upstream release. (lp: #903756)
+ * debian/control
+ - added new build depends on libpackagekit-glib2-dev
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 14 Feb 2012 18:49:02 +0100
+
+indicator-session (0.3.90-0ubuntu1) precise; urgency=low
* New upstream release.
* Screensaver code cleanup
diff --git a/debian/control b/debian/control
index 557ccf2..b5aa95b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 5.0),
libdbusmenu-glib-dev (>= 0.5.90),
libdbusmenu-gtk-dev (>= 0.5.90),
libdbusmenu-gtk3-dev (>= 0.5.90),
+ libpackagekit-glib2-dev,
libpolkit-gobject-1-dev,
intltool
Standards-Version: 3.9.2
@@ -28,7 +29,7 @@ Depends: ${shlibs:Depends},
${misc:Depends},
upower,
gnome-settings-daemon
-Recommends: indicator-applet (>= 0.2) | indicator-renderer
+Recommends: indicator-applet (>= 0.2) | indicator-renderer, python-aptdaemon.pkcompat | packagekit
Suggests: lightdm
Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus
Replaces: indicator-sus, indicator-me
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..d3827e7 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+1.0