Merge lp:~zyga/cdts/packaging into lp:~registry/cdts/ppa-packaging-cdts

[Zygmunt Krynicki]

[lp:~zyga/cdts/packaging]

70. By Zygmunt Krynicki on 2014-04-24

* debian/control: Convert to a launcher + provider. Update long descriptions
  build and runtime dependencies. Switch to arch: all
* debian/rules: Build and validate the provider
* debian/compat: bump to 9
* debian/copyright: rename to cdts

[Daniel Manrique (roadmr)]

Looks good, I'll approve and trigger a build later today, see what happens. It's OK as we can test it from the PPA while the official release tarballs provide a fallback for unsuspecting users.

Thanks!

review: Approve

=== added file 'debian/canonical-driver-test-suite.install'
--- debian/canonical-driver-test-suite.install	1970-01-01 00:00:00 +0000
+++ debian/canonical-driver-test-suite.install	2014-04-24 21:13:25 +0000
@@ -0,0 +1,2 @@
+usr/bin/canonical-driver-test-suite
+usr/share/applications/canonical-driver-test-suite.desktop

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-04 01:12:37 +0000
+++ debian/changelog	2014-04-24 21:13:25 +0000
@@ -1,3 +1,13 @@
+canonical-driver-test-suite (1.9~1) UNRELEASED; urgency=medium
+
+  * debian/control: Convert to a launcher + provider. Update long descriptions
+    build and runtime dependencies. Switch to arch: all
+  * debian/rules: Build and validate the provider
+  * debian/compat: bump to 9
+  * debian/copyright: rename to cdts
+
+ -- Zygmunt Krynicki <[e-mail]>  Thu, 24 Apr 2014 22:54:44 +0200
+
 canonical-driver-test-suite (1.8) trusty; urgency=low
 
   * whitelist ordering of jobs is not preserved by clients (LP: #1213893)

=== modified file 'debian/compat'
--- debian/compat	2013-08-15 12:34:56 +0000
+++ debian/compat	2014-04-24 21:13:25 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2014-03-28 20:50:34 +0000
+++ debian/control	2014-04-24 21:13:25 +0000
@@ -1,67 +1,59 @@
 Source: canonical-driver-test-suite
-Maintainer: Checkbox IHV NG Team <[e-mail]>
+Maintainer: Checkbox Developers <[e-mail]> 
 Section: misc
 Priority: optional
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9),
-               libqt5sql5-sqlite,
-               plainbox (>= 0.5),
-               qt5-default,
-               qtbase5-dev,
-               qtdeclarative5-cordova-2.8-plugin,
-               qtdeclarative5-dev,
-               qttools5-dev-tools
-Vcs-Bzr: https://code.launchpad.net/~checkbox-ihv-ng/checkbox-ihv-ng/packaging
+Build-Depends:
+ debhelper (>= 9),
+ intltool,
+ python3,
+ python3-plainbox (>= 0.5.3),
+Vcs-Bzr: https://code.launchpad.net/~checkbox-ihv-ng/cdts/packaging
 
 Package: canonical-driver-test-suite
-Architecture: any
+Architecture: all
 Conflicts: plainbox-ihv-demo-config
 Replaces: plainbox-ihv-demo-config
-Depends: checkbox-ng (>= 0.3~dev),
-         checkbox-ng-service (>= 0.3~dev),
-         libqt5xml5,
-         plainbox-provider-canonical-driver-test-suite,
-         plainbox-provider-resource-generic (>= 0.3~dev),
-         python3-checkbox-ng (>= 0.3~dev),
-         python3-checkbox-support (>= 0.2~dev),
-         qtdeclarative5-localstorage-plugin,
-         qtdeclarative5-qtquick2-plugin,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
-         ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ checkbox-gui,
+ plainbox-provider-canonical-driver-test-suite,
+ plainbox-provider-resource-generic (>= 0.3~dev),
 Description: Tool for testing driver compatibility with Ubuntu.
- The Canonical Driver Test Suite provides a user interface and
- set of tests for verifying that hardware components work with Ubuntu.
+ The Canonical Driver Test Suite provides a user interface and set of tests for
+ verifying that hardware components work with Ubuntu.
  .
- Provides the canonical-driver-test-suite binary.
+ Provides the canonical-driver-test-suite executable.
 
 Package: plainbox-provider-canonical-driver-test-suite
 Section: misc
 Architecture: all
 Conflicts: checkbox-ihv-audio, checkbox-ihv-graphics, checkbox-ihv-wireless
 Replaces: checkbox-ihv-audio, checkbox-ihv-graphics, checkbox-ihv-wireless
-Depends: fwts (>=13.09.00-0ubuntu1),
-         gir1.2-gst-plugins-base-1.0,
-         gir1.2-gstreamer-1.0,
-         glmark2,
-         globs,
-         gstreamer1.0-plugins-good,
-         gstreamer1.0-pulseaudio,
-         gtkperf,
-         iperf,
-         libgstreamer1.0-0,
-         libqt4-dev,
-         libqt4-opengl-dev,
-         mesa-utils,
-         obexftp,
-         piglit,
-         plainbox-provider-checkbox (>= 0.4~dev),
-         python3-gi,
-         qmlscene,
-         render-bench,
-         wmctrl,
-         x11-apps (>>7.7~1)
-Description: Tool for testing driver compatibility with Ubuntu.
- The Canonical Driver Test Suite provides a user interface and
- set of tests for verifying that hardware components work with Ubuntu.
+Depends:
+ fwts (>=13.09.00-0ubuntu1),
+ gir1.2-gst-plugins-base-1.0,
+ gir1.2-gstreamer-1.0,
+ glmark2,
+ globs,
+ gstreamer1.0-plugins-good,
+ gstreamer1.0-pulseaudio,
+ gtkperf,
+ iperf,
+ libgstreamer1.0-0,
+ libqt4-dev,
+ libqt4-opengl-dev,
+ mesa-utils,
+ obexftp,
+ piglit,
+ plainbox-provider-checkbox (>= 0.4~dev),
+ python3-gi,
+ qmlscene,
+ render-bench,
+ wmctrl,
+ x11-apps (>>7.7~1)
+Description: Tool for testing driver compatibility with Ubuntu (PlainBox Provider).
+ The Canonical Driver Test Suite provides a user interface and set of tests for
+ verifying that hardware components work with Ubuntu.
  .
  Provides the hardware test suites.

=== modified file 'debian/copyright'
--- debian/copyright	2014-01-27 20:00:02 +0000
+++ debian/copyright	2014-04-24 21:13:25 +0000
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Checkbox IHV (NG)
-Source: https://code.launchpad.net/~checkbox-ihv-ng/checkbox-ihv-ng/trunk
+Upstream-Name: Canonical Driver Test Suite 
+Source: https://code.launchpad.net/~checkbox-ihv-ng/cdts/trunk
 
-Files: plainbox-gui/data/dolby51.ac3
+Files: plainbox-provider-canonical-driver-test-suite/data/dolby51.ac3
 Copyright: Copyright 2013 Dr. Richard Marschall
 Comment: http://quicktoots.linux-audio.com/index.php?t=4
 License: GFDL 1.1

=== removed directory 'debian/extras'
=== removed directory 'debian/extras/config'
=== removed file 'debian/extras/config/plainbox.conf'
--- debian/extras/config/plainbox.conf	2013-09-26 13:03:18 +0000
+++ debian/extras/config/plainbox.conf	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-; This configuration file is coming from the
-; canonical-driver-test-suite package.
-; 
-; Do not edit it, it is not a conffile, it WILL
-; be automatically upgraded without asking.
-; You have been warned.
-[common]
-default_provider=ihv

=== modified file 'debian/plainbox-provider-canonical-driver-test-suite.install'
--- debian/plainbox-provider-canonical-driver-test-suite.install	2014-01-31 21:04:32 +0000
+++ debian/plainbox-provider-canonical-driver-test-suite.install	2014-04-24 21:13:25 +0000
@@ -1,4 +1,3 @@
-checkbox/plainbox-gui/data/* /usr/lib/plainbox-providers-1/canonical-driver-test-suite/data/
-checkbox/plainbox-gui/jobs/* /usr/lib/plainbox-providers-1/canonical-driver-test-suite/jobs/
-checkbox/plainbox-gui/providers-1/canonical-driver-test-suite.provider /usr/share/plainbox-providers-1/
-checkbox/plainbox-gui/whitelists/ihv-*.whitelist /usr/lib/plainbox-providers-1/canonical-driver-test-suite/whitelists/
+usr/share/2013.com.canonical.certification:canonical-driver-test-suite/*
+usr/share/plainbox-providers-1/2013.com.canonical.certification.canonical-driver-test-suite.provider
+usr/share/locale/*/LC_MESSAGES/2013_com_canonical_certification_canonical-driver-test-suite.mo

=== modified file 'debian/rules'
--- debian/rules	2013-10-31 21:19:53 +0000
+++ debian/rules	2014-04-24 21:13:25 +0000
@@ -1,12 +1,20 @@
 #!/usr/bin/make -f
+PPA_DISPLACEMENT=plainbox-provider-canonical-driver-test-suite
 
 %:
-	dh $@
+	dh $@ --sourcedirectory=$(PPA_DISPLACEMENT)
+
+override_dh_auto_clean:
+	cd $(PPA_DISPLACEMENT) && python3 manage.py clean
 
 override_dh_auto_build:
-	(cd $(CURDIR)/checkbox/plainbox-gui && qmake PREFIX=/usr && make)
-
-
-override_dh_install:
-	(cd $(CURDIR)/checkbox/plainbox-gui && make INSTALL_ROOT=../../../debian/canonical-driver-test-suite install)
-	dh_install
+	cd $(PPA_DISPLACEMENT) && python3 manage.py build
+	cd $(PPA_DISPLACEMENT) && python3 manage.py i18n
+
+override_dh_auto_test:
+	cd $(PPA_DISPLACEMENT) && python3 manage.py validate 
+
+override_dh_auto_install:
+	cd $(PPA_DISPLACEMENT) && python3 manage.py install \
+		--prefix=/usr --layout=unix \
+		--root=$(CURDIR)/debian/tmp/