[Pkg-libvirt-commits] [libvirt] 01/06: Imported Debian patch 1.2.4-1~bpo70+1.1

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.9-3_bpo70+1
in repository libvirt.

commit b290c24a03619a6bf7c53ccd88d33f5aa092827c
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Aug 24 15:02:36 2014 -0700

    Imported Debian patch 1.2.4-1~bpo70+1.1
---
 debian/changelog        | 8 ++++++++
 debian/control          | 1 -
 debian/libvirt-bin.init | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67cfe39..dd9cb3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libvirt (1.2.4-1~bpo70+1.1) wheezy-backports; urgency=medium
+
+  * Non-maintainer upload.
+  * Revert switch from avahi to avahi-daemon in init script; fixes
+    co-installability with avahi in wheezy.
+
+ -- Julien Cristau <jcristau at debian.org>  Sun, 24 Aug 2014 15:02:36 -0700
+
 libvirt (1.2.4-1~bpo70+1) wheezy-backports; urgency=medium
 
   * Rebuild for wheezy-backports.
diff --git a/debian/control b/debian/control
index 57a0a7b..72f98ad 100644
--- a/debian/control
+++ b/debian/control
@@ -77,7 +77,6 @@ Recommends: netcat-openbsd,
  parted,
  pm-utils
 Suggests: policykit-1, radvd, auditd, systemtap, systemd, apparmor
-Breaks: avahi-daemon (<< 0.6.31-3~)
 Description: programs for the libvirt library
  Libvirt is a C toolkit to interact with the virtualization capabilities
  of recent versions of Linux (and other OSes). The library aims at providing
diff --git a/debian/libvirt-bin.init b/debian/libvirt-bin.init
index 6552000..3cdeaf2 100755
--- a/debian/libvirt-bin.init
+++ b/debian/libvirt-bin.init
@@ -9,8 +9,8 @@
 # Provides:          libvirt-bin libvirtd
 # Required-Start:    $network $local_fs $remote_fs $syslog
 # Required-Stop:     $local_fs $remote_fs $syslog
-# Should-Start:      avahi-daemon cgconfig
-# Should-Stop:       avahi-daemon cgconfig
+# Should-Start:      avahi cgconfig
+# Should-Stop:       avahi cgconfig
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: libvirt management daemon

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git