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

[Colin Watson]

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

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