Merge lp:~cjwatson/cpu-checker/arch-x86 into lp:cpu-checker

Proposed by Colin Watson on 2011-11-18
Status: Merged
Merged at revision: 40
Proposed branch: lp:~cjwatson/cpu-checker/arch-x86
Merge into: lp:cpu-checker
Diff against target: 28 lines (+4/-3)
2 files modified
debian/changelog (+3/-2)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/cpu-checker/arch-x86
Reviewer Review Type Date Requested Status
Kees Cook 2011-11-18 Pending
Review via email: mp+82661@code.launchpad.net

Description of the change

Mark as "Architecture: amd64 i386", since this package is uninstallable on all other architectures.

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 2011-09-08 21:31:22 +0000
3+++ debian/changelog 2011-11-18 10:30:32 +0000
4@@ -1,8 +1,9 @@
5 cpu-checker (0.7) unreleased; urgency=low
6
7- * UNRELEASED
8+ * debian/control: mark as "Architecture: amd64 i386", since this package
9+ is uninstallable on all other architectures (LP: #888087).
10
11- -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 08 Sep 2011 14:31:22 -0700
12+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 18 Nov 2011 10:27:21 +0000
13
14 cpu-checker (0.6-0ubuntu1) oneiric; urgency=low
15
16
17=== modified file 'debian/control'
18--- debian/control 2010-11-17 19:27:09 +0000
19+++ debian/control 2011-11-18 10:30:32 +0000
20@@ -9,7 +9,7 @@
21 Vcs-Bzr: lp:~ubuntu-core-dev/cpu-checker/trunk
22
23 Package: cpu-checker
24-Architecture: all
25+Architecture: amd64 i386
26 Depends: msr-tools, ${shlibs:Depends}, ${misc:Depends}
27 Conflicts: qemu-kvm (<< 0.12.3-0ubuntu13)
28 Replaces: qemu-kvm (<< 0.12.3-0ubuntu13)

Subscribers

People subscribed via source and target branches

to all changes: