From abdab35a6b809d92197c8d603c9acbdaac7850d7 Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@linaro.org>
Date: Fri, 12 Apr 2013 08:24:32 +0300
Subject: avoid conflict with qemu-keymaps

---
 debian/control                     | 4 ++--
 debian/qemu-keymaps.install        | 1 -
 debian/qemu-linaro-keymaps.install | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 debian/qemu-keymaps.install
 create mode 100644 debian/qemu-linaro-keymaps.install

(limited to 'debian')

diff --git a/debian/control b/debian/control
index 700f90d..f462ea7 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Standards-Version: 3.9.1
 Homepage: https://launchpad.net/qemu-linaro/
 Vcs-Bzr: lp:ubuntu/qemu-linaro
 
-Package: qemu-keymaps
+Package: qemu-linaro-keymaps
 Architecture: all
 Depends: ${misc:Depends}
 Breaks: qemu (<< 0.11.0-2), qemu-system (<< 0.12.4+dfsg-4)
@@ -43,7 +43,7 @@ Description: QEMU keyboard maps
 
 Package: qemu-system
 Architecture: amd64 arm armel armhf hppa i386 ia64 mips mipsel powerpc sparc sparc64 kfreebsd-i386 kfreebsd-amd64 ppc64
-Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-keymaps (>= ${source:Version}), qemu-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-linaro-keymaps (>= ${source:Version}), qemu-common
 Recommends: vde2, qemu-kvm
 Breaks: qemu (<< 0.11.0-2), qemu-kvm-extras (<< 0.13.50-2011.02-0~rc1-0ubuntu1)
 Replaces: qemu (<< 0.11.0-2), qemu-kvm-extras (<< 0.13.50-2011.02-0~rc1-0ubuntu1)
diff --git a/debian/qemu-keymaps.install b/debian/qemu-keymaps.install
deleted file mode 100644
index 81d0030..0000000
--- a/debian/qemu-keymaps.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/qemu-linaro/qemu/keymaps
diff --git a/debian/qemu-linaro-keymaps.install b/debian/qemu-linaro-keymaps.install
new file mode 100644
index 0000000..81d0030
--- /dev/null
+++ b/debian/qemu-linaro-keymaps.install
@@ -0,0 +1 @@
+usr/share/qemu-linaro/qemu/keymaps
-- 
cgit v1.2.3