merge of '46bdfedbe1ecde1685daaddc2f0b8a46939f17c4'

     and 'fd22e92470cbc7bd32d4c2d747a6577afd80516e'

6 files changed, 15 insertions, 6 deletions

diff --git a/packages/efl1/imlib2_1.4.0.001.bb b/packages/efl1/imlib2_1.4.0.001.bb
index 8b056b1ed2..88b532c374 100644
--- a/packages/efl1/imlib2_1.4.0.001.bb
+++ b/packages/efl1/imlib2_1.4.0.001.bb
@@ -5,9 +5,11 @@ DEPENDS = "freetype libpng jpeg"
 
 inherit efl1
 
+PR = "r1"
+
 PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
 FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
-FILES_${PN}-dbg = "${libdir}/.debug/"
+FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/"
 FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
 FILES_${PN}-bin = "${bindir}"
 FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
diff --git a/packages/phalanx/phalanx_22.bb b/packages/phalanx/phalanx_22.bb
index fbc6568b91..a59a696809 100644
--- a/packages/phalanx/phalanx_22.bb
+++ b/packages/phalanx/phalanx_22.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Phalanx is a chess playing engine."
 SECTION = "opie/libs"
 PRIORITY = "optional"
-PR = "r3"
+PR = "r4"
 LICENSE = "GPL"
-SRC_URI = "ftp://ftp.math.muni.cz/pub/math/people/Dobes/phalanx-22.tar.gz \
+SRC_URI = "http://ftp.debian.org/debian/pool/main/p/phalanx/phalanx_22.orig.tar.gz \
            file://gcc3.patch;patch=1 \
            file://capabilities \
            file://description"
-S = "${WORKDIR}/Phalanx-XXII"
+S = "${WORKDIR}/phalanx-22.orig"
 
 do_compile() {
 	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" STRIP=echo LD="${CC}"
@@ -24,3 +24,4 @@ do_install() {
 }
 
 FILES_${PN} = "${palmtopdir}/chess"
+FILES_${PN}-dbg += "${palmtopdir}/chess/engines/Phalanx/.debug"
diff --git a/packages/usb-gadget-mode/files/spitz/.mtn2git_empty b/packages/usb-gadget-mode/files/spitz/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/usb-gadget-mode/files/spitz/.mtn2git_empty
diff --git a/packages/usb-gadget-mode/files/spitz/usb-gadget.conf b/packages/usb-gadget-mode/files/spitz/usb-gadget.conf
new file mode 100644
index 0000000000..717687d4c3
--- /dev/null
+++ b/packages/usb-gadget-mode/files/spitz/usb-gadget.conf
@@ -0,0 +1,3 @@
+USB_MODE="networking"
+MODULE_OPTIONS=""
+
diff --git a/packages/usb-gadget-mode/files/usb-gadget b/packages/usb-gadget-mode/files/usb-gadget
index 4fdc429f5b..6f957fd263 100755
--- a/packages/usb-gadget-mode/files/usb-gadget
+++ b/packages/usb-gadget-mode/files/usb-gadget
@@ -9,6 +9,7 @@
 #################################################################################
 #
 # 20070606 - v0.0.1	- Initial release
+# 20070630 - v0.0.2	- Add forgotten host mode
 
 CONF_FILE="/etc/default/usb-gadget"
 
@@ -23,6 +24,8 @@ go() {
 	case "$USB_MODE" in
 	networking)	setup_usb g_ether "$MODULE_OPTIONS" ;;
 	storage)	setup_usb g_file_storage "$MODULE_OPTIONS" ;;
+	hostmode)	unload_usb_gadgets
+			setup_usb ohci_hcd "$MODULE_OPTIONS" ;;
 	none)		unload_usb_gadgets ;;
 	esac		
 		
diff --git a/packages/usb-gadget-mode/usb-gadget-mode.bb b/packages/usb-gadget-mode/usb-gadget-mode.bb
index ae1f08b5ea..d1fab638f2 100644
--- a/packages/usb-gadget-mode/usb-gadget-mode.bb
+++ b/packages/usb-gadget-mode/usb-gadget-mode.bb
@@ -13,8 +13,8 @@ LICENSE = "GPL"
 
 ######################################################################################
 
-PV = "0.0.1"
-PR = "r3"
+PV = "0.0.2"
+PR = "r0"
 
 ######################################################################################