Add conflicts on klogd

diff --git a/debian/changelog b/debian/changelog
index 8ef0bf9c41963d0b6f620ed1e9782165c6aad861..c765163e7160d6af96f3e4558f48d5d49b2c86f4 100644 (file)
--- 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 256c2317521774ac7ea903cd7f574a47797365ef..af3689d3bdbbc773ed7cebcd8d81697a1e0f6be5 100644 (file)
--- 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