Sync package with the distro

8 files changed, 52 insertions, 60 deletions

diff --git a/autopilot/tests/unit/test_application_launcher.py b/autopilot/tests/unit/test_application_launcher.py
index f8b88867..3de78194 100644
--- a/autopilot/tests/unit/test_application_launcher.py
+++ b/autopilot/tests/unit/test_application_launcher.py
@@ -1064,7 +1064,7 @@ class ApplicationLauncherInternalTests(TestCase):
 test_path = self.getUniqueString()
 expected_error = "Unable to find path for application {app}: Command"\
 " '['which', '{app}']' returned non-zero exit "\
- "status 1".format(app=test_path)
+ "status 1.".format(app=test_path)
 with patch.object(_l.subprocess, 'check_output') as check_output:
 check_output.side_effect = subprocess.CalledProcessError(
 1,
@@ -1079,7 +1079,7 @@ class ApplicationLauncherInternalTests(TestCase):
 def test_get_application_launcher_wrapper_raises_runtimeerror(self):
 test_path = self.getUniqueString()
 expected_error = "Command '['ldd', '%s']' returned non-zero exit"\
- " status 1" % test_path
+ " status 1." % test_path
 with patch.object(_l.subprocess, 'check_output') as check_output:
 check_output.side_effect = subprocess.CalledProcessError(
 1,
diff --git a/autopilot/tests/unit/test_custom_exceptions.py b/autopilot/tests/unit/test_custom_exceptions.py
index 1f3fdc38..1fdf3d77 100644
--- a/autopilot/tests/unit/test_custom_exceptions.py
+++ b/autopilot/tests/unit/test_custom_exceptions.py
@@ -44,4 +44,4 @@ class BackendExceptionTests(TestCase):
 self.assertThat(
 repr(err), Equals(
 "BackendException('Error while initialising backend. Original "
- "exception was: Hello World',)"))
+ "exception was: Hello World')"))
diff --git a/autopilot/tests/unit/test_pick_backend.py b/autopilot/tests/unit/test_pick_backend.py
index 48de5877..b416e6dc 100644
--- a/autopilot/tests/unit/test_pick_backend.py
+++ b/autopilot/tests/unit/test_pick_backend.py
@@ -134,7 +134,7 @@ class PickBackendTests(TestCase):
 fn = lambda: _pick_backend(backend_dict, '')
 expected_exception = RuntimeError(dedent("""\
 Unable to instantiate any backends
- be1: ValueError('Foo',)
- be2: ValueError('Foo',)"""))
+ be1: ValueError('Foo')
+ be2: ValueError('Foo')"""))
 
 self.assertThat(fn, raises(expected_exception))
diff --git a/debian/changelog b/debian/changelog
index 728406f2..8f317dea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+autopilot (1.6.0+17.04.20170313-0ubuntu6) focal; urgency=medium
+
+ * Drop dvipng build-dep.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 06 Feb 2020 04:19:11 +0000
+
+autopilot (1.6.0+17.04.20170313-0ubuntu5) focal; urgency=medium
+
+ * Drop autopilot-qt dependencies, as qt4 is going away and autopilot-qt
+ ftbfs against new qt5 but is also unused.
+ * Drop building documentation sphinx errors.
+ * Tweak test-suite assertions.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 06 Feb 2020 03:42:25 +0000
+
+autopilot (1.6.0+17.04.20170313-0ubuntu3) artful; urgency=medium
+
+ * Cherrypick upstream fix for tests.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 24 Apr 2017 11:03:59 +0100
+
+autopilot (1.6.0+17.04.20170313-0ubuntu2) artful; urgency=medium
+
+ * Drop upstart build-dep, as it is going away.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 24 Apr 2017 10:29:11 +0100
+
+autopilot (1.6.0+17.04.20170313-0ubuntu1) zesty; urgency=medium
+
+ [ Tarmac ]
+ * New release
+
+ -- Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com> Mon, 13 Mar 2017 17:21:58 +0000
+
+autopilot (1.6.0+17.04.20170302-0ubuntu1) zesty; urgency=medium
+
+ [ Santiago Baldassin, Tarmac ]
+ * New upstream release.
+
+ -- Rodney Dawes <rodney.dawes@canonical.com> Thu, 02 Mar 2017 18:50:40 +0000
+
 autopilot (1.6.0+16.10.20160818.1-0ubuntu1) yakkety; urgency=medium
 
 * Autopilot proxy object
diff --git a/debian/control b/debian/control
index 0d8fd3d6..07926ba4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,9 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Thomi Richards <thomi.richards@canonical.com>
 Build-Depends: debhelper (>= 9.0.0),
 dh-python,
- dvipng,
 gir1.2-gtk-3.0,
 gir1.2-ibus-1.0,
- gir1.2-ubuntu-app-launch-3,
+ gir1.2-ubuntu-app-launch-3 | gir1.2-ubuntu-app-launch-2,
 graphviz,
 libjs-jquery,
 libjs-underscore,
@@ -25,26 +24,22 @@ Build-Depends: debhelper (>= 9.0.0),
 python3-pil,
 python3-psutil,
 python3-setuptools,
- python3-sphinx,
 python3-subunit,
 python3-systemd,
 python3-testscenarios,
 python3-testtools,
 python3-tz,
 python3-xlib (>=0.14+20091101-1ubuntu3),
- sphinx-common,
 texlive-latex-extra,
-# depend on upstart to not build on s390x until upstart is available.
- upstart,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/autopilot
-Vcs-Git: https://code.launchpad.net/autopilot/+git
+Vcs-Bzr: https://code.launchpad.net/~autopilot/autopilot/trunk
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.3
 
 Package: python3-autopilot
 Architecture: all
-Depends: gir1.2-ubuntu-app-launch-3,
+Depends: gir1.2-ubuntu-app-launch-3 | gir1.2-ubuntu-app-launch-2,
 libjs-jquery,
 libjs-underscore,
 mir-utils,
@@ -69,7 +64,6 @@ Recommends: gir1.2-glib-2.0,
 gir1.2-gtk-3.0,
 gir1.2-ibus-1.0,
 libautopilot-gtk (>= 1.4),
- libautopilot-qt (>= 1.4),
 python3-autopilot-trace,
 python3-xlib (>=0.14+20091101-1ubuntu3),
 recordmydesktop,
@@ -85,6 +79,7 @@ Description: Utility to write and run integration tests easily (Python 3)
 Package: python3-autopilot-trace
 Architecture: any
 Depends: python3-autopilot,
+ ${python3:Depends},
 ${misc:Depends},
 ${shlibs:Depends},
 Description: Support for tracing in autopilot (Python 3)
@@ -92,19 +87,6 @@ Description: Support for tracing in autopilot (Python 3)
 autopilot tests. This is useful when using autopilot to exercise
 an instrumented application.
 
-Package: autopilot-touch
-Architecture: all
-Section: metapackages
-Depends: autopilot-qt5,
- fbset,
- python3-autopilot,
- python3-evdev,
- qttestability-autopilot,
- ${misc:Depends},
-Description: Autopilot support for the ubuntu Touch platform
- This metapackage exists to depend on the packages needed to install and use
- autopilot on the Ubuntu Touch platform.
-
 Package: autopilot-desktop
 Architecture: all
 Section: metapackages
@@ -115,38 +97,18 @@ Depends: at-spi2-core,
 python3-autopilot,
 python3-xlib (>=0.14+20091101-1ubuntu3),
 ${misc:Depends},
-Recommends: python3-autopilot-vis,
- python3-evdev,
+Recommends: python3-evdev,
 Description: Autopilot support for the ubuntu Desktop platform
 This metapackage exists to depend on the packages needed to install and use
 autopilot on the Ubuntu Desktop platform.
 
-Package: python3-autopilot-vis
-Architecture: all
-Depends: gnome-icon-theme,
- python3-autopilot,
- python3-dbus,
- python3-dbus.mainloop.qt,
- python3-pyqt4,
- ${misc:Depends},
- ${python3:Depends},
-Recommends: python3-lxml,
-Description: visualisation application for Autopilot (Python 3)
- The Autopilot vis tool allows you to inspect an application introspection
- tree. It is a useful tool for test authors, but not required to run autopilot
- tests.
-
 Package: python3-autopilot-tests
 Architecture: all
 Depends: libautopilot-gtk (>= 1.4),
- libautopilot-qt (>= 1.4),
 python-windowmocker,
 python3-autopilot,
 python3-dateutil,
- python3-dbus.mainloop.qt,
 python3-evdev,
- python3-pyqt4,
- qmlscene,
 recordmydesktop,
 ${misc:Depends},
 ${python3:Depends},
diff --git a/debian/python3-autopilot.docs b/debian/python3-autopilot.docs
deleted file mode 100644
index 3393f046..00000000
--- a/debian/python3-autopilot.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-build/sphinx/html/
-build/sphinx/json/
diff --git a/debian/python3-autopilot.manpages b/debian/python3-autopilot.manpages
deleted file mode 100644
index c65fe733..00000000
--- a/debian/python3-autopilot.manpages
+++ /dev/null
@@ -1 +0,0 @@
-build/sphinx/man/autopilot3.1
diff --git a/debian/rules b/debian/rules
index 56836a64..690c2040 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,18 +5,10 @@
 # export DH_VERBOSE=1
 
 %:
-	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
-
-override_dh_sphinxdoc:
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745690
-	-dh_sphinxdoc
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_build:
-	python3 -m flake8 --ignore=E731,E226,W503 .
	dh_auto_build
-	python3 setup.py build_sphinx -b html
-	python3 setup.py build_sphinx -b json
-	python3 setup.py build_sphinx -b man
 
 override_dh_auto_test:
 ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))