diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2013-04-12 08:24:32 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2013-04-12 08:25:02 +0300 |
| commit | abdab35a6b809d92197c8d603c9acbdaac7850d7 (patch) | |
| tree | 419957bfac77c6ee9de1e33f279ce63d2fde5dca /debian | |
| parent | 1c8e78ee0f7f6d12eaf74142a72ab4c73dd25169 (diff) | |
avoid conflict with qemu-keymaps
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/qemu-linaro-keymaps.install (renamed from debian/qemu-keymaps.install) | 0 |
2 files changed, 2 insertions, 2 deletions
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-linaro-keymaps.install index 81d0030..81d0030 100644 --- a/debian/qemu-keymaps.install +++ b/debian/qemu-linaro-keymaps.install |