diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2014-02-20 16:25:04 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-02-20 16:25:04 +0000 |
| commit | 97a4b55ca93682d8627b4a251c3b29489d9e7c23 (patch) | |
| tree | 2f9ecebd9f9a01ee3d4d740ba5073fc6eb802b1a /debian | |
| parent | dbdca0f4fc6009b408c36c966d8289157030723f (diff) | |
| parent | 9fa48a2693a89d36639840cb6349bb26ba36f340 (diff) | |
Drop g-s-d override, unity-settings-daemon landed
(bzr r3679)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/gnome-settings-daemon.override | 13 | ||||
| -rw-r--r-- | debian/libunity-core-6.0-9.install | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/debian/gnome-settings-daemon.override b/debian/gnome-settings-daemon.override deleted file mode 100644 index d81a6011f..000000000 --- a/debian/gnome-settings-daemon.override +++ /dev/null @@ -1,13 +0,0 @@ -start on started dbus and starting gnome-session - -pre-start script - # This is temporary override until unity-settings-daemon is in main - # and used by default in unity session - - [ "$DESKTOP_SESSION" = "ubuntu" ] || { exit 0; } - - if initctl status 2>/dev/null 1>/dev/null unity-settings-daemon ; then - stop ; exit 0 - fi - -end script diff --git a/debian/libunity-core-6.0-9.install b/debian/libunity-core-6.0-9.install index f780d636f..9c69159d3 100644 --- a/debian/libunity-core-6.0-9.install +++ b/debian/libunity-core-6.0-9.install @@ -8,5 +8,3 @@ debian/unity-crashdb.conf etc/apport/crashdb.conf.d/ debian/source_unity.py usr/share/apport/package-hooks debian/unity7.conf usr/share/upstart/sessions tools/convert-files/* usr/lib/compiz/migration/ -# Temporary until unity-settings-daemon is in main -debian/gnome-settings-daemon.override usr/share/upstart/sessions |