[oe-commits] org.oe.dev cacao-cldc: fix path to cldc1.1.jar

[woglinde2 commit]

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

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 0d345a7f225137d90a13f8e4ef34622625dc63d0
ViewMTN: http://monotone.openembedded.org/revision/info/0d345a7f225137d90a13f8e4ef34622625dc63d0
Files:
1
packages/cacao/cacao-cldc_0.98.bb
packages/cacao/cacao.inc
packages/cacao/cacaoh-cldc-native_0.98.bb
Diffs:

#
# mt diff -r43b9a8037df652f9b2b16d07faa68cf5c54dd2cf -r0d345a7f225137d90a13f8e4ef34622625dc63d0
#
# 
# 
# patch "packages/cacao/cacao-cldc_0.98.bb"
#  from [638b504328b4b00e7847c72728b8fd48190cd126]
#    to [562c862bb3b4be18ee26d9febf5fac0569a91504]
# 
# patch "packages/cacao/cacao.inc"
#  from [850a3631e55de6c25da31b955be07c7b8c2a42e3]
#    to [d8bc9087bb9ca79854ffb1d26ff94e4bafea0159]
# 
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
#  from [5aa5f424cbcebd9908f562377e94c17a036798e8]
#    to [70727331bb54728e45f64ce0f2d252d870e2bf51]
# 
============================================================
--- packages/cacao/cacao-cldc_0.98.bb	638b504328b4b00e7847c72728b8fd48190cd126
+++ packages/cacao/cacao-cldc_0.98.bb	562c862bb3b4be18ee26d9febf5fac0569a91504
@@ -13,13 +13,13 @@ RPROVIDES = "virtual/java"
 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 @@ FILES_${PN}-doc = "${datadir}/man"
 
 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"
============================================================
--- packages/cacao/cacao.inc	850a3631e55de6c25da31b955be07c7b8c2a42e3
+++ packages/cacao/cacao.inc	d8bc9087bb9ca79854ffb1d26ff94e4bafea0159
@@ -1,8 +1,9 @@ SECTION  = "interpreters"
 DESCRIPTION = "cacao is a Java Virtual Machine, which uses GNU Classpath as default Java core library"
 HOMEPAGE = "http://www.cacaojvm.org/"
 LICENSE  = "GPL"
 PRIORITY = "optional"
 SECTION  = "interpreters"
+PR = "r1"
 
 inherit autotools
 
============================================================
--- packages/cacao/cacaoh-cldc-native_0.98.bb	5aa5f424cbcebd9908f562377e94c17a036798e8
+++ packages/cacao/cacaoh-cldc-native_0.98.bb	70727331bb54728e45f64ce0f2d252d870e2bf51
@@ -9,7 +9,7 @@ EXTRA_OECONF += "--with-classpath-includ
 		 --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}/