Ubuntu Pastebin

Paste from cjwatson at Tue, 1 Dec 2015 09:54:00 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
diff -Nru qemu-2.3+dfsg/debian/changelog qemu-2.3+dfsg/debian/changelog
--- qemu-2.3+dfsg/debian/changelog	2015-10-09 14:40:52.000000000 +0100
+++ qemu-2.3+dfsg/debian/changelog	2015-11-27 14:08:45.000000000 +0000
@@ -1,3 +1,11 @@
+qemu (1:2.3+dfsg-5ubuntu9~ubuntu14.04.1) trusty; urgency=medium
+
+  * Backport to trusty.
+  * Build-depend on libtool rather than libtool-bin.
+  * Actually enable libseccomp, but only on amd64/i386.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 27 Nov 2015 14:08:44 +0000
+
 qemu (1:2.3+dfsg-5ubuntu9) wily; urgency=low
 
   * debian/patches/upstream-fix-irq-route-entries.patch
diff -Nru qemu-2.3+dfsg/debian/control qemu-2.3+dfsg/debian/control
--- qemu-2.3+dfsg/debian/control	2015-10-03 20:11:26.000000000 +0100
+++ qemu-2.3+dfsg/debian/control	2015-11-27 14:08:37.000000000 +0000
@@ -54,7 +54,7 @@
 ## --enable-numa	i386|amd64|ia64|mips*|powerpc*|ppc64|x32
 # libnuma-dev,
 # --enable-smartcard-nss
- libnss3-dev (>> 3.13.3), libtool-bin,
+ libnss3-dev (>> 3.13.3), libtool,
 # --with-system-pixman
  libpixman-1-dev,
 # audio-drv-list += pa
@@ -66,8 +66,8 @@
 # note: libsdl2-dev is in universe on ubuntu
 # --enable-sdl --with-sdlabi=1.2
  libsdl1.2-dev (>> 1.2.1),
-# --enable-seccomp	linux-any
- libseccomp-dev (>> 2.1.0) [linux-any],
+# --enable-seccomp	linux-amd64|linux-i386
+ libseccomp-dev (>> 2.1.0) [linux-amd64 linux-i386],
 # --enable-spice	linux-amd64|linux-i386
  libspice-server-dev (>= 0.12.2~) [linux-amd64 linux-i386],
  libspice-protocol-dev (>= 0.12.3~) [linux-amd64 linux-i386],
diff -Nru qemu-2.3+dfsg/debian/control-in qemu-2.3+dfsg/debian/control-in
--- qemu-2.3+dfsg/debian/control-in	2015-10-03 20:11:08.000000000 +0100
+++ qemu-2.3+dfsg/debian/control-in	2015-11-27 14:08:28.000000000 +0000
@@ -57,7 +57,7 @@
 ## --enable-numa	i386|amd64|ia64|mips*|powerpc*|ppc64|x32
 # libnuma-dev,
 # --enable-smartcard-nss
- libnss3-dev (>> 3.13.3), libtool-bin,
+ libnss3-dev (>> 3.13.3), libtool,
 # --with-system-pixman
  libpixman-1-dev,
 # audio-drv-list += pa
@@ -69,8 +69,8 @@
 # note: libsdl2-dev is in universe on ubuntu
 # --enable-sdl --with-sdlabi=1.2
  libsdl1.2-dev (>> 1.2.1),
-# --enable-seccomp	linux-any
- libseccomp-dev (>> 2.1.0) [linux-any],
+# --enable-seccomp	linux-amd64|linux-i386
+ libseccomp-dev (>> 2.1.0) [linux-amd64 linux-i386],
 # --enable-spice	linux-amd64|linux-i386
  libspice-server-dev (>= 0.12.2~) [linux-amd64 linux-i386],
  libspice-protocol-dev (>= 0.12.3~) [linux-amd64 linux-i386],
Download as text