merge of '8c0681c145743970130cbe62da92b45f76b3c4b5'

     and 'b459044149ae9e0fc21221903548ff66c0427cef'

2 files changed, 20 insertions, 18 deletions

diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb
index 1c30fc7fe4..71181d961d 100644
--- a/packages/dbus-java/dbus-java_2.3.bb
+++ b/packages/dbus-java/dbus-java_2.3.bb
@@ -4,10 +4,10 @@ DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
 
 LICENSE = "GPLv2 AFL"
 SECTION = "libs"
-HOMEPAGE = "http://jalimo.org"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
 AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>"
 
-PR = "r2"
+PR = "r3"
 
 inherit java-library
 
@@ -15,7 +15,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz
 
 S = "${WORKDIR}/dbus-java-${PV}"
 
-DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
 RSUGGESTS_libdbus-java = "libmatthew-java dbus"
 RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
 RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
@@ -25,8 +25,8 @@ do_compile () {
 	oe_runmake \
     JCFLAGS="-source 1.5" \
     JAVAC="javac" \
-    JARPREFIX="${STAGING_DATADIR}/java" \
-    JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \
+    JARPREFIX="${STAGING_DATADIR_JAVA}" \
+    JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
     CLASSPATH="${S}/classes" \
     JAR="fastjar" \
     .binclasses
@@ -34,8 +34,8 @@ do_compile () {
 	oe_runmake \
     JCFLAGS="-source 1.5" \
     JAVAC="javac" \
-    JARPREFIX="${STAGING_DATADIR}/java" \
-    JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \
+    JARPREFIX="${STAGING_DATADIR_JAVA}" \
+    JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
     CLASSPATH="${S}/classes" \
     JAR="fastjar" \
     all
@@ -47,8 +47,8 @@ do_compile () {
   oe_runmake \
     JAVAC="oefatal \"No Java compilation expected here.\"" \
     JAR="oefatal \"No jar invocation expected here.\"" \
-    JARPREFIX=${datadir}/java \
-    JAVAUNIXPATH=${datadir}/java \
+    JARPREFIX=${datadir_java} \
+    JAVAUNIXPATH=${datadir_java} \
     all
 
   # Trigger generation of all documentation files to prevent this
@@ -56,12 +56,12 @@ do_compile () {
   oe_runmake \
     JAVAC="oefatal \"No Java compilation expected here.\"" \
     JAR="oefatal \"No jar invocation expected here.\"" \
-    JARPREFIX=${datadir}/java \
-    JAVAUNIXPATH=${datadir}/java \
+    JARPREFIX=${datadir_java} \
+    JAVAUNIXPATH=${datadir_java} \
     CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1
 }
 
-do_staging () {
+do_stage () {
   oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
 }
 
diff --git a/packages/libmatthew/libmatthew_0.5.bb b/packages/libmatthew/libmatthew_0.5.bb
index 7a1b05478b..fb7ea3cce8 100644
--- a/packages/libmatthew/libmatthew_0.5.bb
+++ b/packages/libmatthew/libmatthew_0.5.bb
@@ -1,12 +1,14 @@
 DESCRIPTION = "Unix socket, debug and hexdump libraries"
 LICENSE = "LGPL"
 SECTION = "libs"
-HOMEPAGE = "http://jalimo.org"
+HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
 AUTHOR = "Matthew Johnson <web@matthew.ath.cx>"
 
+PR = "r1"
+
 inherit java-library
 
-DEPENDS = "classpath-native classpath"
+DEPENDS = "classpath-native classpath fastjar-native"
 
 SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz"
 
@@ -40,14 +42,14 @@ do_install() {
 	oe_jarinstall io-0.1.jar io.jar
 	oe_jarinstall unix-0.2.jar unix.jar
 
-  oe_libinstall -so libcgi-java ${D}${libdir}/jni
-  oe_libinstall -so libunix-java ${D}${libdir}/jni
+  oe_libinstall -so libcgi-java ${D}${libdir_jni}
+  oe_libinstall -so libunix-java ${D}${libdir_jni}
 }
 
 PACKAGES += "${PN}-jni ${PN}-jni-dbg"
 
 RDEPENDS_${JPN} = "${PN}-jni"
 
-FILES_${PN}-jni = "${libdir}/jni/lib*.so"
-FILES_${PN}-jni-dbg = "${libdir}/jni/.debug/lib*.so"
+FILES_${PN}-jni = "${libdir_jni}/lib*.so"
+FILES_${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so"