[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/1.0.1-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit dccead7b6628ebcf84a43a70872e2ef435c9fb5d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Dec 23 12:27:02 2012 +0100

    Update patches

diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
index ca50173..923477a 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -10,10 +10,10 @@ Closes: #663931
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/util/util.c b/src/util/util.c
-index 3f244f5..d5894e9 100644
+index 05e7ca7..21b9333 100644
 --- a/src/util/util.c
 +++ b/src/util/util.c
-@@ -3045,7 +3045,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
+@@ -3031,7 +3031,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
  void virFileWaitForDevices(void)
  {
  # ifdef UDEVADM
diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index f281a3c..57fc370 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -10,10 +10,10 @@ to not interfere with existing network configurations
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 6d2816d..6453370 100644
+index 53ec9da..20050fa 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1789,9 +1789,6 @@ if WITH_NETWORK
+@@ -2005,9 +2005,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
@@ -22,12 +22,12 @@ index 6d2816d..6453370 100644
 -	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
  endif
  
- uninstall-local::
+ uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 7c1f97e..7e07b03 100644
+index 66857da..ec76a1b 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -6994,9 +6994,6 @@ install-data-local:
+@@ -7343,9 +7343,6 @@ install-data-local: install-init install-systemd
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
@@ -35,5 +35,5 @@ index 7c1f97e..7e07b03 100644
 - at WITH_NETWORK_TRUE@	   ln -s ../default.xml \
 - at WITH_NETWORK_TRUE@	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
  
- uninstall-local::
- 	rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||:
+ uninstall-local:: uninstall-init uninstall-systemd
+ @WITH_LIBVIRTD_TRUE@	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||:

-- 
Libvirt Debian packaging