cacao-cldc: fix path to cldc1.1.jar

* path is now /usr/share/java for cldc1.1.jar
* cosmetic change for cacao-cldc in package area
* bump PR to 1

diff --git a/packages/cacao/cacao-cldc_0.98.bb b/packages/cacao/cacao-cldc_0.98.bb
index f7797206de61da94e618e8de364780cb2b7918fc..7076dd45d1df56c216f33545c6881d82b956d3c0 100644 (file)
--- a/packages/cacao/cacao-cldc_0.98.bb
+++ b/packages/cacao/cacao-cldc_0.98.bb
@@ -13,13 +13,13 @@ DEPENDS = "cacaoh-cldc-native ecj-native classpath-minimal-native virtual/cldc-a
 RDEPENDS = "virtual/cldc-api-1.1"
 RPROVIDES = "virtual/java"
 
-EXTRA_OECONF += "--with-classpath-libdir=${STAGING_LIBDIR}/classpath-minimal \
+EXTRA_OECONF += "--with-classpath-libdir=${STAGING_DATADIR}/classpath-minimal \
                  --with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal \
                 --enable-jni \
                  --enable-java=cldc1.1 \
                  --with-classpath=cldc1.1 \
-                 --with-classpath-classes=${STAGING_LIBDIR}/java/cldc1.1.jar \
-                --with-target-classpath-classes=${libdir}/java/cldc1.1.jar \
+                 --with-classpath-classes=${STAGING_DATADIR}/java/cldc1.1.jar \
+                --with-target-classpath-classes=${datadir}/java/cldc1.1.jar \
                 --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh \
                 --disable-libjvm \
                 "
@@ -28,7 +28,7 @@ PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
 
 FILES_${PN} = "${bindir}/cacao"
 FILES_${PN}-doc = "${datadir}/man"
-FILES_${PN}-dbg = "${bindir}/.debug ${libdir}/.debug/lib*.so*"
+FILES_${PN}-dbg = "${bindir}/.debug"
 
 ALTERNATIVE_NAME = "java"
 ALTERNATIVE_PATH = "${bindir}/cacao"

diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc
index 1f783b8238b7553cee0cabb4b8b174e35ed46ae1..9315babfb93fc9a848a42d038082f23e5dcd1c91 100644 (file)
--- a/packages/cacao/cacao.inc
+++ b/packages/cacao/cacao.inc
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.cacaojvm.org/"
 LICENSE  = "GPL"
 PRIORITY = "optional"
 SECTION  = "interpreters"
+PR = "r1"
 
 inherit autotools
 

diff --git a/packages/cacao/cacaoh-cldc-native_0.98.bb b/packages/cacao/cacaoh-cldc-native_0.98.bb
index ebadf3e0233f64de1065b880ea4d590a983a1f1d..7ea7cad5ddf46117d7dbc7f70595f46e7bb21285 100644 (file)
--- a/packages/cacao/cacaoh-cldc-native_0.98.bb
+++ b/packages/cacao/cacaoh-cldc-native_0.98.bb
@@ -9,7 +9,7 @@ EXTRA_OECONF += "--with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal
                 --enable-jni \
                  --enable-java=cldc1.1 \
                  --with-classpath=cldc1.1 \
-                --with-classpath-classes=${STAGING_LIBDIR}/java/cldc1.1.jar \
+                --with-classpath-classes=${STAGING_DATADIR}/java/cldc1.1.jar \
                 "
 do_stage() {
        install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/