merge of 442f062be604dc778760de19d17e0429b815330f

     and aefd8b85d8866ff05ae03c31658567c0a0d18d11

4 files changed, 20 insertions, 11 deletions

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 60346f70d9..4c92d07130 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r56"
+PR = "r57"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -103,7 +103,7 @@ do_install () {
 	fi
 
     case ${MACHINE} in
-        c7x0 | tosa | spitz | akita )
+        c7x0 | tosa | spitz | akita | borzoi )
 			install -m 0755 ${WORKDIR}/keymap		${D}${sysconfdir}/init.d
 			ln -sf	../init.d/keymap	${D}${sysconfdir}/rcS.d/S00keymap
 			install -m 0644 ${WORKDIR}/keymap-*.map	${D}${sysconfdir}
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 052ddac474..f45f5916e4 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -33,17 +33,22 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
 OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \
                     opie-style-metal opie-style-web opie-style-phase"
 
-OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils \
-                     openobex-apps libopieobex0 wireless-tools usbutils"
-OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \
-                      bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools "
+OPIE_BLUETOOTH_DEPENDS = "bluez-utils-nodbus openobex obexftp openobex-apps obexpush \
+                          libopieobex0 libopietooth1 \
+                          opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
+OPIE_BLUETOOTH_RDEPENDS = "bluez-utils-nodbus obexftp openobex-apps obexpush \
+                           opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
+
+OPIE_BASE_DEPENDS = "ipkg timezones ntp irda-utils wireless-tools usbutils ${OPIE_BLUETOOTH_DEPENDS}"
+OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset wireless-tools ${OPIE_BLUETOOTH_RDEPENDS}"
 
 #
 # Clamshell models can benefit from the autorotate applet
 #
-OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_c7x0   = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_spitz  = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_akita  = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_borzoi = " opie-autorotateapplet"
 
 # Keyboard models can benefit from the VT and logout applets
 OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet"
diff --git a/packages/obexpush/obexpush-native_1.0.0.bb b/packages/obexpush/obexpush-native_1.0.0.bb
index 6e63de5c98..64840797cd 100644
--- a/packages/obexpush/obexpush-native_1.0.0.bb
+++ b/packages/obexpush/obexpush-native_1.0.0.bb
@@ -3,6 +3,10 @@ inherit native
 
 FILESPATH = "${FILE_DIRNAME}/obexpush-${PV}:${FILE_DIRNAME}/obexpush:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
+do_stage() {
+	:
+}
+
 do_install() {
 	:
 }
diff --git a/packages/obexpush/obexpush_1.0.0.bb b/packages/obexpush/obexpush_1.0.0.bb
index b441e7c3a6..a01b6ddee6 100644
--- a/packages/obexpush/obexpush_1.0.0.bb
+++ b/packages/obexpush/obexpush_1.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.caside.lancs.ac.uk/java_bt.php"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 openobex bluez-libs"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \
            file://add-obextool.patch;patch=1 \
@@ -41,6 +41,6 @@ do_install() {
 	install -m 0755 opd/opd ${D}${sbindir}
 
 	install -d ${D}${sysconfdir}/init.d
-	install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/opd
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/opd
 }