merge of 1077a62e5a0cf3a585d0b28b763970cb1f9495ff

     and 84f39d6ce58c1d05af73e9efc4431efad132f997

6 files changed, 11 insertions, 76 deletions

diff --git a/packages/avahi/avahi_0.6.3.bb b/packages/avahi/avahi_0.6.3.bb
deleted file mode 100644
index fbd7208d1d..0000000000
--- a/packages/avahi/avahi_0.6.3.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-HOMEPAGE = "http://avahi.org"
-LICENSE= "GPL"
-DEPENDS = "expat libdaemon dbus-0.60"
-RRECOMMENDS = "libnss-mdns"
-SECTION = "net"
-PRIORITY = "optional"
-PR = "r0"
-
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
-
-PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-		      ${sysconfdir}/avahi/avahi-daemon.conf \
-		      ${sysconfdir}/avahi/services \
-		      ${sysconfdir}/dbus-1 \
-		      ${sysconfdir}/init.d/avahi-daemon \
-		      ${datadir}/avahi/introspection/*.introspect \
-		      ${datadir}/avahi/avahi-service.dtd \
-		      ${datadir}/avahi/service-types"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-			${sysconfdir}/avahi/avahi-dnsconfd.action \
-			${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
-FILES_avahi-utils = "${bindir}/avahi-*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
-inherit autotools
-inherit update-rc.d
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
-
-pkg_postinst_avahi-daemon () {
-	grep avahi /etc/group || addgroup avahi
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
-	/etc/init.d/dbus-1 force-reload
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
diff --git a/packages/avahi/avahi_0.6.5.bb b/packages/avahi/avahi_0.6.5.bb
index a49022ab18..f1a69a0451 100644
--- a/packages/avahi/avahi_0.6.5.bb
+++ b/packages/avahi/avahi_0.6.5.bb
@@ -1,11 +1,10 @@
 DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
+SECTION = "network"
+PRIORITY = "optional"
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://avahi.org"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE= "GPL"
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS = "libnss-mdns"
-SECTION = "net"
-PRIORITY = "optional"
-PR = "r0"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
 
diff --git a/packages/avahi/avahi_0.6.7.bb b/packages/avahi/avahi_0.6.7.bb
index e6505cb1e8..f41b22017a 100644
--- a/packages/avahi/avahi_0.6.7.bb
+++ b/packages/avahi/avahi_0.6.7.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-SECTION = "net"
+SECTION = "network"
 PRIORITY = "optional"
 AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://avahi.org"
diff --git a/packages/libdaemon/libdaemon_0.10.bb b/packages/libdaemon/libdaemon_0.10.bb
index 0c1908c3ac..6f4c5eac54 100644
--- a/packages/libdaemon/libdaemon_0.10.bb
+++ b/packages/libdaemon/libdaemon_0.10.bb
@@ -1,6 +1,8 @@
-SECTION = "libs"
 DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
+SECTION = "libs"
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE = "LGPL"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
diff --git a/packages/libdaemon/libdaemon_0.3.bb b/packages/libdaemon/libdaemon_0.3.bb
deleted file mode 100644
index 0d0b563de6..0000000000
--- a/packages/libdaemon/libdaemon_0.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "libs"
-DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
-LICENSE ="GPL"
-SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
-
-inherit autotools 
-
-EXTRA_OECONF = "--disable-lynx"
-
-do_stage () {
-	oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/libdaemon
-	for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do
-		install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/
-	done
-}
diff --git a/packages/libdaemon/libdaemon_0.6.bb b/packages/libdaemon/libdaemon_0.6.bb
index 578c9b7674..2bdf8cb5cc 100644
--- a/packages/libdaemon/libdaemon_0.6.bb
+++ b/packages/libdaemon/libdaemon_0.6.bb
@@ -1,6 +1,8 @@
-SECTION = "libs"
 DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
+SECTION = "libs"
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
+MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"