← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to debian/patches/07_i386_exec_name.patch

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Aurelien Jarno
  • Date: 2009-03-22 10:13:17 UTC
  • mfrom: (1.2.1 upstream) (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090322101317-iigjtnu5qil35dtb
Tags: 0.10.1-1
http://bugs.debian.org/501400
[ Aurelien Jarno ]
* New upstream stable release:
  - patches/80_stable-branch.patch: remove.
* debian/control: 
  - Remove depends on proll.
  - Move depends on device-tree-compiler to build-depends.
  - Bump Standards-Version to 3.8.1 (no changes).
* patches/82_qemu-img_decimal.patch: new patch from upstream to make
  qemu-img accept sizes with decimal values (closes: bug#501400).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_i386_exec_name.patch
1
 
Index: qemu-0.9.1/Makefile.target
 
1
Index: qemu-0.10.0/Makefile.target
2
2
===================================================================
3
 
--- qemu-0.9.1.orig/Makefile.target     2008-04-14 11:26:13.000000000 +0200
4
 
+++ qemu-0.9.1/Makefile.target  2008-04-14 11:27:37.000000000 +0200
5
 
@@ -74,11 +74,7 @@
6
 
 QEMU_USER=qemu-$(TARGET_ARCH2)
 
3
--- qemu-0.10.0.orig/Makefile.target    2009-03-07 13:47:24.000000000 +0100
 
4
+++ qemu-0.10.0/Makefile.target 2009-03-07 13:47:25.000000000 +0100
 
5
@@ -63,12 +63,8 @@
 
6
 QEMU_PROG=qemu-$(TARGET_ARCH2)
 
7
 else
7
8
 # system emulator name
8
 
 ifdef CONFIG_SOFTMMU
9
9
-ifeq ($(TARGET_ARCH), i386)
10
 
-QEMU_SYSTEM=qemu$(EXESUF)
 
10
-QEMU_PROG=qemu$(EXESUF)
11
11
-else
12
 
 QEMU_SYSTEM=qemu-system-$(TARGET_ARCH2)$(EXESUF)
 
12
 QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
 
13
 endif
13
14
-endif
14
 
 else
15
 
 QEMU_SYSTEM=qemu-fast
16
 
 endif
17
 
@@ -634,6 +630,9 @@
 
15
 
 
16
 PROGS=$(QEMU_PROG)
 
17
 
 
18
@@ -747,6 +743,9 @@
18
19
 ifneq ($(PROGS),)
19
20
        $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
20
21
 endif
22
23
+       ln -sf qemu-system-i386$(EXESUF) "$(DESTDIR)$(bindir)/qemu$(EXESUF)"
23
24
+endif
24
25
 
25
 
 ifneq ($(wildcard .depend),)
26
 
 include .depend
 
26
 # Include automatically generated dependency files
 
27
 -include $(wildcard *.d */*.d)