From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 27 Mar 2011 18:26:26 +0000 (+0200)
Subject: systemd: Conflicts upstart.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=880f138f1a60145e29bd065a1351393770f39711;p=ipfire-3.x.git

systemd: Conflicts upstart.

References #149.
---

diff --git a/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm
index 737ef3243..ba0786665 100644
--- a/pkgs/systemd/systemd.nm
+++ b/pkgs/systemd/systemd.nm
@@ -26,7 +26,8 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = systemd
 PKG_VER        = 20
-PKG_REL        = 7
+PKG_REL        = 8
+PKG_CONFLICTS += upstart
 
 PKG_MAINTAINER = Stefan Schantl <stefan.schantl@ipfire.org>
 PKG_GROUP      = System/Base