Merge lp:~robru/unity-webapps-qml/more-packaging-fixups into lp:unity-webapps-qml

[Robert Bruce Park]

Minor packaging fixes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-qml-ci/7/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-07-11 18:04:33 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/control'
--- debian/control	2013-07-09 20:56:17 +0000
+++ debian/control	2013-07-11 18:04:33 +0000
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 Build-Depends: debhelper (>= 9),
-	       python (>= 2.7),
-	       python-setuptools,
                gdb,
                libmessaging-menu-dev,
                libnotify-dev,
                pkg-config,
+               python (>= 2.7),
+               python-setuptools,
                qt5-default,
                qt5-qmake,
                qtbase5-dev,
@@ -35,7 +35,7 @@
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Example usage of Unity Webapps QML component
- Example usage of Unity Webapps QML component.
+ Some examples demonstrating the webapps QML component.
 
 Package: unity-webapps-qml-doc
 Section: doc
@@ -52,15 +52,15 @@
 
 Package: unity-webapps-qml-autopilot
 Architecture: all
-Depends: ${misc:Depends},
-         ${python:Depends},
-         dpkg-dev,
+Depends: dpkg-dev,
          libautopilot-qt,
          libqt5test5,
          libqt5webkit5-qmlwebkitplugin,
          qmlscene,
          qtdeclarative5-qtquick2-plugin,
-         unity-webapps-qml (= ${binary:Version}),
+         unity-webapps-qml (>= ${source:Version}),
+         ${misc:Depends},
+         ${python:Depends},
 Description: Autopilot tests for the Unity Webapps QML
  Unity Webapps QML is a QML component that binds to a QML WebView and allows
  running javascript code to access Ubuntu stack components. This package

=== modified file 'debian/rules'
--- debian/rules	2013-07-09 20:56:17 +0000
+++ debian/rules	2013-07-11 18:04:33 +0000
@@ -4,11 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-override_dh_install:
-	dh_install --fail-missing
-
 %:
-	dh $@ --fail-missing --with python2
+	dh $@ --with python2
 
 override_dh_install:
 	# install autopilot tests
@@ -18,4 +15,3 @@
 	done; \
 	cd $(CURDIR)
 	dh_install -X'*.pyc' --fail-missing
-

=== modified file 'debian/unity-webapps-qml-autopilot.install'
--- debian/unity-webapps-qml-autopilot.install	2013-07-09 19:02:23 +0000
+++ debian/unity-webapps-qml-autopilot.install	2013-07-11 18:04:33 +0000
@@ -1,4 +1,3 @@
-usr/lib/python*
 tests/integration/autopilot/html/* usr/share/unity-webapps-qml/autopilot-tests/html/
 tests/integration/autopilot/qml/* usr/share/unity-webapps-qml/autopilot-tests/qml/
-
+usr/lib/python*

=== modified file 'debian/unity-webapps-qml.install'
--- debian/unity-webapps-qml.install	2013-07-09 19:02:23 +0000
+++ debian/unity-webapps-qml.install	2013-07-11 18:04:33 +0000
@@ -1,2 +1,2 @@
+usr/bin
 usr/lib/*/qt5/qml/Ubuntu/UnityWebApps/*
-usr/bin