From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 21 Apr 2011 15:17:48 +0000 (+0200)
Subject: Add conflicts on klogd
X-Git-Tag: 25-1~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=168fe699a4a39c3b28fff6ca616b06a9d339a716;p=systemd

Add conflicts on klogd
---

diff --git a/debian/changelog b/debian/changelog
index 8ef0bf9c..c765163e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ systemd (25-1) experimental; urgency=low
     dependency.
     - Fixes where to look for locale config.  Closes: #619166
   * Depend on initscripts >= 2.88dsf-13.4 for /run transition.
+  * Add Conflicts on klogd, since it doesn't work correctly with the
+    kmg→/dev/log bridge.  Closes: #622555
 
  -- Tollef Fog Heen <tfheen@debian.org>  Thu, 21 Apr 2011 13:50:13 +0200
 
diff --git a/debian/control b/debian/control
index 256c2317..af3689d3 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Recommends: libpam-systemd
 Suggests: systemd-gui
 Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.17.2-5), initscripts (>= 2.88dsf-13.3)
 Breaks: lvm2 (<< 2.02.84-1)
+Conflicts: klogd
 Description: system and service manager
  systemd is a replacement for sysvinit.  It is dependency-based and
  able to read the LSB init script headers in addition to parsing rcN.d