12 files changed, 12 insertions, 28 deletions
diff --git a/packages/midpath/midpath-alsa_0.1.bb b/packages/midpath/midpath-alsa_0.1.bb
index 6d580405b6..1ccace8500 100644
--- a/packages/midpath/midpath-alsa_0.1.bb
+++ b/packages/midpath/midpath-alsa_0.1.bb
@@ -30,7 +30,6 @@ do_stage() {
 	:
 }
 	
-PACKAGES = "${PN}"
 
 FILES_${PN}  = "${libdir}/libmidpathalsa.so \
                 ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
diff --git a/packages/midpath/midpath-cldc-native_0.1.bb b/packages/midpath/midpath-cldc-native_0.1.bb
index 27700d2e61..4e54497bde 100644
--- a/packages/midpath/midpath-cldc-native_0.1.bb
+++ b/packages/midpath/midpath-cldc-native_0.1.bb
@@ -4,10 +4,7 @@ inherit native
 require midpath-cldc_${PV}.bb
 
 
-PROVIDES = "virtual/cldc-api-1.1-native"
-RPROVIDES = " "
-
-PACKAGES = " "
+PACKAGES = "${PN}-dbg  "
 
 do_install() {
 	:
diff --git a/packages/midpath/midpath-cldc-sdl_0.1.bb b/packages/midpath/midpath-cldc-sdl_0.1.bb
index 65850e2f4c..6d777f6e8c 100644
--- a/packages/midpath/midpath-cldc-sdl_0.1.bb
+++ b/packages/midpath/midpath-cldc-sdl_0.1.bb
@@ -32,7 +32,6 @@ do_stage() {
 	install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${STAGING_DATADIR}/java
 }
 	
-PACKAGES = "${PN}"
 
 FILES_${PN}  = "${datadir}/java/sdljava-cldc.jar \
 		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
diff --git a/packages/midpath/midpath-cldc-x11_0.1.bb b/packages/midpath/midpath-cldc-x11_0.1.bb
index 9db0c4a686..7aa8e9c6d9 100644
--- a/packages/midpath/midpath-cldc-x11_0.1.bb
+++ b/packages/midpath/midpath-cldc-x11_0.1.bb
@@ -1,7 +1,7 @@
 
 require midpath.inc
 
-DEPENDS += " virtual/libx11 virtual/cldc-api-1.1"
+DEPENDS += "virtual/libx11 midpath-cldc"
 
 do_configure() {
 	
@@ -31,7 +31,6 @@ do_stage() {
         install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${STAGING_DATADIR}/java
 }
 	
-PACKAGES = "${PN}"
 
 FILES_${PN}  = "${datadir}/java/escher-x11-cldc.jar \
 		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
diff --git a/packages/midpath/midpath-cldc_0.1.bb b/packages/midpath/midpath-cldc_0.1.bb
index 51a1314467..e18d42781d 100644
--- a/packages/midpath/midpath-cldc_0.1.bb
+++ b/packages/midpath/midpath-cldc_0.1.bb
@@ -1,9 +1,6 @@
 
 require midpath.inc
 
-PROVIDES  = "virtual/cldc-api-1.1"
-RPROVIDES = "virtual/cldc-api-1.1"
-
 do_compile() {
 
 mkdir -p ${S}/dist
@@ -18,21 +15,20 @@ cd ${S}/src/cldc-glue
 make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1"
 make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes
 # Make a jar
-${FASTJAR_CMD} cvf  ${S}/dist/cldc1.1.jar -C ${S}/external/cldc1.1/classes .
+${FASTJAR_CMD} cvf  ${S}/dist/midpath-cldc1.1.jar -C ${S}/external/cldc1.1/classes .
 
 
 }
 
 do_install() {
-	install -d ${D}${datadir}/java
-	install -m 0644 dist/cldc1.1.jar ${D}${datadir}/java
+	install -d ${D}${datadir}/midpath-cldc
+	install -m 0644 dist/midpath-cldc1.1.jar ${D}${datadir}/midpath-cldc
 }
 
 do_stage() {
-	install -d ${STAGING_DATADIR}/java
-	install -m 0644 dist/cldc1.1.jar ${STAGING_DATADIR}/java
+	install -d ${STAGING_DATADIR}/midpath-cldc
+	install -m 0644 dist/midpath-cldc1.1.jar ${STAGING_DATADIR}/midpath-cldc
 }
 	
-PACKAGES = "${PN}"
 
-FILES_${PN}  = "${datadir}/java/cldc1.1.jar"
+FILES_${PN}  = "${datadir}/midpath-cldc/midpath-cldc1.1.jar"
diff --git a/packages/midpath/midpath-gtk_0.1.bb b/packages/midpath/midpath-gtk_0.1.bb
index 7bf5570ef2..42f6325efa 100644
--- a/packages/midpath/midpath-gtk_0.1.bb
+++ b/packages/midpath/midpath-gtk_0.1.bb
@@ -32,7 +32,6 @@ do_stage() {
 	:
 }
 	
-PACKAGES = "${PN}"
 
 FILES_${PN}  = "${libdir}/libmidpathgtk.so \
 		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
diff --git a/packages/midpath/midpath-pulseaudio_0.1.bb b/packages/midpath/midpath-pulseaudio_0.1.bb
index 6344e018a0..1a8c44d38c 100644
--- a/packages/midpath/midpath-pulseaudio_0.1.bb
+++ b/packages/midpath/midpath-pulseaudio_0.1.bb
@@ -30,7 +30,6 @@ do_stage() {
 	:
 }
 	
-PACKAGES = "${PN}"
 
 FILES_${PN}  = "${libdir}/libmidpathpulse.so \
                 ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
diff --git a/packages/midpath/midpath-qt3x11_0.1.bb b/packages/midpath/midpath-qt3x11_0.1.bb
index 1d24012810..7ad9af9991 100644
--- a/packages/midpath/midpath-qt3x11_0.1.bb
+++ b/packages/midpath/midpath-qt3x11_0.1.bb
@@ -37,7 +37,6 @@ do_stage() {
 	:
 }
 	
-PACKAGES = "${PN}"
 
 FILES_${PN}  = "${libdir}/libmidpathqt.so \
 		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
diff --git a/packages/midpath/midpath-qte_0.1.bb b/packages/midpath/midpath-qte_0.1.bb
index 39b9264930..4b7144722f 100644
--- a/packages/midpath/midpath-qte_0.1.bb
+++ b/packages/midpath/midpath-qte_0.1.bb
@@ -35,7 +35,6 @@ do_stage() {
 	:
 }
 	
-PACKAGES = "${PN}"
 
 FILES_${PN}  = "${libdir}/libmidpathqt.so \
 		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
diff --git a/packages/midpath/midpath-test_0.1.bb b/packages/midpath/midpath-test_0.1.bb
index 14bfdc97f0..3d06e80797 100644
--- a/packages/midpath/midpath-test_0.1.bb
+++ b/packages/midpath/midpath-test_0.1.bb
@@ -37,7 +37,6 @@ do_stage() {
 	:
 }
 	
-PACKAGES = "${PN}"
 
 FILES_${PN}  = "${datadir}/java/midpath-tests.jar \
 #		${bindir}/graphical_launcher-j2se.sh \
diff --git a/packages/midpath/midpath.inc b/packages/midpath/midpath.inc
index 33793bffd0..4bc3b71598 100644
--- a/packages/midpath/midpath.inc
+++ b/packages/midpath/midpath.inc
@@ -9,14 +9,14 @@ SRC_URI = "http://downloads.sourceforge.net/midpath/midpath-${PV}.tar.gz"
 
 S = "${WORKDIR}/midpath-${PV}"
 
-DEPENDS = "ecj-native fastjar-native classpath-minimal"
+DEPENDS = "virtual/javac-native fastjar-native classpath"
 
-JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/ecj"
+JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/javac"
 
 FASTJAR_CMD = "${STAGING_BINDIR_NATIVE}/fastjar"
 
 JAVA_PATH = "${STAGING_DATADIR}/java"
 
-GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath-minimal/glibj.zip"
+GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath/glibj.zip"
 
-CLDC_PATH = ${JAVA_PATH}/cldc1.1.jar
+CLDC_PATH = ${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar
diff --git a/packages/midpath/midpath_0.1.bb b/packages/midpath/midpath_0.1.bb
index 3501144701..e787b053be 100644
--- a/packages/midpath/midpath_0.1.bb
+++ b/packages/midpath/midpath_0.1.bb
@@ -48,7 +48,6 @@ do_stage() {
 	install -m 0644 dist/midpath.jar ${STAGING_DATADIR}/java
 }
 
-PACKAGES = "${PN}"
 
 FILES_${PN} = "${datadir}/java/midpath.jar \
 	       ${datadir}/java/resources-embedded/com/sun/midp/configuration/ \