Merge lp:~ci-train-bot/qtubuntu/qtubuntu-gles-ubuntu-xenial-landing-022 into lp:qtubuntu/gles

Proposed by Michał Sawicz
Status: Merged
Merged at revision: 52
Proposed branch: lp:~ci-train-bot/qtubuntu/qtubuntu-gles-ubuntu-xenial-landing-022
Merge into: lp:qtubuntu/gles
Diff against target: 36 lines (+10/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+3/-1)
To merge this branch: bzr merge lp:~ci-train-bot/qtubuntu/qtubuntu-gles-ubuntu-xenial-landing-022
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+280281@code.launchpad.net

Description of the change

Only used to base new silos on this

To post a comment you must log in.

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 2015-12-01 14:19:14 +0000
3+++ debian/changelog 2015-12-11 11:16:30 +0000
4@@ -1,3 +1,10 @@
5+qtubuntu-gles (0.62+16.04.20151207-0ubuntu1) xenial; urgency=medium
6+
7+ [ Michał Sawicz ]
8+ * Bring debian/control in line with upstream
9+
10+ -- Gerry Boland <ci-train-bot@canonical.com> Mon, 07 Dec 2015 16:21:10 +0000
11+
12 qtubuntu-gles (0.62+16.04.20151124-0ubuntu2) xenial; urgency=medium
13
14 * Rebuild against Qt 5.5.1.
15
16=== modified file 'debian/control'
17--- debian/control 2015-10-09 14:51:38 +0000
18+++ debian/control 2015-12-11 11:16:30 +0000
19@@ -8,6 +8,8 @@
20 libfreetype6-dev,
21 libgles2-mesa-dev,
22 libglib2.0-dev,
23+ libinput-dev,
24+ libmirclient-dev (>= 0.13.0),
25 libmtdev-dev,
26 libqt5gui5-gles,
27 libqt5quick5-gles,
28@@ -15,7 +17,7 @@
29 libqt5quicktest5,
30 libqt5quickwidgets5-gles,
31 libqt5sensors5-dev,
32- libubuntu-application-api-dev (>= 2.2.0),
33+ libubuntu-application-api-dev (>= 2.9.0),
34 libudev-dev,
35 libxkbcommon-dev,
36 libxrender-dev,

Subscribers

People subscribed via source and target branches