merge of '6bfc098b36170550230dc57120c75b31480dc6b3'

     and 'abcca41fb7edac5318b0cb0266d5f0c167f87c2f'

5 files changed, 40 insertions, 4 deletions

diff --git a/packages/classpath/classpath-minimal_0.96.1.bb b/packages/classpath/classpath-minimal_0.96.1.bb
index 0597274915..e71884dc2b 100644
--- a/packages/classpath/classpath-minimal_0.96.1.bb
+++ b/packages/classpath/classpath-minimal_0.96.1.bb
@@ -1,6 +1,6 @@
 require classpath.inc
 
-PR = "r3"
+PR = "r5"
 
 SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
 
diff --git a/packages/classpath/classpath-minimal_0.97.bb b/packages/classpath/classpath-minimal_0.97.bb
new file mode 100644
index 0000000000..14495cedff
--- /dev/null
+++ b/packages/classpath/classpath-minimal_0.97.bb
@@ -0,0 +1,15 @@
+require classpath.inc
+
+PR = "r0"
+
+PROVIDES = "${PN} classpath"
+
+EXTRA_OECONF += "\
+                --enable-local-sockets \
+                --disable-alsa \
+                --disable-gconf-peer \
+                --disable-gtk-peer \
+                --disable-plugin \
+                --disable-dssi \
+                --disable-examples \
+               "
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index 97c081af89..e5f5170b32 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -9,8 +9,11 @@ DEPENDS = "virtual/javac-native fastjar-native zip-native"
 RPROVIDES = ""
 
 RDEPENDS_${PN} = "${PBN}-common (>= ${PV})"
+RDEPENDS_${PN}-examples = "java2-runtime ${PN}-awt"
+RDEPENDS_${PN}-tools = "java2-runtime"
 
 RPROVIDES_${PN} = "${PBN}"
+RPROVIDES_${PN}-common = "${PBN}-common"
 RPROVIDES_${PN}-gtk = "${PBN}-awt"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
diff --git a/packages/classpath/classpath_0.96.1.bb b/packages/classpath/classpath_0.96.1.bb
index 6b167a2d47..799b0f31ac 100644
--- a/packages/classpath/classpath_0.96.1.bb
+++ b/packages/classpath/classpath_0.96.1.bb
@@ -1,8 +1,8 @@
 require classpath.inc
 
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
-
-PR = "r2"
+SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+          "
+PR = "r4"
 
 DEPENDS += "gtk+ gconf libxtst"
 
diff --git a/packages/classpath/classpath_0.97.bb b/packages/classpath/classpath_0.97.bb
new file mode 100644
index 0000000000..b8cd02084a
--- /dev/null
+++ b/packages/classpath/classpath_0.97.bb
@@ -0,0 +1,18 @@
+require classpath.inc
+
+PR = "r0"
+
+DEPENDS += "gtk+ gconf libxtst"
+
+EXTRA_OECONF += "\
+                --disable-alsa \
+                --disable-dssi \
+                --disable-qt4-peer \
+                --disable-plugin \
+                --enable-gconf-peer \
+                --enable-gtk-peer \
+                --enable-local-sockets \
+                --with-vm=java \
+               "
+
+