From baf76ee31add102a80a604c2c2712b2037e2e8b9 Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Thu, 13 Jun 2013 17:24:51 +0300 Subject: Add python build-dependency and bump base version to 1.5.0-2013.06 Signed-off-by: Fathi Boudra --- debian/control | 48 ++++++++++++++++++++++++----------------- debian/qemu-kvm-spice.install | 4 ++-- debian/qemu-user-static.install | 14 ++++++------ debian/qemu-user.install | 12 +++++------ 4 files changed, 43 insertions(+), 35 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index f462ea7..fec4ce6 100644 --- a/debian/control +++ b/debian/control @@ -4,24 +4,27 @@ Priority: optional DM-Upload-Allowed: yes Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian QEMU Team -Uploaders: Aurelien Jarno , Riku Voipio , Vagrant Cascadian +Uploaders: Aurelien Jarno , + Riku Voipio , + Vagrant Cascadian Build-Depends: debhelper (>= 7.0.50~), - zlib1g-dev, libasound2-dev [!kfreebsd-any], - libsdl1.2-dev (>> 1.2.1), - libx11-dev, - libpulse-dev, - libncurses5-dev, + libbluetooth-dev [!kfreebsd-any], libbrlapi-dev, libcurl4-gnutls-dev, + libfdt-dev, libgnutls-dev, + libncurses5-dev, + libpixman-1-dev, + libpulse-dev, libsasl2-dev, - uuid-dev, + libsdl1.2-dev (>> 1.2.1), libvdeplug2-dev [!kfreebsd-any], - libbluetooth-dev [!kfreebsd-any], + libx11-dev, + python, texinfo, - libfdt-dev, - libpixman-1-dev + uuid-dev, + zlib1g-dev Build-Conflicts: oss4-dev Standards-Version: 3.9.1 Homepage: https://launchpad.net/qemu-linaro/ @@ -42,11 +45,15 @@ Description: QEMU keyboard maps package or QEMU derivatives. 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-linaro-keymaps (>= ${source:Version}), qemu-common -Recommends: vde2, qemu-kvm +Architecture: amd64 arm armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 sparc sparc64 +Depends: qemu-common, + qemu-linaro-keymaps (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Recommends: qemu-kvm, vde2 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) +Replaces: qemu (<< 0.11.0-2), + qemu-kvm-extras (<< 0.13.50-2011.02-0~rc1-0ubuntu1) Suggests: samba Description: QEMU full system emulation binaries QEMU is a fast processor emulator: currently the package supports @@ -61,10 +68,12 @@ Description: QEMU full system emulation binaries virtual machines on a single server. Package: qemu-user -Architecture: amd64 arm armel armhf hppa i386 ia64 mips mipsel powerpc sparc sparc64 ppc64 -Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: amd64 arm armel armhf hppa i386 ia64 mips mipsel powerpc ppc64 sparc sparc64 +Depends: ${misc:Depends}, ${shlibs:Depends} 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), qemu-kvm (<< 0.13.0+noroms-0ubuntu13) +Replaces: qemu (<< 0.11.0-2), + qemu-kvm (<< 0.13.0+noroms-0ubuntu13), + qemu-kvm-extras (<< 0.13.50-2011.02-0~rc1-0ubuntu1) Description: QEMU user mode emulation binaries QEMU is a fast processor emulator: currently the package supports ARM, CRIS, i386, M68k (ColdFire), MicroBlaze, MIPS, PowerPC, SH4, @@ -76,8 +85,8 @@ Description: QEMU user mode emulation binaries for one CPU on another CPU. Package: qemu-user-static -Architecture: amd64 arm armel armhf hppa i386 ia64 mips mipsel powerpc sparc sparc64 ppc64 -Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: amd64 arm armel armhf hppa i386 ia64 mips mipsel powerpc ppc64 sparc sparc64 +Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: binfmt-support, debootstrap Breaks: qemu-kvm-extras-static (<< 0.13.50-2011.02-0~rc1-0ubuntu1) Replaces: qemu-kvm-extras-static (<< 0.13.50-2011.02-0~rc1-0ubuntu1) @@ -117,4 +126,3 @@ Description: QEMU static user mode emulation binaries (transitional package) This is a transitional package depending on the static user mode emulation binaries. You can remove it once the upgrade is complete and nothing depends on it. - diff --git a/debian/qemu-kvm-spice.install b/debian/qemu-kvm-spice.install index 08439e7..af2ae48 100644 --- a/debian/qemu-kvm-spice.install +++ b/debian/qemu-kvm-spice.install @@ -1,4 +1,4 @@ -usr/bin/qemu-spice usr/bin/qemu-i386-spice -usr/bin/qemu-x86_64-spice +usr/bin/qemu-spice usr/bin/qemu-system-x86_64-spice +usr/bin/qemu-x86_64-spice diff --git a/debian/qemu-user-static.install b/debian/qemu-user-static.install index 7bc1961..9f3b53d 100644 --- a/debian/qemu-user-static.install +++ b/debian/qemu-user-static.install @@ -1,19 +1,19 @@ +debian/qemu-debootstrap usr/sbin usr/bin/qemu-alpha-static -usr/bin/qemu-armeb-static usr/bin/qemu-arm-static +usr/bin/qemu-armeb-static usr/bin/qemu-cris-static usr/bin/qemu-i386-static usr/bin/qemu-m68k-static usr/bin/qemu-microblaze-static -usr/bin/qemu-mipsel-static usr/bin/qemu-mips-static -usr/bin/qemu-ppc64abi32-static -usr/bin/qemu-ppc64-static +usr/bin/qemu-mipsel-static usr/bin/qemu-ppc-static -usr/bin/qemu-sh4eb-static +usr/bin/qemu-ppc64-static +usr/bin/qemu-ppc64abi32-static usr/bin/qemu-sh4-static +usr/bin/qemu-sh4eb-static +usr/bin/qemu-sparc-static usr/bin/qemu-sparc32plus-static usr/bin/qemu-sparc64-static -usr/bin/qemu-sparc-static usr/bin/qemu-x86_64-static -debian/qemu-debootstrap usr/sbin diff --git a/debian/qemu-user.install b/debian/qemu-user.install index 3fdc525..e475eb9 100644 --- a/debian/qemu-user.install +++ b/debian/qemu-user.install @@ -1,16 +1,16 @@ usr/bin/qemu-alpha -usr/bin/qemu-armeb usr/bin/qemu-arm +usr/bin/qemu-armeb usr/bin/qemu-cris usr/bin/qemu-m68k usr/bin/qemu-microblaze -usr/bin/qemu-mipsel usr/bin/qemu-mips -usr/bin/qemu-ppc64abi32 -usr/bin/qemu-ppc64 +usr/bin/qemu-mipsel usr/bin/qemu-ppc -usr/bin/qemu-sh4eb +usr/bin/qemu-ppc64 +usr/bin/qemu-ppc64abi32 usr/bin/qemu-sh4 +usr/bin/qemu-sh4eb +usr/bin/qemu-sparc usr/bin/qemu-sparc32plus usr/bin/qemu-sparc64 -usr/bin/qemu-sparc -- cgit v1.2.3