28 files changed, 87 insertions, 159 deletions
diff --git a/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch b/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch
deleted file mode 100644
index 7e763bd587..0000000000
--- a/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Index: configuration/com/sun/midp/configuration/system_properties
-===================================================================
---- configuration/com/sun/midp/configuration/system_properties	(Revision 290)
-+++ configuration/com/sun/midp/configuration/system_properties	(Revision 291)
-@@ -1,47 +1,47 @@
- javax.microedition.io.Connector.protocolpath=com.sun.midp.io
--microedition.profiles=MIDP-2.0 
--microedition.configuration=CLDC-1.1 
--microedition.locale=en-US 
-+microedition.profiles=MIDP-2.0
-+microedition.configuration=CLDC-1.1
-+microedition.locale=en-US
- microedition.platform=j2me
--microedition.encoding=ISO8859_1 
--microedition.hostname=localhost 
-+microedition.encoding=ISO8859_1
-+microedition.hostname=localhost
- microedition.commports= 
--microedition.jtwi.version=1.0 
--microedition.media.version=1.1 
--supports.mixing=true 
--supports.audio.capture=false 
--supports.video.capture=false 
--supports.recording=false 
-+microedition.jtwi.version=1.0
-+microedition.media.version=1.1
-+supports.mixing=true
-+supports.audio.capture=false
-+supports.video.capture=false
-+supports.recording=false
- audio.encodings=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg
- video.snapshot.encodings=encoding=png encoding=image/png
- video.encodings= 
--streamable.contents=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg 
--microedition.io.file.FileConnection.version=1.0 
--Bluetooth.api.version=1.1 
--obex.api.version=1.1 
--bluetooth.l2cap.receiveMTU.max=1024 
--bluetooth.master.switch=true 
--bluetooth.connected.devices.max=6 
--bluetooth.sd.trans.max=8 
--bluetooth.sd.attr.retrievable.max=16 
--bluetooth.connected.inquiry=true 
--bluetooth.connected.inquiry.scan=true 
--bluetooth.connected.page=true 
--bluetooth.connected.page.scan=true 
--microedition.m3g.version=1.1 
--microedition.location.version=1.1 
--microedition.m2g.version=1.1 
--microedition.m2g.svg.version=1.1 
--microedition.m2g.svg.baseProfile=tiny 
--xml.jaxp.subset.version=1.0 
--xml.rpc.subset.version=1.0 
--wireless.messaging.version=2.0 
--wireless.messaging.sms.smsc=+17815511212 
--wireless.messaging.mms.mmsc=+17815511212 
-+streamable.contents=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg
-+microedition.io.file.FileConnection.version=1.0
-+Bluetooth.api.version=1.1
-+obex.api.version=1.1
-+bluetooth.l2cap.receiveMTU.max=1024
-+bluetooth.master.switch=true
-+bluetooth.connected.devices.max=6
-+bluetooth.sd.trans.max=8
-+bluetooth.sd.attr.retrievable.max=16
-+bluetooth.connected.inquiry=true
-+bluetooth.connected.inquiry.scan=true
-+bluetooth.connected.page=true
-+bluetooth.connected.page.scan=true
-+microedition.m3g.version=1.1
-+microedition.location.version=1.1
-+microedition.m2g.version=1.1
-+microedition.m2g.svg.version=1.1
-+microedition.m2g.svg.baseProfile=tiny
-+xml.jaxp.subset.version=1.0
-+xml.rpc.subset.version=1.0
-+wireless.messaging.version=2.0
-+wireless.messaging.sms.smsc=+17815511212
-+wireless.messaging.mms.mmsc=+17815511212
- 
- # microedition.pim.version=
- # microedition.global.version=
--# microedition.sip.version=1.0.1 
-+# microedition.sip.version=1.0.1
- # 
- # com.sun.midp.io.http.proxy=
- # com.sun.midp.io.http.force_non_persistent=
diff --git a/packages/midpath/files/configuration_openmoko.cfg b/packages/midpath/files/configuration_openmoko.cfg
index 0691dca561..bb413e4548 100644
--- a/packages/midpath/files/configuration_openmoko.cfg
+++ b/packages/midpath/files/configuration_openmoko.cfg
@@ -40,7 +40,7 @@ org.thenesis.midpath.font.bdf.filename:VeraMono-12-8.bdf
 # The virtual engine requires this hardware configuration: 16 bits, stereo, little endian
 org.thenesis.midpath.sound.engine:virtual
 # Possible sound backend values: NULL, ALSA, ESD, PulseAudio
-org.thenesis.midpath.sound.backend:PulseAudio
+org.thenesis.midpath.sound.backend:ALSA
 org.thenesis.midpath.sound.device:default
 org.thenesis.midpath.sound.sampleRate:44100
 # Buffer size MUST be a power of two
diff --git a/packages/midpath/files/midpath-launcher-j2se b/packages/midpath/files/midpath-launcher-j2se
index 22928a0e1e..49f074f7ab 100644
--- a/packages/midpath/files/midpath-launcher-j2se
+++ b/packages/midpath/files/midpath-launcher-j2se
@@ -1,7 +1,25 @@
 #!/bin/sh
 
 if [ ! $LAUNCHER_CLASS ]; then
-  LAUNCHER_CLASS=org.thenesis.midpath.main.MIDletLauncher
+  if [ $# -lt 2 ]; then
+    echo "Usage :"
+    echo "  $(basename $0) <classpath> <midlet-class> [midlet-name]"
+    echo "  $(basename $0) -jar <jar-file>"
+    exit 1
+  fi
+
+  LAUNCHER_CLASS=org.thenesis.midpath.main.MIDletLauncherSE
+
+  # Add the MIDlet jar to the classpath  (must be loaded by the main classloader)
+  if [ $1 = "-jar" ]; then
+    CP=$2
+    ARGS="$1 $2"
+  else
+    CP=$1
+    ARGS="$2 $3"
+  fi
+else
+  ARGS="$@"
 fi
 
 if [ ! $JAVA ]; then
@@ -15,7 +33,7 @@ MIDPATH_HOME=/usr/share/midpath
 JLP=/usr/lib/jni
 
 # Set the classpath
-CP=\
+CP=$CP:\
 $MIDPATH_HOME/configuration:\
 $MIDPATH_HOME/midpath.jar:\
 $MIDPATH_HOME/microbackend.jar:\
@@ -25,6 +43,8 @@ $MIDPATH_HOME/jlayerme-cldc.jar:\
 $MIDPATH_HOME/jorbis-cldc.jar:\
 $MIDPATH_HOME/avetanabt-cldc.jar:\
 $MIDPATH_HOME/jgl-cldc.jar:\
+$MIDPATH_HOME/jsr172-jaxp.jar:\
+$MIDPATH_HOME/jsr172-jaxrpc.jar:\
 $MIDPATH_HOME/jsr239-opengles-jgl.jar:\
 $MIDPATH_HOME/jsr239-opengles-core.jar:\
 $MIDPATH_HOME/jsr239-opengles-nio.jar:\
@@ -43,8 +63,5 @@ then
   CP=$CP:$CLASSPATH
 fi
 
-# Add the MIDlet jar to the classpath  (must be loaded by the main classloader)
-CP=$CP:$MIDPATH_HOME/repository/midpath-demos.jar
-
-$JAVA -cp $CP -Djava.library.path=$JLP $LAUNCHER_CLASS "$@"
+$JAVA -cp $CP -Djava.library.path=$JLP $LAUNCHER_CLASS $ARGS
 
diff --git a/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-alsa_0.2+0.3rc2.bb
index 664fb242e1..32b012b0c6 100644
--- a/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-alsa_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS = "classpath linux-libc-headers"
 
diff --git a/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-escher_0.2+0.3rc2.bb
index 18f448c1ec..05ca8a078a 100644
--- a/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-escher_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS += "midpath-cldc"
 
diff --git a/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-esd_0.2+0.3rc2.bb
index 79994d1395..4e8a5a55a3 100644
--- a/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-esd_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS = "classpath esound"
 
diff --git a/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-fb_0.2+0.3rc2.bb
index c2fd6376a3..d7b35f9867 100644
--- a/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-fb_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS = "classpath linux-libc-headers"
 
diff --git a/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc2.bb
index 2e7c8bb53b..4da2822a8e 100644
--- a/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-backend-gtk_${PV}.bb
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 PROVIDES = "midpath-backend-gtk"
 
diff --git a/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk_0.2+0.3rc2.bb
index 619f56ffa7..fa09f77d15 100644
--- a/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-gtk_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS = "classpath gtk+"
 
diff --git a/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc2.bb
index 9f169c652e..890bcd9152 100644
--- a/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS = "classpath pulseaudio"
 
diff --git a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc2.bb
index 1d79379863..88f046708b 100644
--- a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS = "classpath qte-mt"
 RCONFLICTS = "midpath-backend-qte"
diff --git a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc2.bb
index f26ea4eac5..f900c0ed75 100644
--- a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS = "classpath qte-mt"
 
diff --git a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qte_0.2+0.3rc2.bb
index 6d7cb9dba7..e8e5ab29b6 100644
--- a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qte_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS = "classpath qte-mt"
 RCONFLICTS = "midpath-backend-qt3"
diff --git a/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-sdl_0.2+0.3rc2.bb
index 723fd41e43..220f9d50d9 100644
--- a/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-sdl_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS += "midpath-cldc virtual/libsdl libsdl-mixer libsdl-ttf libsdl-image libsdl-gfx"
 
diff --git a/packages/midpath/midpath-cldc_0.2+0.3rc1.bb b/packages/midpath/midpath-cldc_0.2+0.3rc2.bb
index f8dd8e6e22..e93bcbb3e0 100644
--- a/packages/midpath/midpath-cldc_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-cldc_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DESCRIPTION = "Implementation of the CLDC profile for use in the MIDPath library"
 RPROVIDES  = "midpath-cldc java-cldc1.1"
diff --git a/packages/midpath/midpath-core_0.2+0.3rc1.bb b/packages/midpath/midpath-core_0.2+0.3rc2.bb
index d0ba53bfbd..1a6fee82cd 100644
--- a/packages/midpath/midpath-core_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-core_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation"
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 require midpath-common.inc
 
diff --git a/packages/midpath/midpath-demos_0.2+0.3rc1.bb b/packages/midpath/midpath-demos_0.2+0.3rc2.bb
index 1a2f690bf1..ebf260d7fe 100644
--- a/packages/midpath/midpath-demos_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-demos_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS = "midpath-core midpath-location midpath-messaging midpath-svg midpath-opengles midpath-m3g"
 RDEPENDS = "midpath midpath-location midpath-messaging midpath-svg-midp midpath-opengles midpath-m3g"
diff --git a/packages/midpath/midpath-jgl_0.2+0.3rc1.bb b/packages/midpath/midpath-jgl_0.2+0.3rc2.bb
index e003fe9bdb..c969452c5c 100644
--- a/packages/midpath/midpath-jgl_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-jgl_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS += "midpath-core"
 
diff --git a/packages/midpath/midpath-location_0.2+0.3rc1.bb b/packages/midpath/midpath-location_0.2+0.3rc2.bb
index 349356fa65..54d1ea7907 100644
--- a/packages/midpath/midpath-location_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-location_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DESCRIPTION = "Implementation of the JSR179 Location API for use in the MIDPath library"
 
diff --git a/packages/midpath/midpath-m3g_0.2+0.3rc1.bb b/packages/midpath/midpath-m3g_0.2+0.3rc2.bb
index a0a1c42dd4..0d618021e1 100644
--- a/packages/midpath/midpath-m3g_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-m3g_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS += "midpath-core midpath-opengles"
 
diff --git a/packages/midpath/midpath-maemo_0.2+0.3rc1.bb b/packages/midpath/midpath-maemo_0.2+0.3rc2.bb
index 10fcf6681d..35a97c7e6d 100644
--- a/packages/midpath/midpath-maemo_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-maemo_0.2+0.3rc2.bb
@@ -4,11 +4,10 @@ PR = "r0"
 
 # The patch fixes the system_properties file only deployed in this recipe.
 SRC_URI = "\
-  ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz \
-  file://0.2+0.3rc1-fix-crlf.patch;patch=1;pnum=0 \
+  ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz \
   "
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 PR = "r0"
 
diff --git a/packages/midpath/midpath-messaging_0.2+0.3rc1.bb b/packages/midpath/midpath-messaging_0.2+0.3rc2.bb
index 554f864491..880b948b24 100644
--- a/packages/midpath/midpath-messaging_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-messaging_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS += "midpath-core"
 
diff --git a/packages/midpath/midpath-opengles_0.2+0.3rc1.bb b/packages/midpath/midpath-opengles_0.2+0.3rc2.bb
index b5b7d67954..fbfe719b57 100644
--- a/packages/midpath/midpath-opengles_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-opengles_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS += "midpath-core midpath-jgl"
 RDEPENDS_${PN} = "midpath-core midpath-jgl ${PN}-core ${PN}-nio"
diff --git a/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb b/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
deleted file mode 100644
index edb20af441..0000000000
--- a/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require midpath.inc
-
-PR = "r0"
-
-# The patch fixes the system_properties file only deployed in this recipe.
-SRC_URI = "\
-  ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz \
-  file://0.2+0.3rc1-fix-crlf.patch;patch=1;pnum=0 \
-  "
-
-S = "${WORKDIR}/midpath-0.3rc1"
-
-PR = "r0"
-
-SRC_URI += "file://configuration_openmoko.cfg"
-
-RDEPENDS += "java2-runtime midpath-backend-pulseaudio libswt3.4-gtk-java midpath-core-bluetooth"
-
-CONFIGURATION = "configuration_openmoko.cfg"
diff --git a/packages/midpath/midpath-openmoko_0.2+0.3rc2.bb b/packages/midpath/midpath-openmoko_0.2+0.3rc2.bb
new file mode 100644
index 0000000000..b64cb455dd
--- /dev/null
+++ b/packages/midpath/midpath-openmoko_0.2+0.3rc2.bb
@@ -0,0 +1,18 @@
+require midpath.inc
+
+PR = "r0"
+
+# The patch fixes the system_properties file only deployed in this recipe.
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz \
+  "
+
+S = "${WORKDIR}/midpath-0.3rc2"
+
+PR = "r0"
+
+SRC_URI += "file://configuration_openmoko.cfg"
+
+RDEPENDS += "java2-runtime midpath-backend-alsa libswt3.4-gtk-java midpath-core-bluetooth"
+
+CONFIGURATION = "configuration_openmoko.cfg"
diff --git a/packages/midpath/midpath-svg_0.2+0.3rc1.bb b/packages/midpath/midpath-svg_0.2+0.3rc2.bb
index d63caa5363..7f332ff30f 100644
--- a/packages/midpath/midpath-svg_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-svg_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS += "midpath-core midpath-webservices"
 RDEPENDS_${PN}-midp = "${PN}"
diff --git a/packages/midpath/midpath-webservices_0.2+0.3rc1.bb b/packages/midpath/midpath-webservices_0.2+0.3rc2.bb
index 7f2f197cc1..bc221286f0 100644
--- a/packages/midpath/midpath-webservices_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-webservices_0.2+0.3rc2.bb
@@ -2,9 +2,9 @@ require midpath-common.inc
 
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc2.tar.gz"
 
-S = "${WORKDIR}/midpath-0.3rc1"
+S = "${WORKDIR}/midpath-0.3rc2"
 
 DEPENDS += "midpath-core"
 RSUGGESTS_${PN} = "${PN}-jaxp"
diff --git a/packages/midpath/midpath.inc b/packages/midpath/midpath.inc
index 703d9bdd3c..19b4179536 100644
--- a/packages/midpath/midpath.inc
+++ b/packages/midpath/midpath.inc
@@ -5,7 +5,7 @@
 # RDEPENDS.
 require midpath-common.inc
 
-RDEPENDS = "midpath-core midpath-core-bluetooth midpath-core-ogg midpath-core-mp3"
+RDEPENDS = "midpath-core midpath-core-bluetooth midpath-core-ogg ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'midpath-core-mp3', d)}"
 
 PROVIDES = "midpath"
 RPROVIDES = "midpath"