Merge lp:~saviq/unity8/bump-replace-session-conf into lp:unity8

Proposed by Michał Sawicz
Status: Merged
Approved by: Loïc Minier
Approved revision: 462
Merged at revision: 462
Proposed branch: lp:~saviq/unity8/bump-replace-session-conf
Merge into: lp:unity8
Diff against target: 24 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~saviq/unity8/bump-replace-session-conf
Reviewer Review Type Date Requested Status
Loïc Minier Approve
Review via email: mp+191076@code.launchpad.net

Commit message

Replace ubuntu-touch-session's unity8.conf upstart job.

To post a comment you must log in.
Revision history for this message
Loïc Minier (lool) wrote :

Looks good to me; needs corresponding ubuntu-touch-session change to use v0.82 and break << 7.83~

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-11 17:26:35 +0000
3+++ debian/changelog 2013-10-14 23:18:12 +0000
4@@ -1,3 +1,9 @@
5+unity8 (7.83) UNRELEASED; urgency=low
6+
7+ * Replace ubuntu-touch-session's unity8.conf upstart job.
8+
9+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 15 Oct 2013 01:12:45 +0200
10+
11 unity8 (7.82+13.10.20131011.2-0ubuntu1) saucy; urgency=low
12
13 [ Michał Sawicz ]
14
15=== modified file 'debian/control'
16--- debian/control 2013-10-08 12:31:01 +0000
17+++ debian/control 2013-10-14 23:18:12 +0000
18@@ -82,6 +82,7 @@
19 ${shlibs:Depends},
20 Recommends: ${unity-default-masterscopes},
21 Breaks: indicator-network (<< 0.5.1)
22+Replaces: ubuntu-touch-session (<< 0.82~)
23 Description: Unity 8 shell
24 The Unity 8 shell is the primary user interface for Ubuntu devices.
25

Subscribers

People subscribed via source and target branches