From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 19 Sep 2005 23:27:39 +0000 (+0000)
Subject: updated to new upstream release (v0.5), enabled when DEVELOPER=1, fix ipkg/conffiles
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7ae9033db19478d4d1a58f35cd9b062535268446;p=openwrt%2Fstaging%2Fadrian.git

updated to new upstream release (v0.5), enabled when DEVELOPER=1, fix ipkg/conffiles

SVN-Revision: 1951
---

diff --git a/openwrt/package/avahi/Config.in b/openwrt/package/avahi/Config.in
index 69b677507f..cba5b5de8a 100644
--- a/openwrt/package/avahi/Config.in
+++ b/openwrt/package/avahi/Config.in
@@ -7,8 +7,7 @@ config BR2_COMPILE_AVAHI
 
 config BR2_PACKAGE_AVAHI_DAEMON
 	tristate "avahi-daemon - an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon)"
-#	default m if CONFIG_DEVEL
-	default n
+	default m if CONFIG_DEVEL
 	select BR2_COMPILE_AVAHI
 	select BR2_PACKAGE_LIBAVAHI
 	select BR2_PACKAGE_LIBDAEMON
@@ -27,8 +26,7 @@ config BR2_PACKAGE_AVAHI_DAEMON
 
 config BR2_PACKAGE_AVAHI_DNSCONFD
 	tristate "avahi-dnsconfd - an Unicast DNS server from mDNS/DNS-SD configuration daemon"
-#	default m if CONFIG_DEVEL
-	default n
+	default m if CONFIG_DEVEL
 	select BR2_COMPILE_AVAHI
 	depends BR2_PACKAGE_AVAHI_DAEMON
 	help
@@ -48,8 +46,7 @@ config BR2_PACKAGE_AVAHI_DNSCONFD
 
 config BR2_PACKAGE_LIBAVAHI
 	tristate "libavahi - an DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) implementation (library)"
-#	default m if CONFIG_DEVEL
-	default n
+	default m if CONFIG_DEVEL
 	select BR2_COMPILE_AVAHI
 	help
 	  Avahi is a system which facilitates service discovery on a local network -- 
diff --git a/openwrt/package/avahi/Makefile b/openwrt/package/avahi/Makefile
index b5f5b943cd..7831475373 100644
--- a/openwrt/package/avahi/Makefile
+++ b/openwrt/package/avahi/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi
-PKG_VERSION:=0.1
+PKG_VERSION:=0.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=1ccbbc46d2aedf0c864b94c58ea220e6
+PKG_MD5SUM:=8a1fcd3131364f8dce569282aab0d137
 
 PKG_SOURCE_URL:=http://www.freedesktop.org/~lennart/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -54,18 +54,29 @@ $(PKG_BUILD_DIR)/.configured:
 			--disable-rpath \
 			--with-gnu-ld \
 			--disable-glib \
+			--disable-qt3 \
+			--disable-qt4 \
 			--disable-gtk \
 			--disable-dbus \
 			--enable-expat \
 			--enable-libdaemon \
 			--disable-python \
+			--disable-pygtk \
+			--disable-python-dbus \
+			--disable-mono \
+			--disable-mono-docs \
 			--disable-doxygen-doc \
 			--disable-doxygen-dot \
+			--disable-doxygen-man \
+			--disable-doxygen-rtf \
+			--disable-doxygen-xml \
+			--disable-doxygen-chm \
+			--disable-doxygen-chi \
 			--disable-doxygen-html \
 			--disable-doxygen-ps \
 			--disable-doxygen-pdf \
 			--disable-xmltoman \
-			--with-distro=openwrt \
+			--with-distro=none \
 			--with-avahi-user=nobody \
 			--with-avahi-group=nogroup \
 	);
diff --git a/openwrt/package/avahi/ipkg/avahi-daemon.conffiles b/openwrt/package/avahi/ipkg/avahi-daemon.conffiles
index 7f32af64d6..46379ed96f 100644
--- a/openwrt/package/avahi/ipkg/avahi-daemon.conffiles
+++ b/openwrt/package/avahi/ipkg/avahi-daemon.conffiles
@@ -1 +1,3 @@
 /etc/avahi/avahi-daemon.conf
+/etc/avahi/services/http.service
+/etc/avahi/services/ssh.service