Move avahi UI tools to a separate binary package.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4790 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 5 insertions, 2 deletions

diff --git a/meta/packages/avahi/avahi.inc b/meta/packages/avahi/avahi.inc
index a0acc09374..4300bcc3f3 100644
--- a/meta/packages/avahi/avahi.inc
+++ b/meta/packages/avahi/avahi.inc
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--with-distro=debian \
              --disable-python \
              --disable-doxygen-doc"
 
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils libavahi-ui"
+PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils libavahi-ui avahi-ui-utils"
 
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
 FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
@@ -43,6 +43,9 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
                         ${sysconfdir}/init.d/avahi-dnsconfd"
 FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
 FILES_avahi-utils = "${bindir}/avahi-*"
+FILES_avahi-ui-utils = "${bindir}/bssh ${bindir}/bvnc \
+                        ${datadir}/applications \
+                        ${datadir}/avahi/interfaces"
 
 CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
 
diff --git a/meta/packages/avahi/avahi_0.6.20.bb b/meta/packages/avahi/avahi_0.6.20.bb
index 34bc54834a..be22c985b0 100644
--- a/meta/packages/avahi/avahi_0.6.20.bb
+++ b/meta/packages/avahi/avahi_0.6.20.bb
@@ -1,7 +1,7 @@
 require avahi.inc
 
 RDEPENDS_avahi-daemon = "sysvinit-pidof"
-PR = "r3"
+PR = "r4"
 
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \