aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-09-01 13:50:31 -0400
committerKen VanDine <ken.vandine@canonical.com>2011-09-01 13:50:31 -0400
commit52f9a682c87478dfd61cd588bde7edee0f3281ab (patch)
treea47286cd14a06eb1adb0f0ed08da4bafe102968c
parentc1c06038cc814a336b02fd09ee50bf072d24bb03 (diff)
parenta316c5aac1ea8928f5da7cc916d534ea6eb7ab5e (diff)
downloadayatana-indicator-session-52f9a682c87478dfd61cd588bde7edee0f3281ab.tar.gz
ayatana-indicator-session-52f9a682c87478dfd61cd588bde7edee0f3281ab.tar.bz2
ayatana-indicator-session-52f9a682c87478dfd61cd588bde7edee0f3281ab.zip
* debian/control: Adding a depend on gnome-settings-daemon to ensure that
the required schemas are available. (LP: #833965) * Upstream Merge * So much stuff... * Desktop files for system functions * Upstream Merge * GSettings Fixes * Upstream Merge * GSettings transition * debian/rules: Adding autoreconf
-rw-r--r--debian/changelog30
-rw-r--r--debian/control5
-rw-r--r--[-rwxr-xr-x]debian/rules0
3 files changed, 34 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 81240f6..979a345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,13 @@ indicator-session (0.3.4-0ubuntu1) UNRELEASED; urgency=low
-- Ken VanDine <ken.vandine@canonical.com> Tue, 30 Aug 2011 15:29:35 -0400
+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 <ted@ubuntu.com> Wed, 31 Aug 2011 13:45:22 -0500
+
indicator-session (0.3.3.2-0ubuntu1) oneiric; urgency=low
* New upstream release.
@@ -44,6 +51,29 @@ indicator-session (0.3.3-0ubuntu1) oneiric; urgency=low
-- Ken VanDine <ken.vandine@canonical.com> 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 <ted@ubuntu.com> Tue, 23 Aug 2011 11:24:25 -0500
+
+indicator-session (0.3.2-0ubuntu2~ppa2) oneiric; urgency=low
+
+ * Upstream Merge
+ * GSettings Fixes
+
+ -- Ted Gould <ted@ubuntu.com> 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 <ted@ubuntu.com> Fri, 19 Aug 2011 14:59:20 -0500
+
indicator-session (0.3.2-0ubuntu1) oneiric; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index b7b19de..c81ca89 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,10 @@ Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubunt
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
diff --git a/debian/rules b/debian/rules
index a393364..a393364 100755..100644
--- a/debian/rules
+++ b/debian/rules