Merge lp:~bluetooth/bluez/bluez-fix-tests into lp:~bluetooth/bluez/ubuntu

Proposed by Tony Espy
Status: Merged
Approved by: Simon Fels
Approved revision: 16
Merged at revision: 18
Proposed branch: lp:~bluetooth/bluez/bluez-fix-tests
Merge into: lp:~bluetooth/bluez/ubuntu
Diff against target: 31 lines (+11/-2)
2 files modified
debian/changelog (+9/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~bluetooth/bluez/bluez-fix-tests
Reviewer Review Type Date Requested Status
Simon Fels Approve
Review via email: mp+287551@code.launchpad.net

Commit message

  [ Tony Espy ]
  * debian/control: fixup 'Architecture:' and 'Depends:' for bluez-
    tests, as it now includes binary commands and thus can no
    longer be 'Architecture: all'.

Description of the change

This change fixes the bluez-tests binary package which was broken in the last merge, which added binary commands to the package in addition to the test scripts which were all Python-based, meaning the 'Architecture' of the binary package was 'all'.

When I added the additional binary test programs, I failed to update 'Architecture:' and 'Depends:' for the package.

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

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 2016-02-04 12:00:12 +0000
3+++ debian/changelog 2016-02-29 23:28:31 +0000
4@@ -1,3 +1,12 @@
5+bluez (5.37-0ubuntu4) UNRELEASED; urgency=medium
6+
7+ [ Tony Espy ]
8+ * debian/control: fixup 'Architecture:' and 'Depends:' for bluez-
9+ tests, as it now includes binary commands and thus can no
10+ longer be 'Architecture: all'.
11+
12+ -- Simon Fels <simon.fels@canonical.com> Mon, 29 Feb 2016 18:19:42 -0500
13+
14 bluez (5.37-0ubuntu3) xenial; urgency=medium
15
16 * debian/patches/0004-obexd-enable-ebook-backend-conditionally.patch:
17
18=== modified file 'debian/control'
19--- debian/control 2016-02-03 09:33:10 +0000
20+++ debian/control 2016-02-29 23:28:31 +0000
21@@ -142,8 +142,8 @@
22 project distributed under GNU General Public License (GPL).
23
24 Package: bluez-tests
25-Architecture: all
26-Depends: ${misc:Depends}
27+Architecture: linux-any
28+Depends: ${shlibs:Depends}, ${misc:Depends}
29 Replaces: bluez-test-scripts
30 Conflicts: bluez-test-scripts
31 Provides: bluez-test-scripts

Subscribers

People subscribed via source and target branches

to all changes: