Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/remove_qmlrunner into lp:ubuntu-ui-toolkit

[Timo Jyrinki]

Remove qmlrunner. On saucy, the less complicated way is to just use qmlscene with either environment variable set or with a command line parameter.

Remove qmlrunner. On saucy, the less complicated way if to just use qmlscene with either environment variable set or with a command line parameter.

See eg. https://code.launchpad.net/~timo-jyrinki/ubuntu-seeds/ubuntu-touch.remove-qt5default/+merge/165291 for rationale.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:540
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/166/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/166/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

Is anybody using qmlrunner out there? any app, anything?

[Timo Jyrinki (timo-jyrinki)]

Not that I know of. I also grepped a whole device image for qmlrunner with no results.

=== modified file 'debian/control'
--- debian/control	2013-05-23 07:43:46 +0000
+++ debian/control	2013-06-12 05:37:29 +0000
@@ -108,20 +108,3 @@
 Description: Test package for Ubuntu UI Toolkit
  Autopilot tests for the ubuntu-ui-toolkit package
 
-Package: qmlrunner
-Architecture: amd64 i386 armhf
-Depends: qmlscene
-Conflicts: qtchooser
-Description: Simple QML Scene symlink provider
- A simple qmlscene symlink provider. Depend on this package instead of 
- qtchooser/qt5-default/qmlscene in the following way:
- .
- Depends: qmlrunner | qtchooser
- .
- The conditional dependency allows either having just qmlrunner installed, 
- or having for example full ubuntu-sdk (and qt5-default/qtchooser).
- .
- This package will be eventually replaced by  upstream 'qml' tool, so 
- it is encouraged to use the '/usr/bin/qml' symlink already which is also 
- provided by this package.
-

=== removed file 'debian/qmlrunner.install'
--- debian/qmlrunner.install	2013-05-08 05:25:53 +0000
+++ debian/qmlrunner.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/bin/qml
-usr/bin/qmlscene

=== modified file 'debian/rules'
--- debian/rules	2013-05-29 04:56:18 +0000
+++ debian/rules	2013-06-12 05:37:29 +0000
@@ -8,15 +8,6 @@
 %:
 	dh $@ --fail-missing
 
-override_dh_auto_install:
-	dh_auto_install
-	# Temporary hacks until proper upstream binary installed
-	# Provide both legacy qmlscene and future qml links
-	# -> users may update to use the 'qml' name
-	mkdir -p $(CURDIR)/debian/tmp/usr/bin
-	ln -s /usr/lib/$(DEB_HOST_MULTI_ARCH)/qt5/bin/qmlscene $(CURDIR)/debian/tmp/usr/bin/qml
-	ln -s /usr/lib/$(DEB_HOST_MULTI_ARCH)/qt5/bin/qmlscene $(CURDIR)/debian/tmp/usr/bin/qmlscene
-
 override_dh_install:
 	dh_auto_build -- docs
 	mkdir -p debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch