[SM-Commit] GIT changes to master grimoire by Vasil Yonkov (7f7a86d1d13804cef529f408ebc8fd7ac585d5b0)

Vasil Yonkov scm at sourcemage.org
Tue Oct 5 10:49:38 EDT 2010


GIT changes to master grimoire by Vasil Yonkov <spirtbrat at sourcemage.org>:

 utils/avahi/DEPENDS |    3 ++-
 utils/avahi/HISTORY |    3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7f7a86d1d13804cef529f408ebc8fd7ac585d5b0
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    Revert "Revert "avahi: libdaemon is not optional""
    
    This reverts commit 2514fc8170ce04f6395c51b4ade203205dc68fde.

diff --git a/utils/avahi/DEPENDS b/utils/avahi/DEPENDS
index 666a751..9cae00f 100755
--- a/utils/avahi/DEPENDS
+++ b/utils/avahi/DEPENDS
@@ -31,6 +31,8 @@ if [[ "$AVAHI_DISCOVER" == 'y' ]]; then
    depends libglade2
 fi &&
 
+depends libdaemon --enable-libdaemon &&
+
 # for the daemon it's technically optional, but that would make the spell unreliable
 if [[ "$AVAHI_DISCOVER" == 'y' ]] || [[ "$AVAHI_DAEMON" == 'y' ]] || \
    [[ "$AVAHI_CLIENT" == 'y' ]] || [[ "$AVAHI_BOOKMARKS" == 'y' ]]; then
@@ -59,7 +61,6 @@ if [[ "$AVAHI_DISCOVER" == 'y' ]] && ( is_depends_enabled $SPELL gdbm ); then
 fi &&
 
 if [[ "$AVAHI_DAEMON" == 'y' ]]; then
-  depends libdaemon --enable-libdaemon &&
   depends expat  --with-xml=expat &&
   optional_depends libcap '' '' 'for chroot support'
 fi &&
diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY
index fcbb270..2475335 100644
--- a/utils/avahi/HISTORY
+++ b/utils/avahi/HISTORY
@@ -1,3 +1,6 @@
+2010-10-04 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: libdaemon is not optional
+
 2010-04-11 Ismael Luceno <ismael at sourcemage.org>
 	* PRE_SUB_DEPENDS,
           REPAIR^6dc6a5705994d7985da9e10dc00841d5^PRE_SUB_DEPENDS: Fixed



More information about the SM-Commit mailing list