Merge lp:~indicator-applet-developers/indicator-session/ubuntu into lp:~ubuntu-desktop/indicator-session/ubuntu

[Ted Gould]

Updating depends for schemas

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-26 14:44:10 +0000
+++ debian/changelog	2011-08-31 18:47:24 +0000
@@ -1,3 +1,10 @@
+indicator-session (0.3.3.2-0ubuntu2~ppa1) oneiric; urgency=low
+
+  * debian/control: Adding a depend on gnome-settings-daemon to ensure that
+    the required schemas are available.  (LP: #833965)
+
+ -- Ted Gould <[e-mail]>  Wed, 31 Aug 2011 13:45:22 -0500
+
 indicator-session (0.3.3.2-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
@@ -36,6 +43,29 @@
 
  -- Ken VanDine <[e-mail]>  Thu, 25 Aug 2011 08:58:56 -0400
 
+indicator-session (0.3.2-0ubuntu2~ppa3) UNRELEASED; urgency=low
+
+  * Upstream Merge
+    * So much stuff...
+    * Desktop files for system functions
+
+ -- Ted Gould <[e-mail]>  Tue, 23 Aug 2011 11:24:25 -0500
+
+indicator-session (0.3.2-0ubuntu2~ppa2) oneiric; urgency=low
+
+  * Upstream Merge
+    * GSettings Fixes
+
+ -- Ted Gould <[e-mail]>  Fri, 19 Aug 2011 15:10:54 -0500
+
+indicator-session (0.3.2-0ubuntu2~ppa1) oneiric; urgency=low
+
+  * Upstream Merge
+    * GSettings transition
+  * debian/rules: Adding autoreconf
+
+ -- Ted Gould <[e-mail]>  Fri, 19 Aug 2011 14:59:20 -0500
+
 indicator-session (0.3.2-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2011-08-25 13:54:54 +0000
+++ debian/control	2011-08-31 18:47:24 +0000
@@ -24,7 +24,10 @@
 
 Package: indicator-session
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, upower
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         upower,
+         gnome-settings-daemon
 Recommends: indicator-applet (>= 0.2) | indicator-renderer
 Suggests: lightdm
 Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus

=== modified file 'debian/rules' (properties changed: +x to -x)