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

[Ying-Chun Liu]

wrap-and-sort for debian/*

wrap-and-sort for debian/*

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-05-24 16:35:19 +0000
+++ debian/control	2013-05-27 07:25:34 +0000
@@ -20,7 +20,6 @@
                libxcb1-dev,
                pkg-config,
                python3,
-               ttf-ubuntu-font-family,
                qt5-default,
                qtbase5-dev,
                qtbase5-private-dev,
@@ -30,6 +29,7 @@
                qtdeclarative5-test-plugin,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
                qtdeclarative5-xmllistmodel-plugin,
+               ttf-ubuntu-font-family,
 Standards-Version: 3.9.3
 Homepage: http://launchpad.net/unity
 # If you aren't a member of ~unity-team but need to upload
@@ -40,13 +40,13 @@
 
 Package: qml-phone-shell
 Architecture: amd64 armhf i386
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         indicators-client (>= 0.6.1),
+Depends: indicators-client (>= 0.6.1),
          qtdeclarative5-dee-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-xmllistmodel-plugin,
          qtubuntu,
+         ${misc:Depends},
+         ${shlibs:Depends},
 Recommends: indicators-client-plugin-datetime (>= 0.6.1),
             indicators-client-plugin-messaging (>= 0.6.1),
             indicators-client-plugin-network (>= 0.6.1),
@@ -57,41 +57,39 @@
 
 Package: qml-phone-shell-fake-env
 Architecture: amd64 armhf i386
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Fake environment for running Ubuntu QML shell
  Provides fake implementations of some QML modules used by Ubuntu QML shell
  (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
 
 Package: qml-phone-shell-autopilot
 Architecture: all
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libautopilot-qt,
+Depends: libautopilot-qt,
          libqt5test5,
          libqt5widgets5,
          qml-phone-shell (= ${source:Version}),
          qml-phone-shell-fake-env (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Test package for the shell
  Autopilot tests for the qml-phone-shell package
 
 Package: libunity-api
 Architecture: all
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: API for shell integration
  Library to integrate with the Unity shell
 
 Package: libunity-api-dev
 Architecture: all
-Depends: ${misc:Depends},
-         libboost1.49-dev (>= 1.49),
+Depends: libboost1.49-dev (>= 1.49),
          libunity-api (= ${binary:Version}),
+         ${misc:Depends},
 Description: Header files for Unity API
  Library to integrate with the Unity shell (dev files)
 
 Package: libunity-api-doc
 Architecture: all
-Depends: ${misc:Depends},
+Depends: ${misc:Depends}
 Description: Documentation for Unity API
  Library to integrate with the Unity shell (documentation)

=== modified file 'debian/qml-phone-shell.install'
--- debian/qml-phone-shell.install	2013-05-24 08:00:04 +0000
+++ debian/qml-phone-shell.install	2013-05-27 07:25:34 +0000
@@ -15,6 +15,6 @@
 /usr/share/qml-phone-shell/graphics/*
 /usr/share/qml-phone-shell/plugins/HudClient/*
 /usr/share/qml-phone-shell/plugins/LightDM/*
+/usr/share/qml-phone-shell/plugins/Ubuntu/*
 /usr/share/qml-phone-shell/plugins/Unity/*
 /usr/share/qml-phone-shell/plugins/Utils/*
-/usr/share/qml-phone-shell/plugins/Ubuntu/*