Merge lp:~saviq/qtmir/gles-update-packaging into lp:qtmir/gles

[Michał Sawicz]

Bring packaging in line with upstream and add autopkgtest

[lp:~saviq/qtmir/gles-update-packaging]

128. By Michał Sawicz on 2015-10-28

Drop --fail-missing, as we only package part of the build

[Gerry Boland (gerboland)]

Tested locally, works good.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-10-09 14:51:02 +0000
+++ debian/control	2015-10-28 09:34:54 +0000
@@ -6,16 +6,14 @@
                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.16.0),
-               libmircommon-dev (>= 0.16.0),
-               libmirserver-dev (>= 0.16.0),
-               mir-renderer-gl-dev (>= 0.16.0),
+               libmirclient-dev (>= 0.17.0),
+               libmircommon-dev (>= 0.17.0),
+               libmirserver-dev (>= 0.17.0),
                libmtdev-dev,
                libprocess-cpp-dev,
                libqt5gui5-gles,
@@ -29,12 +27,12 @@
                libubuntu-app-launch2-dev,
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 7.100),
+               libunity-api-dev (>= 7.101),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
+               mir-renderer-gl-dev (>= 0.17.0),
                pkg-config,
-               protobuf-compiler,
 # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
                python3:any,
                qt5-default,
@@ -49,6 +47,7 @@
 # upstream branch
 Vcs-Bzr: lp:qtmir/gles
 Vcs-Browser: http://bazaar.launchpad.net/~mir-team/qtmir/gles/files
+Xs-Testsuite: autopkgtest
 
 Package: qtmir-android
 Architecture: amd64 i386

=== modified file 'debian/copyright'
--- debian/copyright	2014-07-16 11:21:02 +0000
+++ debian/copyright	2015-10-28 09:34:54 +0000
@@ -1,16 +1,16 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: unity-mir
+Upstream-Name: qtmir-gles
 
 Files: *
-Copyright: 2013 Canonical Ltd.
+Copyright: 2013-2015 Canonical Ltd.
 License: LGPL-3
 
 Files: debian/*
-Copyright: 2013 Canonical Ltd.
+Copyright: 2013-2015 Canonical Ltd.
 License: GPL-3
 
 Files: tests/*
-Copyright: 2013 Canonical Ltd.
+Copyright: 2013-2015 Canonical Ltd.
 License: GPL-3
 
 License: LGPL-3

=== modified file 'debian/rules'
--- debian/rules	2015-10-09 17:30:30 +0000
+++ debian/rules	2015-10-28 09:34:54 +0000
@@ -21,7 +21,7 @@
 	dh_clean
 
 override_dh_auto_configure:
-	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(CURDIR) -DCMAKE_INSTALL_PREFIX=$(TMP1_DIR)/usr/ -DUSE_OPENGLES=1
+	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
 
 override_dh_auto_build:
 	dh_auto_build -B$(ANDROID_DIR)
@@ -30,9 +30,7 @@
 	dh_auto_test -B$(ANDROID_DIR)
 
 override_dh_auto_install:
-	mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
-	cd $(CURDIR)
+	dh_auto_install -B$(ANDROID_DIR) --destdir=$(TMP1_DIR)
 
 override_dh_install:
 	dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android
-

=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2014-07-16 11:21:02 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-1.0

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2015-10-28 09:34:54 +0000
@@ -0,0 +1,3 @@
+Tests: run-tests
+Restrictions: build-needed
+Depends: @

=== added file 'debian/tests/run-tests'
--- debian/tests/run-tests	1970-01-01 00:00:00 +0000
+++ debian/tests/run-tests	2015-10-28 09:34:54 +0000
@@ -0,0 +1,10 @@
+#!/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.
+