Codebase list libvirt / e08112e
Merge branch 'nmu/sid' Guido Günther 10 years ago
5 changed file(s) with 120 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
0 libvirt (1.1.4-1.1) unstable; urgency=high
1
2 * Non-maintainer upload.
3 * Fix linking when using pthread atomic ops, such as on armel.
4 * Disable silent build rules.
5
6 -- Julien Cristau <jcristau@debian.org> Sun, 24 Nov 2013 12:27:18 +0100
7
08 libvirt (1.1.4-1) unstable; urgency=low
19
210 * Upload to unstable
0 Description: <short summary of the patch>
1 TODO: Put a short summary on the line above and replace this paragraph
2 with a longer explanation of this change. Complete the meta-information
3 with other relevant fields (see below for details). To make it easier, the
4 information below has been extracted from the changelog. Adjust it or drop
5 it.
6 .
7 libvirt (1.1.4-1) unstable; urgency=low
8 .
9 * Upload to unstable
10 * [54c6758] New upstream version 1.1.4
11 Author: Guido Günther <agx@sigxcpu.org>
12
13 ---
14 The information above should follow the Patch Tagging Guidelines, please
15 checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
16 are templates for supplementary fields that you might want to add:
17
18 Origin: <vendor|upstream|other>, <url of original patch>
19 Bug: <url in upstream bugtracker>
20 Bug-Debian: http://bugs.debian.org/<bugnumber>
21 Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
22 Forwarded: <no|not-needed|url proving that it has been forwarded>
23 Reviewed-By: <name and email of someone who approved the patch>
24 Last-Update: <YYYY-MM-DD>
25
26 Index: libvirt-1.1.4/src/Makefile.am
27 ===================================================================
28 --- libvirt-1.1.4.orig/src/Makefile.am
29 +++ libvirt-1.1.4/src/Makefile.am
30 @@ -1982,6 +1982,7 @@ noinst_LTLIBRARIES += libvirt-setuid-rpc
31
32 libvirt_setuid_rpc_client_la_SOURCES = \
33 util/viralloc.c \
34 + util/viratomic.c \
35 util/virbitmap.c \
36 util/virbuffer.c \
37 util/vircommand.c \
38 Index: libvirt-1.1.4/src/Makefile.in
39 ===================================================================
40 --- libvirt-1.1.4.orig/src/Makefile.in
41 +++ libvirt-1.1.4/src/Makefile.in
42 @@ -1,4 +1,4 @@
43 -# Makefile.in generated by automake 1.13.4 from Makefile.am.
44 +# Makefile.in generated by automake 1.14 from Makefile.am.
45 # @configure_input@
46
47 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
48 @@ -612,10 +612,10 @@ libvirt_qemu_la_LINK = $(LIBTOOL) $(AM_V
49 $(LDFLAGS) -o $@
50 libvirt_setuid_rpc_client_la_LIBADD =
51 am__libvirt_setuid_rpc_client_la_SOURCES_DIST = util/viralloc.c \
52 - util/virbitmap.c util/virbuffer.c util/vircommand.c \
53 - util/virconf.c util/virerror.c util/virevent.c \
54 - util/vireventpoll.c util/virfile.c util/virhash.c \
55 - util/virhashcode.c util/virjson.c util/virlog.c \
56 + util/viratomic.c util/virbitmap.c util/virbuffer.c \
57 + util/vircommand.c util/virconf.c util/virerror.c \
58 + util/virevent.c util/vireventpoll.c util/virfile.c \
59 + util/virhash.c util/virhashcode.c util/virjson.c util/virlog.c \
60 util/virobject.c util/virpidfile.c util/virprocess.c \
61 util/virrandom.c util/virsocketaddr.c util/virstoragefile.c \
62 util/virstring.c util/virtime.c util/virthread.c \
63 @@ -629,6 +629,7 @@ am__libvirt_setuid_rpc_client_la_SOURCES
64 remote/lxc_protocol.c datatypes.c libvirt.c libvirt-lxc.c
65 @WITH_LXC_TRUE@am_libvirt_setuid_rpc_client_la_OBJECTS = \
66 @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-viralloc.lo \
67 +@WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-viratomic.lo \
68 @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-virbitmap.lo \
69 @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-virbuffer.lo \
70 @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-vircommand.lo \
71 @@ -4456,6 +4457,7 @@ libvirt_lxc_la_CFLAGS = $(AM_CFLAGS)
72 libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
73 @WITH_LXC_TRUE@libvirt_setuid_rpc_client_la_SOURCES = \
74 @WITH_LXC_TRUE@ util/viralloc.c \
75 +@WITH_LXC_TRUE@ util/viratomic.c \
76 @WITH_LXC_TRUE@ util/virbitmap.c \
77 @WITH_LXC_TRUE@ util/virbuffer.c \
78 @WITH_LXC_TRUE@ util/vircommand.c \
79 @@ -4937,6 +4939,8 @@ util/$(DEPDIR)/$(am__dirstamp):
80 @: > util/$(DEPDIR)/$(am__dirstamp)
81 util/libvirt_setuid_rpc_client_la-viralloc.lo: util/$(am__dirstamp) \
82 util/$(DEPDIR)/$(am__dirstamp)
83 +util/libvirt_setuid_rpc_client_la-viratomic.lo: util/$(am__dirstamp) \
84 + util/$(DEPDIR)/$(am__dirstamp)
85 util/libvirt_setuid_rpc_client_la-virbitmap.lo: util/$(am__dirstamp) \
86 util/$(DEPDIR)/$(am__dirstamp)
87 util/libvirt_setuid_rpc_client_la-virbuffer.lo: util/$(am__dirstamp) \
88 @@ -6185,6 +6189,7 @@ distclean-compile:
89 @AMDEP_TRUE@@am__include@ @am__quote@uml/$(DEPDIR)/libvirt_driver_uml_impl_la-uml_driver.Plo@am__quote@
90 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_iohelper-iohelper.Po@am__quote@
91 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viralloc.Plo@am__quote@
92 +@AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viratomic.Plo@am__quote@
93 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbitmap.Plo@am__quote@
94 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbuffer.Plo@am__quote@
95 @AMDEP_TRUE@@am__include@ @am__quote@util/$(DEPDIR)/libvirt_setuid_rpc_client_la-vircommand.Plo@am__quote@
96 @@ -6458,6 +6463,13 @@ util/libvirt_setuid_rpc_client_la-virall
97 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
98 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_setuid_rpc_client_la_CFLAGS) $(CFLAGS) -c -o util/libvirt_setuid_rpc_client_la-viralloc.lo `test -f 'util/viralloc.c' || echo '$(srcdir)/'`util/viralloc.c
99
100 +util/libvirt_setuid_rpc_client_la-viratomic.lo: util/viratomic.c
101 +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_setuid_rpc_client_la_CFLAGS) $(CFLAGS) -MT util/libvirt_setuid_rpc_client_la-viratomic.lo -MD -MP -MF util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viratomic.Tpo -c -o util/libvirt_setuid_rpc_client_la-viratomic.lo `test -f 'util/viratomic.c' || echo '$(srcdir)/'`util/viratomic.c
102 +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viratomic.Tpo util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viratomic.Plo
103 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='util/viratomic.c' object='util/libvirt_setuid_rpc_client_la-viratomic.lo' libtool=yes @AMDEPBACKSLASH@
104 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
105 +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_setuid_rpc_client_la_CFLAGS) $(CFLAGS) -c -o util/libvirt_setuid_rpc_client_la-viratomic.lo `test -f 'util/viratomic.c' || echo '$(srcdir)/'`util/viratomic.c
106 +
107 util/libvirt_setuid_rpc_client_la-virbitmap.lo: util/virbitmap.c
108 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_setuid_rpc_client_la_CFLAGS) $(CFLAGS) -MT util/libvirt_setuid_rpc_client_la-virbitmap.lo -MD -MP -MF util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbitmap.Tpo -c -o util/libvirt_setuid_rpc_client_la-virbitmap.lo `test -f 'util/virbitmap.c' || echo '$(srcdir)/'`util/virbitmap.c
109 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbitmap.Tpo util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbitmap.Plo
99 Reduce-udevadm-settle-timeout-to-10-seconds.patch
1010 debian/Debianize-systemd-service-files.patch
1111 Allow-xen-toolstack-to-find-it-s-binaries.patch
12 atomic-pthread-link-fix
6767 endif
6868
6969 DEB_CONFIGURE_EXTRA_ARGS := \
70 --disable-silent-rules \
7071 --disable-rpath \
7172 $(WITH_QEMU) \
7273 --with-qemu-user=libvirt-qemu \
+0
-1
debian/source/local-options less more
0 unapply-patches