Merge lp:~roadmr/cdts/packaging-bluetooth-audio into lp:~checkbox-ihv-ng/cdts/ppa-packaging-cdts

Proposed by Daniel Manrique on 2014-01-24
Status: Merged
Approved by: Chris Gregan on 2014-01-24
Approved revision: 61
Merged at revision: 60
Proposed branch: lp:~roadmr/cdts/packaging-bluetooth-audio
Merge into: lp:~checkbox-ihv-ng/cdts/ppa-packaging-cdts
Diff against target: 32 lines (+17/-2)
2 files modified
debian/changelog (+14/-1)
debian/plainbox-provider-canonical-driver-test-suite.install (+3/-1)
To merge this branch: bzr merge lp:~roadmr/cdts/packaging-bluetooth-audio
Reviewer Review Type Date Requested Status
Chris Gregan 2014-01-24 Pending
Review via email: mp+203133@code.launchpad.net

Commit message

Packaging changes to accomodate restructuring of some files in lp:checkbox-ihv-ng, as well as adding some provider-specific jobs and data files. Providers rock!

Description of the change

Packaging changes to accomodate restructuring of some files in lp:checkbox-ihv-ng, as well as adding some provider-specific jobs and data files. Providers rock!

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-12-03 16:18:50 +0000
3+++ debian/changelog 2014-01-24 17:34:47 +0000
4@@ -1,4 +1,17 @@
5-canonical-driver-test-suite (1.4) UNRELEASED; urgency=low
6+canonical-driver-test-suite (1.6) UNRELEASED; urgency=low
7+
8+ * Bluetooth and audio test suites.
9+ * Updated packaging for some changes in files in the source tree.
10+
11+ -- Daniel Manrique <roadmr@ubuntu.com> Fri, 24 Jan 2014 12:14:13 -0500
12+
13+canonical-driver-test-suite (1.5) trusty; urgency=low
14+
15+ * Skipped release
16+
17+ -- Daniel Manrique <roadmr@ubuntu.com> Fri, 24 Jan 2014 12:13:11 -0500
18+
19+canonical-driver-test-suite (1.4) trusty; urgency=low
20
21 * Touch and Firmware test suites
22
23
24=== modified file 'debian/plainbox-provider-canonical-driver-test-suite.install'
25--- debian/plainbox-provider-canonical-driver-test-suite.install 2013-11-01 17:55:25 +0000
26+++ debian/plainbox-provider-canonical-driver-test-suite.install 2014-01-24 17:34:47 +0000
27@@ -1,2 +1,4 @@
28-checkbox/plainbox-gui/data/ihv-*.whitelist /usr/lib/plainbox-providers-1/canonical-driver-test-suite/whitelists/
29+checkbox/plainbox-gui/whitelists/ihv-*.whitelist /usr/lib/plainbox-providers-1/canonical-driver-test-suite/whitelists/
30+checkbox/plainbox-gui/data/* /usr/lib/plainbox-providers-1/canonical-driver-test-suite/data/
31+checkbox/plainbox-gui/jobs/* /usr/lib/plainbox-providers-1/canonical-driver-test-suite/jobs/
32 checkbox/plainbox-gui/providers-1/canonical-driver-test-suite.provider /usr/share/plainbox-providers-1/

Subscribers

People subscribed via source and target branches