diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2014-02-10 14:34:09 +0200 |
|---|---|---|
| committer | Timo Jyrinki <timo.jyrinki@canonical.com> | 2014-02-10 14:34:09 +0200 |
| commit | 9882562f89986eef765eaffc3e8df273eec0ce83 (patch) | |
| tree | 0b725b15e4bc20fe624f5bca2e28fc6375a2f24d /debian | |
| parent | f6fb71e10c124fd4c62fd6eb4285a9f98c7a4ae7 (diff) | |
(sync with archive)
* Temporally allow running under gnome-settings-daemon, until unity-settings-daemon is in main. * Make unity7 job start on started either gnome or unity settings daemon. * Cherrypick "Removed the ZeitgeistUtils.h as this is no longer needed since Zeitgeist in main is now fixed." to fix FTBFS. (bzr r3648)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rw-r--r-- | debian/unity7.conf | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 0ddc1c97a..e6df0cfe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +unity (7.1.2+14.04.20131106.1-0ubuntu4) trusty; urgency=medium + + * Temporally allow running under gnome-settings-daemon, until + unity-settings-daemon is in main. + + -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 07 Feb 2014 19:18:24 +0000 + +unity (7.1.2+14.04.20131106.1-0ubuntu3) trusty; urgency=medium + + * Make unity7 job start on started either gnome or unity settings + daemon. + + * Cherrypick "Removed the ZeitgeistUtils.h as this is no longer needed + since Zeitgeist in main is now fixed." to fix FTBFS. + + -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 07 Feb 2014 13:18:44 +0000 + unity (7.1.2+14.04.20131106.1-0ubuntu2) trusty; urgency=medium * Disable errors upon deprecated-warnings. diff --git a/debian/unity7.conf b/debian/unity7.conf index b6e1926f6..92a9301a2 100644 --- a/debian/unity7.conf +++ b/debian/unity7.conf @@ -1,7 +1,7 @@ description "Unity Shell v7" author "Ted Gould <ted@ubuntu.com>" -start on xsession SESSION=ubuntu and started gnome-settings-daemon +start on xsession SESSION=ubuntu and (started gnome-settings-daemon or started unity-settings-daemon) stop on desktop-end pre-start script |