diff -Naur debian/control ../qtmir-gles/debian/control
--- debian/control	2015-10-26 20:32:53.840663000 +0100
+++ ../qtmir-gles/debian/control	2015-10-26 20:32:33.224515000 +0100
@@ -1,4 +1,4 @@
-Source: qtmir
+Source: qtmir-gles
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
@@ -6,33 +6,40 @@
                cmake-extras (>= 0.3),
                debhelper (>= 9),
                google-mock (>= 1.6.0+svn437),
+               libboost-system-dev,
                libfontconfig1-dev,
                libgles2-mesa-dev,
                libglib2.0-dev,
                libgsettings-qt-dev,
                liblttng-ust-dev,
-               libmirclient-dev (>= 0.17.0),
-               libmircommon-dev (>= 0.17.0),
-               libmirserver-dev (>= 0.17.0),
-               mir-renderer-gl-dev (>= 0.17.0),
+               libmirclient-dev (>= 0.16.0),
+               libmircommon-dev (>= 0.16.0),
+               libmirserver-dev (>= 0.16.0),
+               mir-renderer-gl-dev (>= 0.16.0),
                libmtdev-dev,
                libprocess-cpp-dev,
+               libqt5gui5-gles,
+               libqt5quick5-gles,
+               libqt5quickparticles5-gles,
+               libqt5quicktest5,
+               libqt5quickwidgets5-gles,
+               libqt5sensors5-dev,
                libqtdbusmock1-dev (>= 0.2),
                libqtdbustest1-dev (>= 0.2),
-               libqt5sensors5-dev,
                libubuntu-app-launch2-dev,
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 7.101),
+               libunity-api-dev (>= 7.100),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
                pkg-config,
+               protobuf-compiler,
 # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
                python3:any,
                qt5-default,
-               qtbase5-dev,
-               qtbase5-private-dev,
+               qtbase5-gles-dev,
+               qtbase5-private-gles-dev,
                qtdeclarative5-dev,
                qtdeclarative5-private-dev,
 Standards-Version: 3.9.5
@@ -40,12 +47,11 @@
 # 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:qtmir
-Vcs-Browser: http://bazaar.launchpad.net/~mir-team/qtmir/trunk/files
-Xs-Testsuite: autopkgtest
+Vcs-Bzr: lp:qtmir/gles
+Vcs-Browser: http://bazaar.launchpad.net/~mir-team/qtmir/gles/files
 
 Package: qtmir-android
-Architecture: armhf
+Architecture: amd64 i386
 Multi-Arch: same
 Conflicts: libqtmir,
            qtmir-desktop,
@@ -56,65 +62,10 @@
 Provides: qtmir,
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile)
- QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
- It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
- a Mir server. It also exposes some internal Mir functionality.
- .
- This variant of the package is for Android-based phones and tablets.
-
-Package: qtmir-desktop
-Architecture: any
-Multi-Arch: same
-Conflicts: qtmir-android,
-           qtubuntu-android,
-Replaces: libqtmir,
-          qtmir-android,
-          qtubuntu-android,
-Provides: qtmir,
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Qt platform abstraction (QPA) plugin for a Mir server (desktop)
+Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile) - OpenGLES
  QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
  It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
  a Mir server. It also exposes some internal Mir functionality.
  .
- This variant of the package is for GNU-based desktops.
-
-Package: qtdeclarative5-qtmir-plugin
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Replaces: libqtmir,
-          libunity-mir1,
-Conflicts: libqtmir,
-           libunity-mir1,
-Provides: unity-application-impl,
-          unity-application-impl-9,
-Description: Qt plugin for Unity specific Mir APIs
- QtMir provides Qt/QML bindings for Mir features that are exposed through the
- qtmir-desktop or qtmir-android QPA plugin such as Application management
- (start/stop/suspend/resume) and surface management.
-
-Package: qtmir-tests
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: autopilot-qt5,
-         littler,
-         lttng-tools,
-         mir-test-tools,
-         python3-autopilot,
-         python3-babeltrace,
-         python3-evdev,
-         python3-mir-perf-framework,
-         qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
-         qtdeclarative5-qtmir-plugin,
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: QtMir tests and demos
- This package provides benchmark tests and a simple shell and client using the
- QtMir QPA.
+ This variant of the package is for Android-based phones and tablets (built
+ against the OpenGLES variant of qtbase).
diff -Naur debian/copyright ../qtmir-gles/debian/copyright
--- debian/copyright	2015-09-03 10:47:29.162857000 +0200
+++ ../qtmir-gles/debian/copyright	2015-03-18 11:48:46.800437874 +0100
@@ -1,17 +1,17 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: qtmir
+Upstream-Name: unity-mir
 
 Files: *
-Copyright: 2013-2014 Canonical Ltd.
+Copyright: 2013 Canonical Ltd.
 License: LGPL-3
 
 Files: debian/*
-Copyright: 2013-2014 Canonical Ltd.
+Copyright: 2013 Canonical Ltd.
 License: GPL-3
 
 Files: tests/*
-Copyright: 2013-2014 Canonical Ltd.
-License: LGPL-3
+Copyright: 2013 Canonical Ltd.
+License: GPL-3
 
 License: LGPL-3
  This package is free software; you can redistribute it and/or
diff -Naur debian/qtdeclarative5-qtmir-plugin.install ../qtmir-gles/debian/qtdeclarative5-qtmir-plugin.install
--- debian/qtdeclarative5-qtmir-plugin.install	2015-09-03 10:47:29.162857000 +0200
+++ ../qtmir-gles/debian/qtdeclarative5-qtmir-plugin.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/*/qt5/qml/*
-usr/share/glib-2.0/schemas
diff -Naur debian/qtmir-desktop.install ../qtmir-gles/debian/qtmir-desktop.install
--- debian/qtmir-desktop.install	2015-01-12 10:05:41.811668633 +0100
+++ ../qtmir-gles/debian/qtmir-desktop.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/*/qt5/plugins/platforms/*
diff -Naur debian/qtmir-tests.install ../qtmir-gles/debian/qtmir-tests.install
--- debian/qtmir-tests.install	2015-10-26 20:32:53.840663000 +0100
+++ ../qtmir-gles/debian/qtmir-tests.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-usr/bin/qtmir-demo-shell
-usr/bin/qtmir-demo-client
-usr/share/applications/qtmir-demo-client.desktop
-usr/share/qtmir/qtmir-demo-shell/
-usr/share/qtmir/qtmir-demo-client/*
-usr/share/qtmir/benchmarks/*
diff -Naur debian/rules ../qtmir-gles/debian/rules
--- debian/rules	2015-10-26 20:32:53.840663000 +0100
+++ ../qtmir-gles/debian/rules	2015-10-26 20:32:33.224515000 +0100
@@ -3,60 +3,36 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
-include /usr/share/dpkg/default.mk
-
+VERSION := $(shell dpkg-parsechangelog | sed -n -e's/^Version: \(.*\)-[^-]\+/\1/p')
+SOURCE := $(shell dpkg-parsechangelog | sed -n -e's/^Source: \(.*\)-gles/\1/p')
 ANDROID_DIR = build-android
-DESKTOP_DIR = build-desktop
 TMP1_DIR = $(CURDIR)/debian/tmp1
-TMP2_DIR = $(CURDIR)/debian/tmp2
-
-# We only want to build qtmir-android on arches using Qt built with OpenGL ES2.0
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-gles2_architectures = armhf
 
-USES_GLES2 = $(findstring $(DEB_HOST_ARCH), $(gles2_architectures))
+# Don't try this at /home/: It will only work within https://ci-train.ubuntu.com
+get-orig-source:
+	cp -v ~/silos/$(SILONAME)/$(SOURCE)_$(VERSION).orig.tar.gz \
+	      $(CURDIR)/$(SOURCE)-gles_$(VERSION).orig.tar.gz
 
 %:
-	dh $@ --parallel --fail-missing
+	dh $@ --parallel
 
 override_dh_clean:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 	rm -rf $(TMP1_DIR)
-endif
-	rm -rf $(TMP2_DIR)
 	dh_clean
 
 override_dh_auto_configure:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
-	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
-# See comment in CMakeLists.txt
-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGL_BUT_LINK_AGAINST_OPENGLES=1
-else
-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
-endif
+	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(CURDIR) -DCMAKE_INSTALL_PREFIX=$(TMP1_DIR)/usr/ -DUSE_OPENGLES=1
 
 override_dh_auto_build:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 	dh_auto_build -B$(ANDROID_DIR)
-endif
-	dh_auto_build -B$(DESKTOP_DIR)
 
 override_dh_auto_test:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 	dh_auto_test -B$(ANDROID_DIR)
-endif
-	dh_auto_test -B$(DESKTOP_DIR)
 
 override_dh_auto_install:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
-	dh_auto_install -B$(ANDROID_DIR) --destdir=$(TMP1_DIR)
-endif
-	dh_auto_install -B$(DESKTOP_DIR) --destdir=$(TMP2_DIR)
+	mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
+	cd $(CURDIR)
 
 override_dh_install:
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 	dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android
-endif
-	dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop
-	dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin
-	dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests
+
diff -Naur debian/source/format ../qtmir-gles/debian/source/format
--- debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ ../qtmir-gles/debian/source/format	2014-10-14 17:01:32.806524000 +0200
@@ -0,0 +1 @@
+1.0
diff -Naur debian/tests/control ../qtmir-gles/debian/tests/control
--- debian/tests/control	2015-02-27 12:16:49.843383000 +0100
+++ ../qtmir-gles/debian/tests/control	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-Tests: run-tests
-Restrictions: build-needed
-Depends: @,
diff -Naur debian/tests/run-tests ../qtmir-gles/debian/tests/run-tests
--- debian/tests/run-tests	2015-02-27 12:16:49.843383000 +0100
+++ ../qtmir-gles/debian/tests/run-tests	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-# Do nothing here. We don't need to run the tests multiple times, and they
-# are already being run during the build phase of the autopkgtest, as we
-# require a built tree to run them, and the tests are run as part of the
-# normal package build process. We do want to test that things install, though
-# and at least one test is actually required, for autopkgtest to work.
-