merge of '7fc2fec95429d8a5fefe724be8ec11ee8dd994e2'

     and 'cbaeecaba9cbc9888d6960c452a2c699736ce0de'

17 files changed, 18 insertions, 16 deletions

diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc
index e08cd5ec80..cd4d8c6f3f 100644
--- a/packages/cacao/cacao.inc
+++ b/packages/cacao/cacao.inc
@@ -10,7 +10,6 @@ DEPENDS = "zlib libtool classpath cacaoh-native virtual/javac-native"
 # and cannot be satisfied with a package that provides classpath.
 RDEPENDS = "classpath"
 
-PROVIDES = "cacao virtual/java"
 RPROVIDES_cacao = "java2-runtime"
 
 inherit java autotools update-alternatives
diff --git a/packages/cacao/cacao_0.98+hg20071001.bb b/packages/cacao/cacao_0.98+hg20071001.bb
index e897cfad41..9de8eddce9 100644
--- a/packages/cacao/cacao_0.98+hg20071001.bb
+++ b/packages/cacao/cacao_0.98+hg20071001.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "\
         http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \
diff --git a/packages/cacao/cacao_0.98+hg20080519.bb b/packages/cacao/cacao_0.98+hg20080519.bb
index 0cd5132ef7..aa9cc2ed1d 100644
--- a/packages/cacao/cacao_0.98+hg20080519.bb
+++ b/packages/cacao/cacao_0.98+hg20080519.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \
diff --git a/packages/cacao/cacao_0.99.2.bb b/packages/cacao/cacao_0.99.2.bb
index e9a80781bc..f982047685 100644
--- a/packages/cacao/cacao_0.99.2.bb
+++ b/packages/cacao/cacao_0.99.2.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f \
 	   file://cacao-codegen-arm1.patch;patch=1 \
diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb
index 7fd3f38848..4e93aa8e5f 100644
--- a/packages/directfb/directfb-examples_1.0.0.bb
+++ b/packages/directfb/directfb-examples_1.0.0.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "GPL"
 
 SRC_URI = " \
-           http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \
+           http://www.directfb.org/downloads/Old/DirectFB-examples-${PV}.tar.gz \
           "
 S = "${WORKDIR}/DirectFB-examples-${PV}"
 
diff --git a/packages/directfb/directfb.inc b/packages/directfb/directfb.inc
index 948ffa892e..9066ff2218 100644
--- a/packages/directfb/directfb.inc
+++ b/packages/directfb/directfb.inc
@@ -9,7 +9,7 @@ HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
 
 SRC_URI = " \
-    http://www.directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
+    http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \
     file://fix-pkgconfig-cflags.patch;patch=1 \
     file://fix-font-missing-char.patch;patch=1 \
     file://getpagesize.patch;patch=1 \
diff --git a/packages/directfb/directfb_1.1.1.bb b/packages/directfb/directfb_1.1.1.bb
index cd63eeca1c..9b5588b627 100644
--- a/packages/directfb/directfb_1.1.1.bb
+++ b/packages/directfb/directfb_1.1.1.bb
@@ -8,7 +8,7 @@ DEPENDS += "sysfsutils"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = " \
-    http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+    http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \
     file://fix-pkgconfig-cflags.patch;patch=1 \
     file://fix-font-missing-char.patch;patch=1 \
     file://mkdfiff.patch;patch=1 \
diff --git a/packages/directfb/directfb_1.2.3.bb b/packages/directfb/directfb_1.2.3.bb
index 57a4721a02..85e42a1fa3 100644
--- a/packages/directfb/directfb_1.2.3.bb
+++ b/packages/directfb/directfb_1.2.3.bb
@@ -6,7 +6,7 @@ PR = "r0"
 DEPENDS += "sysfsutils"
 
 SRC_URI = " \
-    http://www.directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
+    http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \
     file://fix-pkgconfig-cflags.patch;patch=1 \
     file://mkdfiff.patch;patch=1 \
     file://dont-use-linux-config.patch;patch=1 \
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.2.bb b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
index 2cad978a16..d41a013cba 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.2.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
@@ -3,7 +3,7 @@ SECTION = "multimedia"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "gstreamer zlib"
+DEPENDS = "gstreamer gst-plugins-base zlib"
 PR = "r2"
 
 inherit autotools pkgconfig
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
index f72772a61e..556214283a 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
@@ -3,7 +3,7 @@ SECTION = "multimedia"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "ffmpeg gstreamer zlib"
+DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib"
 PR = "r5"
 
 inherit autotools pkgconfig
diff --git a/packages/jamvm/jamvm.inc b/packages/jamvm/jamvm.inc
index b5655c6d35..af6fd47ee6 100644
--- a/packages/jamvm/jamvm.inc
+++ b/packages/jamvm/jamvm.inc
@@ -7,7 +7,6 @@ RDEPENDS = "classpath"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz"
 
-PROVIDES = "jamvm virtual/java"
 RPROVIDES_jamvm = "java2-runtime"
 
 # This uses 32 bit arm, so force the instruction set to arm, not thumb
diff --git a/packages/jamvm/jamvm_1.4.5.bb b/packages/jamvm/jamvm_1.4.5.bb
index 8414c5615c..e8ca076350 100644
--- a/packages/jamvm/jamvm_1.4.5.bb
+++ b/packages/jamvm/jamvm_1.4.5.bb
@@ -1,6 +1,6 @@
 require jamvm.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1"
 
diff --git a/packages/jamvm/jamvm_1.5.0.bb b/packages/jamvm/jamvm_1.5.0.bb
index 81977a5f40..92c1992ea9 100644
--- a/packages/jamvm/jamvm_1.5.0.bb
+++ b/packages/jamvm/jamvm_1.5.0.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
 
-PR = "r2"
+PR = "r3"
 
 do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/packages/jamvm/jamvm_1.5.1.bb b/packages/jamvm/jamvm_1.5.1.bb
index 366658dd97..81977a5f40 100644
--- a/packages/jamvm/jamvm_1.5.1.bb
+++ b/packages/jamvm/jamvm_1.5.1.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
 
-PR = "r1"
+PR = "r2"
 
 do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb b/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb
index f7c6c3db42..7348e87ca3 100644
--- a/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb
+++ b/packages/phoneme/phoneme-advanced-foundation_0.0.b87.bb
@@ -1,3 +1,5 @@
+PR = "r1"
+
 require phoneme-advanced.inc
 
 BUILDREV = "b87"
diff --git a/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb b/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb
index aa3b5e7424..675d7b7b9a 100644
--- a/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb
+++ b/packages/phoneme/phoneme-advanced-personal-qt3_0.0.b87.bb
@@ -1,3 +1,5 @@
+PR = "r1"
+
 require phoneme-advanced.inc
 
 BUILDREV = "b87"
diff --git a/packages/phoneme/phoneme-advanced.inc b/packages/phoneme/phoneme-advanced.inc
index 416874178c..a6b2951517 100644
--- a/packages/phoneme/phoneme-advanced.inc
+++ b/packages/phoneme/phoneme-advanced.inc
@@ -41,9 +41,9 @@ do_install() {
 
 	unzip cdc/install/${PN}.zip -d ${D}/${libdir_jvm}
 
-	# Additional link named cvm
+	# Additional link named cvm-${PME_PROFILE}
 	install -d ${D}/${bindir}
-	ln -sf ${libdir_jvm}/${PN}/bin/cvm ${D}${bindir}/cvm
+	ln -sf ${libdir_jvm}/${PN}/bin/cvm ${D}${bindir}/cvm-${PME_PROFILE}
 }
 
 do_configure() {