qtubuntu

Merge lp:~saviq/qtubuntu/wrap-sort into lp:qtubuntu

  1. wrap-sort
  2. Merge into trunk
Proposed by Michał Sawicz on 2015-12-07
Status: Merged
Approved by: Gerry Boland on 2015-12-09
Approved revision: 297
Merged at revision: 297
Proposed branch: lp:~saviq/qtubuntu/wrap-sort
Merge into: lp:qtubuntu
Diff against target: 74 lines (+13/-13)
1 file modified
debian/control (+13/-13)
To merge this branch: bzr merge lp:~saviq/qtubuntu/wrap-sort
Reviewer Review Type Date Requested Status
Gerry Boland 2015-12-07 Approve on 2015-12-09
PS Jenkins bot continuous-integration Approve on 2015-12-07
Review via email: mp+279778@code.launchpad.net

Commit Message

Run wrap-and-sort -at

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-08-06 16:36:57 +0000
3+++ debian/control 2015-12-07 13:53:52 +0000
4@@ -9,14 +9,14 @@
5 libgles2-mesa-dev,
6 libglib2.0-dev,
7 libinput-dev,
8+ libmirclient-dev (>= 0.13.0),
9 libmtdev-dev,
10 libubuntu-application-api-dev (>= 2.9.0),
11 libudev-dev,
12+ libxkbcommon-dev,
13 libxrender-dev,
14- libxkbcommon-dev,
15 qt5-default,
16 qtbase5-private-dev,
17- libmirclient-dev (>= 0.13.0),
18 # if you don't have have commit access to this branch but would like to upload
19 # directly to Ubuntu, don't worry: your changes will be merged back into the
20 # upstream branch
21@@ -27,17 +27,17 @@
22 Package: qtubuntu-android
23 Architecture: armhf
24 Multi-Arch: same
25-Conflicts: qtubuntu-desktop
26+Conflicts: qtubuntu-desktop,
27 Replaces: qthybris (<< 0.37),
28 qtubuntu (<< 0.52),
29- qtubuntu-desktop
30+ qtubuntu-desktop,
31 Breaks: qthybris (<< 0.37),
32- unity8 (<< 7.85),
33 ubuntu-touch-session (<< 0.107),
34+ unity8 (<< 7.85),
35 Provides: qtubuntu,
36-Depends: ${misc:Depends},
37+Depends: ubuntu-application-api3-touch,
38+ ${misc:Depends},
39 ${shlibs:Depends},
40- ubuntu-application-api3-touch,
41 Description: Qt plugins for Ubuntu Platform API (mobile)
42 QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
43 QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
44@@ -50,15 +50,15 @@
45 Package: qtubuntu-desktop
46 Architecture: any
47 Multi-Arch: same
48-Conflicts: qtubuntu-android
49+Conflicts: qtubuntu-android,
50 Replaces: qtubuntu (<< 0.52),
51- qtubuntu-android
52+ qtubuntu-android,
53 Breaks: qthybris (<< 0.37),
54 unity8 (<< 7.85),
55 Provides: qtubuntu,
56-Depends: ${misc:Depends},
57+Depends: ubuntu-application-api3-desktop,
58+ ${misc:Depends},
59 ${shlibs:Depends},
60- ubuntu-application-api3-desktop,
61 Description: Qt plugins for Ubuntu Platform API (desktop)
62 QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
63 QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
64@@ -69,8 +69,8 @@
65 This variant of the package is for GNU-based desktops.
66
67 Package: qthybris
68-Depends: ${misc:Depends},
69- qtubuntu-android,
70+Depends: qtubuntu-android,
71+ ${misc:Depends},
72 Architecture: any
73 Section: oldlibs
74 Description: transitional dummy package

Subscribers

People subscribed via source and target branches