From 6f6db9552bd6b06e0bc5d5efe555d1bc55f9a9bd Mon Sep 17 00:00:00 2001
From: taca <taca@kadisius.eu>
Date: Thu, 20 Apr 2017 21:26:38 +0200
Subject: [PATCH] Dependency information updated

---
 .SRCINFO | 2 +-
 PKGBUILD | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index f2d42da..9a49be4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nosh
 	pkgdesc = A suite of system-level utilities for initializing and running a BSD or Linux system, for managing daemons, for managing terminals, and for managing logging.
 	pkgver = 1.33
-	pkgrel = 2
+	pkgrel = 3
 	url = https://jdebp.eu/Softwares/nosh/index.html
 	arch = x86_64
 	license = custom:MIT Expat
diff --git a/PKGBUILD b/PKGBUILD
index c96838d..c648799 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,7 +38,7 @@ pkgname=(
     'nosh-run-openssh-server'
     )               
 pkgver=1.33
-pkgrel=2
+pkgrel=3
 pkgdesc="A suite of system-level utilities for initializing and running a BSD or Linux system, for managing daemons, for managing terminals, and for managing logging."
 arch=('x86_64')
 url="https://jdebp.eu/Softwares/nosh/index.html"
@@ -230,6 +230,7 @@ _package() {
         nosh-exec)
             pkgdesc="Minimal non-shell script processor and various chain-load utilities useful for services"
             depends+=( 'nosh-common')
+            conflicts+=( 'daemontools' 'daemontools-encore' )
             ;;
         nosh-execline-shims)
             pkgdesc="Execline utility shims"
@@ -244,7 +245,7 @@ _package() {
         nosh-service-management)
             pkgdesc="Service and system management utilities"
             depends+=( 'nosh-common')
-            conflicts+=( 'nosh-bundles<=1.30')
+            conflicts+=( 'nosh-bundles<=1.30' 'daemontools' 'daemontools-encore' )
             ;;
         nosh-terminal-management)
             pkgdesc="Virtual terminal, pseudo-terminal, and TUI login tools"
@@ -318,7 +319,7 @@ _package() {
         nosh-run-udev)
             pkgdesc="Run udev as the device manager"
             depends+=( 'nosh-common' 'nosh-exec' 'nosh-service-management>=1.16' 'nosh-bundles' )
-            optdepends+=( 'systemd: the systemd implementation currently does not work with nosh' 'eudev: for an alternative udev implementation' )
+            optdepends+=( 'systemd: use systemd-udevd directly' 'eudev: alternative udev implementation' )
             conflicts+=('nosh-run-busybox-mdev' 'nosh-run-suckless-mdev' 'nosh-run-vdev')
             install="nosh-run-udev.install"
             ;;
-- 
2.11.4.GIT