Merge commit 'dm/opendreambox-1.6' into test branch

Conflicts:
	recipes/avahi/avahi.inc
	recipes/dbus/dbus.inc

diff --cc recipes/avahi/avahi.inc
index 12c6485,55ae660..e45d7e4
mode 100755,100644..100755
--- 1/recipes/avahi/avahi.inc
--- 2/recipes/avahi/avahi.inc
+++ b/recipes/avahi/avahi.inc

diff --cc recipes/dbus/dbus.inc
index 05165b5,fb8656e..c19a190
--- 1/recipes/dbus/dbus.inc
--- 2/recipes/dbus/dbus.inc
+++ b/recipes/dbus/dbus.inc
@@@ -4,9 -4,8 +4,9 @@@ SECTION = "base
  LICENSE = "GPL"
  DEPENDS = "expat glib-2.0 virtual/libintl libsm libice virtual/libx11"
  DEPENDS_opendreambox = "expat glib-2.0 virtual/libintl"
 +DEPENDS_vuplus = "expat glib-2.0 virtual/libintl"
  
- INC_PR = "r18"
+ INC_PR = "r19"
  
  SRC_URI = "\
    http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
@@@ -110,5 -108,4 +110,5 @@@ CONFFILES_${PN} = "${sysconfdir}/dbus-1
  
  INITSCRIPT_NAME = "dbus-1"
  INITSCRIPT_PARAMS = "start 02 5 2 . stop 20 0 1 6 ."
- INITSCRIPT_PARAMS_opendreambox = "start 05 S 2 3 5 . stop 20 0 1 6 ."
- INITSCRIPT_PARAMS_vuplus = "start 05 S 2 3 5 . stop 20 0 1 6 ."
+ INITSCRIPT_PARAMS_opendreambox = "start 02 5 2 3 . stop 20 0 1 6 ."
++INITSCRIPT_PARAMS_vuplus = "start 02 5 2 3 . stop 20 0 1 6 ."

diff --cc recipes/gstreamer/gst-plugins-bad_0.10.21.bb
index 78e598b,e7972cc..2361c9c
--- 1/recipes/gstreamer/gst-plugins-bad_0.10.21.bb
--- 2/recipes/gstreamer/gst-plugins-bad_0.10.21.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.21.bb
@@@ -13,7 -12,5 +13,8 @@@ EXTRA_OECONF_vuplus += "--disable-apexs
  
  SRC_URI_append_opendreambox += " file://mpegpsdemux-speedup.diff;patch=1;pnum=0 \
                                 file://mpegtsdemux-fix-bd-streamtype-detection.diff;patch=1;pnum=1 \
+                                file://audioparsers-change-rank.diff;patch=1;pnum=1 \
  "
 +SRC_URI_append_vuplus += " file://mpegpsdemux-speedup.diff;patch=1;pnum=0 \
 +                               file://mpegtsdemux-fix-bd-streamtype-detection.diff;patch=1;pnum=1 \
 +"

diff --cc recipes/netbase/netbase_4.21.bb
index a4903df,04d9623..2ce13d6
mode 100755,100644..100755
--- 1/recipes/netbase/netbase_4.21.bb
--- 2/recipes/netbase/netbase_4.21.bb
+++ b/recipes/netbase/netbase_4.21.bb