[Pkg-libvirt-commits] [libvirt] 04/06: Drop atomic-pthread-link-fix
Guido Guenther
agx at moszumanska.debian.org
Sun Dec 1 21:32:11 UTC 2013
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to branch experimental
in repository libvirt.
commit 288778fe76853963a8e1bd87548aa8c87e4d051d
Author: Guido Günther <agx at sigxcpu.org>
Date: Sun Dec 1 22:01:36 2013 +0100
Drop atomic-pthread-link-fix
Fixed upstream.
---
debian/patches/atomic-pthread-link-fix | 110 ---------------------------------
debian/patches/series | 1 -
2 files changed, 111 deletions(-)
diff --git a/debian/patches/atomic-pthread-link-fix b/debian/patches/atomic-pthread-link-fix
deleted file mode 100644
index 3aa2b1d..0000000
--- a/debian/patches/atomic-pthread-link-fix
+++ /dev/null
@@ -1,110 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- libvirt (1.1.4-1) unstable; urgency=low
- .
- * Upload to unstable
- * [54c6758] New upstream version 1.1.4
-Author: Guido Günther <agx at sigxcpu.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: libvirt-1.1.4/src/Makefile.am
-===================================================================
---- libvirt-1.1.4.orig/src/Makefile.am
-+++ libvirt-1.1.4/src/Makefile.am
-@@ -1982,6 +1982,7 @@ noinst_LTLIBRARIES += libvirt-setuid-rpc
-
- libvirt_setuid_rpc_client_la_SOURCES = \
- util/viralloc.c \
-+ util/viratomic.c \
- util/virbitmap.c \
- util/virbuffer.c \
- util/vircommand.c \
-Index: libvirt-1.1.4/src/Makefile.in
-===================================================================
---- libvirt-1.1.4.orig/src/Makefile.in
-+++ libvirt-1.1.4/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -612,10 +612,10 @@ libvirt_qemu_la_LINK = $(LIBTOOL) $(AM_V
- $(LDFLAGS) -o $@
- libvirt_setuid_rpc_client_la_LIBADD =
- am__libvirt_setuid_rpc_client_la_SOURCES_DIST = util/viralloc.c \
-- util/virbitmap.c util/virbuffer.c util/vircommand.c \
-- util/virconf.c util/virerror.c util/virevent.c \
-- util/vireventpoll.c util/virfile.c util/virhash.c \
-- util/virhashcode.c util/virjson.c util/virlog.c \
-+ util/viratomic.c util/virbitmap.c util/virbuffer.c \
-+ util/vircommand.c util/virconf.c util/virerror.c \
-+ util/virevent.c util/vireventpoll.c util/virfile.c \
-+ util/virhash.c util/virhashcode.c util/virjson.c util/virlog.c \
- util/virobject.c util/virpidfile.c util/virprocess.c \
- util/virrandom.c util/virsocketaddr.c util/virstoragefile.c \
- util/virstring.c util/virtime.c util/virthread.c \
-@@ -629,6 +629,7 @@ am__libvirt_setuid_rpc_client_la_SOURCES
- remote/lxc_protocol.c datatypes.c libvirt.c libvirt-lxc.c
- @WITH_LXC_TRUE at am_libvirt_setuid_rpc_client_la_OBJECTS = \
- @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-viralloc.lo \
-+ at WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-viratomic.lo \
- @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-virbitmap.lo \
- @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-virbuffer.lo \
- @WITH_LXC_TRUE@ util/libvirt_setuid_rpc_client_la-vircommand.lo \
-@@ -4456,6 +4457,7 @@ libvirt_lxc_la_CFLAGS = $(AM_CFLAGS)
- libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
- @WITH_LXC_TRUE at libvirt_setuid_rpc_client_la_SOURCES = \
- @WITH_LXC_TRUE@ util/viralloc.c \
-+ at WITH_LXC_TRUE@ util/viratomic.c \
- @WITH_LXC_TRUE@ util/virbitmap.c \
- @WITH_LXC_TRUE@ util/virbuffer.c \
- @WITH_LXC_TRUE@ util/vircommand.c \
-@@ -4937,6 +4939,8 @@ util/$(DEPDIR)/$(am__dirstamp):
- @: > util/$(DEPDIR)/$(am__dirstamp)
- util/libvirt_setuid_rpc_client_la-viralloc.lo: util/$(am__dirstamp) \
- util/$(DEPDIR)/$(am__dirstamp)
-+util/libvirt_setuid_rpc_client_la-viratomic.lo: util/$(am__dirstamp) \
-+ util/$(DEPDIR)/$(am__dirstamp)
- util/libvirt_setuid_rpc_client_la-virbitmap.lo: util/$(am__dirstamp) \
- util/$(DEPDIR)/$(am__dirstamp)
- util/libvirt_setuid_rpc_client_la-virbuffer.lo: util/$(am__dirstamp) \
-@@ -6185,6 +6189,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at uml/$(DEPDIR)/libvirt_driver_uml_impl_la-uml_driver.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/libvirt_iohelper-iohelper.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viralloc.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/libvirt_setuid_rpc_client_la-viratomic.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbitmap.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/libvirt_setuid_rpc_client_la-virbuffer.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at util/$(DEPDIR)/libvirt_setuid_rpc_client_la-vircommand.Plo at am__quote@
-@@ -6458,6 +6463,13 @@ util/libvirt_setuid_rpc_client_la-virall
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at 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
-
-+util/libvirt_setuid_rpc_client_la-viratomic.lo: util/viratomic.c
-+ at 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
-+ at 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
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='util/viratomic.c' object='util/libvirt_setuid_rpc_client_la-viratomic.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(AM_V_CC at 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
-+
- util/libvirt_setuid_rpc_client_la-virbitmap.lo: util/virbitmap.c
- @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
- @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
diff --git a/debian/patches/series b/debian/patches/series
index 99993f1..6148614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
Reduce-udevadm-settle-timeout-to-10-seconds.patch
debian/Debianize-systemd-service-files.patch
Allow-xen-toolstack-to-find-it-s-binaries.patch
-atomic-pthread-link-fix
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git
More information about the Pkg-libvirt-commits
mailing list