From 2ead2bba52cd67b8173f8cd68b52afa90c22a219 Mon Sep 17 00:00:00 2001
From: Gui Chen <gui.chen@intel.com>
Date: Fri, 13 Dec 2013 03:30:40 -0500
Subject: fix qemu depends for ubuntu

Change-Id: I92657bc67e7aa393bacf712b84962b9becf2223d
Signed-off-by: Gui Chen <gui.chen@intel.com>
---
 debian/control | 3 ++-
 debian/rules   | 9 +--------
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'debian')

diff --git a/debian/control b/debian/control
index 5a8e00a..fd2bd2c 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Description: image creator for Linux distributions
 
 Package: mic-native
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ${dist:Depends},
+Depends: ${misc:Depends}, ${python:Depends},
  util-linux,
  coreutils,
  psmisc,
@@ -45,6 +45,7 @@ Depends: ${misc:Depends}, ${python:Depends}, ${dist:Depends},
  python-m2crypto,
  mic,
 Recommends:
+ qemu-arm-static | qemu-user-static,
  binfmt-support,
  btrfs-tools,
  udisks | hal
diff --git a/debian/rules b/debian/rules
index d3d030a..c9f50ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ifeq ($(shell cat /etc/issue | cut -d' ' -f2), 11.10)
-	SUBSTVARS = -Vdist:Depends="qemu-arm-static"
-else
-	SUBSTVARS = -Vdist:Depends="qemu-user-static"
-endif
-
-
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -56,7 +49,7 @@ binary-indep: build install
 	dh_pysupport
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- $(SUBSTVARS)
+	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-- 
cgit v1.2.3