Merge lp:~robru/unity-webapps-qml/drop-unity-dep into lp:unity-webapps-qml

[Robert Bruce Park]

Drop unity-autopilot dep, it brings in a lot of useless stuff.

[lp:~robru/unity-webapps-qml/drop-unity-dep]

75. By Robert Bruce Park on 2013-11-18

wrap-and-sort -a -t

76. By Robert Bruce Park on 2013-11-18

Shorter Vcs-Bzr link.

[Robert Bruce Park (robru)]

Whoops, looks like this unity-webapps dep is actually used ;-)

review: Disapprove

Unmerged revisions

76. By Robert Bruce Park on 2013-11-18

Shorter Vcs-Bzr link.

75. By Robert Bruce Park on 2013-11-18

wrap-and-sort -a -t

74. By Robert Bruce Park on 2013-11-18

Drop unity-autopilot dep, it brings in a lot of useless stuff.

=== modified file 'debian/control'
--- debian/control	2013-09-20 15:32:28 +0000
+++ debian/control	2013-11-18 19:11:23 +0000
@@ -7,7 +7,8 @@
                libmessaging-menu-dev,
                libnotify-dev,
                libqt5webkit5-dev,
-	       libunity-action-qt1-dev,
+               libunity-action-qt1-dev,
+               libunity-dev,
                pkg-config,
                python (>= 2.7),
                python-setuptools,
@@ -16,19 +17,19 @@
                qtbase5-dev,
                qtdeclarative5-dev,
                qtdeclarative5-test-plugin,
-	       libunity-dev,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/unity-webapp-qml
-# If you aren't a member of ~webapps but need to upload packaging changes,
-# just go ahead.  ~webapps will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~webapps/unity-webapps-qml/trunk
+# if you don't have have commit access to this branch but would like to upload
+# directly to Ubuntu, don't worry: your changes will be merged back into the
+# upstream branch
+Vcs-Bzr: lp:unity-webapps-qml
 
 Package: unity-webapps-qml
 Architecture: any
 Multi-Arch: same
 Depends: libqt5webkit5-qmlwebkitplugin,
-         qtdeclarative5-unity-action-plugin,
          qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-unity-action-plugin,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Unity Webapps QML component
@@ -38,8 +39,8 @@
 Package: unity-webapps-qml-examples
 Section: libs
 Architecture: any
-Depends: unity-webapps-qml (>= ${binary:Version}),
-         qtdeclarative5-window-plugin,
+Depends: qtdeclarative5-window-plugin,
+         unity-webapps-qml (>= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Example usage of Unity Webapps QML component
@@ -61,11 +62,11 @@
 Depends: dpkg-dev,
          libautopilot-qt,
          libqt5test5,
+         python-autopilot,
          python-gobject,
          qmlscene,
          qtdeclarative5-unity-action-plugin,
          qtdeclarative5-window-plugin,
-         unity-autopilot,
          unity-webapps-qml (>= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},
 
=== modified file 'debian/unity-webapps-qml-examples.install'
--- debian/unity-webapps-qml-examples.install	2013-07-29 14:49:52 +0000
+++ debian/unity-webapps-qml-examples.install	2013-11-18 19:11:23 +0000
@@ -1,5 +1,5 @@
 usr/share/applications/unity-webapps-qml-basic-example.desktop
 usr/share/applications/unity-webapps-qml-bbcnews-example.desktop
+usr/share/applications/unity-webapps-qml-facebookmessenger-example.desktop
 usr/share/applications/unity-webapps-qml-model-example.desktop
-usr/share/applications/unity-webapps-qml-facebookmessenger-example.desktop
 usr/share/unity-webapps-qml/examples