Merge lp:~paulliu/unity/wrap-and-sort into lp:unity/phablet

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Michał Sawicz
Approved revision: 697
Merged at revision: 701
Proposed branch: lp:~paulliu/unity/wrap-and-sort
Merge into: lp:unity/phablet
Diff against target: 98 lines (+13/-15)
2 files modified
debian/control (+12/-14)
debian/qml-phone-shell.install (+1/-1)
To merge this branch: bzr merge lp:~paulliu/unity/wrap-and-sort
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+165829@code.launchpad.net

Commit message

wrap-and-sort for debian/*

Description of the change

wrap-and-sort for debian/*

To post a comment you must log in.
Michał Sawicz (saviq) :
review: Approve
review: Approve (continuous-integration)

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 2013-05-24 16:35:19 +0000
3+++ debian/control 2013-05-27 07:25:34 +0000
4@@ -20,7 +20,6 @@
5 libxcb1-dev,
6 pkg-config,
7 python3,
8- ttf-ubuntu-font-family,
9 qt5-default,
10 qtbase5-dev,
11 qtbase5-private-dev,
12@@ -30,6 +29,7 @@
13 qtdeclarative5-test-plugin,
14 qtdeclarative5-ubuntu-ui-toolkit-plugin,
15 qtdeclarative5-xmllistmodel-plugin,
16+ ttf-ubuntu-font-family,
17 Standards-Version: 3.9.3
18 Homepage: http://launchpad.net/unity
19 # If you aren't a member of ~unity-team but need to upload
20@@ -40,13 +40,13 @@
21
22 Package: qml-phone-shell
23 Architecture: amd64 armhf i386
24-Depends: ${misc:Depends},
25- ${shlibs:Depends},
26- indicators-client (>= 0.6.1),
27+Depends: indicators-client (>= 0.6.1),
28 qtdeclarative5-dee-plugin,
29 qtdeclarative5-ubuntu-ui-toolkit-plugin,
30 qtdeclarative5-xmllistmodel-plugin,
31 qtubuntu,
32+ ${misc:Depends},
33+ ${shlibs:Depends},
34 Recommends: indicators-client-plugin-datetime (>= 0.6.1),
35 indicators-client-plugin-messaging (>= 0.6.1),
36 indicators-client-plugin-network (>= 0.6.1),
37@@ -57,41 +57,39 @@
38
39 Package: qml-phone-shell-fake-env
40 Architecture: amd64 armhf i386
41-Depends: ${misc:Depends},
42- ${shlibs:Depends},
43+Depends: ${misc:Depends}, ${shlibs:Depends}
44 Description: Fake environment for running Ubuntu QML shell
45 Provides fake implementations of some QML modules used by Ubuntu QML shell
46 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
47
48 Package: qml-phone-shell-autopilot
49 Architecture: all
50-Depends: ${misc:Depends},
51- ${shlibs:Depends},
52- libautopilot-qt,
53+Depends: libautopilot-qt,
54 libqt5test5,
55 libqt5widgets5,
56 qml-phone-shell (= ${source:Version}),
57 qml-phone-shell-fake-env (= ${source:Version}),
58+ ${misc:Depends},
59+ ${shlibs:Depends},
60 Description: Test package for the shell
61 Autopilot tests for the qml-phone-shell package
62
63 Package: libunity-api
64 Architecture: all
65-Depends: ${misc:Depends},
66- ${shlibs:Depends},
67+Depends: ${misc:Depends}, ${shlibs:Depends}
68 Description: API for shell integration
69 Library to integrate with the Unity shell
70
71 Package: libunity-api-dev
72 Architecture: all
73-Depends: ${misc:Depends},
74- libboost1.49-dev (>= 1.49),
75+Depends: libboost1.49-dev (>= 1.49),
76 libunity-api (= ${binary:Version}),
77+ ${misc:Depends},
78 Description: Header files for Unity API
79 Library to integrate with the Unity shell (dev files)
80
81 Package: libunity-api-doc
82 Architecture: all
83-Depends: ${misc:Depends},
84+Depends: ${misc:Depends}
85 Description: Documentation for Unity API
86 Library to integrate with the Unity shell (documentation)
87
88=== modified file 'debian/qml-phone-shell.install'
89--- debian/qml-phone-shell.install 2013-05-24 08:00:04 +0000
90+++ debian/qml-phone-shell.install 2013-05-27 07:25:34 +0000
91@@ -15,6 +15,6 @@
92 /usr/share/qml-phone-shell/graphics/*
93 /usr/share/qml-phone-shell/plugins/HudClient/*
94 /usr/share/qml-phone-shell/plugins/LightDM/*
95+/usr/share/qml-phone-shell/plugins/Ubuntu/*
96 /usr/share/qml-phone-shell/plugins/Unity/*
97 /usr/share/qml-phone-shell/plugins/Utils/*
98-/usr/share/qml-phone-shell/plugins/Ubuntu/*

Subscribers

People subscribed via source and target branches