Merge lp:~cyphermox/unity/7.2.0+14.04.20140423-0ubuntu2 into lp:unity

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3803
Proposed branch: lp:~cyphermox/unity/7.2.0+14.04.20140423-0ubuntu2
Merge into: lp:unity
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/unity/7.2.0+14.04.20140423-0ubuntu2
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+218690@code.launchpad.net

Commit message

Sync with distro upload for 7.2.0+14.04.20140423-0ubuntu2
 - replace autopilot-desktop Depends in unity-autopilot with autopilot-desktop-legacy.

Description of the change

Sync with distro upload for 7.2.0+14.04.20140423-0ubuntu2
 - replace autopilot-desktop Depends in unity-autopilot with autopilot-desktop-legacy.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

For Utopic only.

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 2014-05-02 14:46:24 +0000
3+++ debian/changelog 2014-05-07 20:08:17 +0000
4@@ -1,3 +1,10 @@
5+unity (7.2.0+14.04.20140423-0ubuntu2) utopic; urgency=medium
6+
7+ * debian/control: depends on autopilot-desktop-legacy rather than
8+ autopilot-desktop.
9+
10+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 01 May 2014 00:32:05 -0400
11+
12 unity (7.2.0+14.04.20140423-0ubuntu1.2) trusty-security; urgency=medium
13
14 * SECURITY UPDATE: more lock screen bypass issues, and regression with
15
16=== modified file 'debian/control'
17--- debian/control 2014-04-03 11:09:34 +0000
18+++ debian/control 2014-05-07 20:08:17 +0000
19@@ -165,7 +165,7 @@
20 Architecture: all
21 Depends: ${misc:Depends},
22 ${python:Depends},
23- autopilot-desktop,
24+ autopilot-desktop-legacy,
25 python-windowmocker,
26 gir1.2-appindicator3-0.1,
27 gir1.2-dee-1.0,