Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

16 files changed, 2 insertions, 3 deletions

diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index b18313fa2a..db6329c4ad 100644
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -9,7 +9,7 @@ LICENSE = "LGPLv2"
 DEPENDS += "startup-notification"
 
 XFCE_VERSION = ${PV}
-SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
+SRC_URI = "http://www.us.xfce.org/archive/xfce/${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
 
 inherit autotools
 
diff --git a/recipes/didiwiki/didiwiki.inc b/recipes/didiwiki/didiwiki.inc
index 906420402d..28c00196b0 100644
--- a/recipes/didiwiki/didiwiki.inc
+++ b/recipes/didiwiki/didiwiki.inc
@@ -3,7 +3,6 @@ DESCRIPTION = "A small and simple WikiWikiWeb implementation written in C \
 and which includes a built in webserver."
 LICENSE = "GPLv2"
 
-SRC_URI = "http://didiwiki.org/sources/didiwiki-${PV}.tar.gz"
-S = "${WORKDIR}/didiwiki-${PV}"
+SRC_URI = "http://sources.openembedded.org/didiwiki-${PV}.tar.gz"
 
 inherit autotools
diff --git a/recipes/didiwiki/didiwiki_0.2.bb b/recipes/obsolete/didiwiki/didiwiki_0.2.bb
index 0ee2aaa496..0ee2aaa496 100644
--- a/recipes/didiwiki/didiwiki_0.2.bb
+++ b/recipes/obsolete/didiwiki/didiwiki_0.2.bb
diff --git a/recipes/didiwiki/didiwiki_0.4.bb b/recipes/obsolete/didiwiki/didiwiki_0.4.bb
index 0ee2aaa496..0ee2aaa496 100644
--- a/recipes/didiwiki/didiwiki_0.4.bb
+++ b/recipes/obsolete/didiwiki/didiwiki_0.4.bb
diff --git a/recipes/gimp/gimp_2.2.10.bb b/recipes/obsolete/gimp/gimp_2.2.10.bb
index 3719e2d5e5..3719e2d5e5 100644
--- a/recipes/gimp/gimp_2.2.10.bb
+++ b/recipes/obsolete/gimp/gimp_2.2.10.bb
diff --git a/recipes/gimp/gimp_2.3.7.bb b/recipes/obsolete/gimp/gimp_2.3.7.bb
index 7e72e74695..7e72e74695 100644
--- a/recipes/gimp/gimp_2.3.7.bb
+++ b/recipes/obsolete/gimp/gimp_2.3.7.bb
diff --git a/recipes/xmame/xmame-0.86/crosscompile.patch b/recipes/obsolete/xmame/xmame-0.86/crosscompile.patch
index 9f354e2958..9f354e2958 100644
--- a/recipes/xmame/xmame-0.86/crosscompile.patch
+++ b/recipes/obsolete/xmame/xmame-0.86/crosscompile.patch
diff --git a/recipes/xmame/xmame_0.86.bb b/recipes/obsolete/xmame/xmame_0.86.bb
index a5801e73da..a5801e73da 100644
--- a/recipes/xmame/xmame_0.86.bb
+++ b/recipes/obsolete/xmame/xmame_0.86.bb
diff --git a/recipes/xmame/xmame_0.87.bb b/recipes/obsolete/xmame/xmame_0.87.bb
index 80924ef0c6..80924ef0c6 100644
--- a/recipes/xmame/xmame_0.87.bb
+++ b/recipes/obsolete/xmame/xmame_0.87.bb
diff --git a/recipes/xmame/xmame_0.95.bb b/recipes/obsolete/xmame/xmame_0.95.bb
index 80924ef0c6..80924ef0c6 100644
--- a/recipes/xmame/xmame_0.95.bb
+++ b/recipes/obsolete/xmame/xmame_0.95.bb
diff --git a/recipes/zd1211/zd1211-r77/makefile-unslung.patch b/recipes/obsolete/zd1211/zd1211-r77/makefile-unslung.patch
index 4edcbb7a9d..4edcbb7a9d 100644
--- a/recipes/zd1211/zd1211-r77/makefile-unslung.patch
+++ b/recipes/obsolete/zd1211/zd1211-r77/makefile-unslung.patch
diff --git a/recipes/zd1211/zd1211-r77/makefile.patch b/recipes/obsolete/zd1211/zd1211-r77/makefile.patch
index ed111e07ef..ed111e07ef 100644
--- a/recipes/zd1211/zd1211-r77/makefile.patch
+++ b/recipes/obsolete/zd1211/zd1211-r77/makefile.patch
diff --git a/recipes/zd1211/zd1211-r83/makefile-unslung.patch b/recipes/obsolete/zd1211/zd1211-r83/makefile-unslung.patch
index bc189e823f..bc189e823f 100644
--- a/recipes/zd1211/zd1211-r83/makefile-unslung.patch
+++ b/recipes/obsolete/zd1211/zd1211-r83/makefile-unslung.patch
diff --git a/recipes/zd1211/zd1211-r83/makefile.patch b/recipes/obsolete/zd1211/zd1211-r83/makefile.patch
index adc2bd416d..adc2bd416d 100644
--- a/recipes/zd1211/zd1211-r83/makefile.patch
+++ b/recipes/obsolete/zd1211/zd1211-r83/makefile.patch
diff --git a/recipes/zd1211/zd1211_r77.bb b/recipes/obsolete/zd1211/zd1211_r77.bb
index 8321f8d96c..8321f8d96c 100644
--- a/recipes/zd1211/zd1211_r77.bb
+++ b/recipes/obsolete/zd1211/zd1211_r77.bb
diff --git a/recipes/zd1211/zd1211_r83.bb b/recipes/obsolete/zd1211/zd1211_r83.bb
index 0f7bb7d5c8..0f7bb7d5c8 100644
--- a/recipes/zd1211/zd1211_r83.bb
+++ b/recipes/obsolete/zd1211/zd1211_r83.bb