merge of '29f18c2c0029fd3d13de5cd9fcfb660d02e92d7f'

     and '6172d35f51653bcccfdee6d1406ae52584df35a7'

32 files changed, 19 insertions, 10 deletions

diff --git a/packages/dbus/dbus-0.90/.mtn2git_empty b/packages/dbus/dbus-0.90/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dbus/dbus-0.90/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dbus/dbus-python/.mtn2git_empty b/packages/dbus/dbus-python/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dbus/dbus-python/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dbus/dbus_0.20.bb b/packages/dbus/dbus_0.20.bb
index 0a08862f10..6d0a777fef 100644
--- a/packages/dbus/dbus_0.20.bb
+++ b/packages/dbus/dbus_0.20.bb
@@ -2,6 +2,7 @@ SECTION = "base"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 LICENSE = "GPL"
 
 SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
diff --git a/packages/dbus/dbus_0.21.bb b/packages/dbus/dbus_0.21.bb
index abd234712f..d7b164e8cc 100644
--- a/packages/dbus/dbus_0.21.bb
+++ b/packages/dbus/dbus_0.21.bb
@@ -3,6 +3,7 @@ PR = "r4"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 LICENSE = "GPL"
 
 SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
diff --git a/packages/dbus/dbus_0.22.bb b/packages/dbus/dbus_0.22.bb
index 424c27908b..8eacbeca27 100644
--- a/packages/dbus/dbus_0.22.bb
+++ b/packages/dbus/dbus_0.22.bb
@@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.23.1-osso5.bb b/packages/dbus/dbus_0.23.1-osso5.bb
index b2fc9c44ac..1cb72cb792 100644
--- a/packages/dbus/dbus_0.23.1-osso5.bb
+++ b/packages/dbus/dbus_0.23.1-osso5.bb
@@ -5,6 +5,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/d/${PN}/${PN}_${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb
index dc3f6f2e72..6fd86ae1aa 100644
--- a/packages/dbus/dbus_0.23.4.bb
+++ b/packages/dbus/dbus_0.23.4.bb
@@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.23.bb b/packages/dbus/dbus_0.23.bb
index c0faeec1a6..de224f307e 100644
--- a/packages/dbus/dbus_0.23.bb
+++ b/packages/dbus/dbus_0.23.bb
@@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
+PROVIDES = "dbus-glib"
 
 SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
diff --git a/packages/dbus/dbus_0.60.bb b/packages/dbus/dbus_0.60.bb
index 2d9a27e74d..57a1c10242 100644
--- a/packages/dbus/dbus_0.60.bb
+++ b/packages/dbus/dbus_0.60.bb
@@ -2,6 +2,7 @@ require dbus_${PV}.inc
 
 FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
+PROVIDES = "dbus-glib"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 
 FILES_${PN} += "${bindir}/dbus-daemon"
diff --git a/packages/dbus/dbus_0.61.bb b/packages/dbus/dbus_0.61.bb
index 2d9a27e74d..57a1c10242 100644
--- a/packages/dbus/dbus_0.61.bb
+++ b/packages/dbus/dbus_0.61.bb
@@ -2,6 +2,7 @@ require dbus_${PV}.inc
 
 FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
+PROVIDES = "dbus-glib"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 
 FILES_${PN} += "${bindir}/dbus-daemon"
diff --git a/packages/dbus/dbus_0.62.bb b/packages/dbus/dbus_0.62.bb
index 2d9a27e74d..57a1c10242 100644
--- a/packages/dbus/dbus_0.62.bb
+++ b/packages/dbus/dbus_0.62.bb
@@ -2,6 +2,7 @@ require dbus_${PV}.inc
 
 FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
+PROVIDES = "dbus-glib"
 SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
 
 FILES_${PN} += "${bindir}/dbus-daemon"
diff --git a/packages/devmem2/devmem2.bb b/packages/devmem2/devmem2.bb
index 0ddaec5637..64de9fcbf3 100644
--- a/packages/devmem2/devmem2.bb
+++ b/packages/devmem2/devmem2.bb
@@ -1,4 +1,4 @@
-SRC_URI = "http://www.lart.tudelft.nl/lartware/port/devmem2.c"
+SRC_URI = "http://www.abcsinc.com/small-linux/devmem2.c"
 LICENSE = "GPL"
 
 S = "${WORKDIR}"
diff --git a/packages/puzzles/puzzles_r6712.bb b/packages/puzzles/puzzles_r6712.bb
index fe641570e2..41a6e808ab 100644
--- a/packages/puzzles/puzzles_r6712.bb
+++ b/packages/puzzles/puzzles_r6712.bb
@@ -7,7 +7,7 @@ SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=6712 \
 S = "${WORKDIR}/puzzles/"
 
 do_configure() {
-        cd ${S} && ${STAGING_BINDIR}/perl mkfiles.pl
+        cd ${S} && perl mkfiles.pl
 }
 
 do_compile_prepend = " \
diff --git a/packages/xfonts/.mtn2git_empty b/packages/xfonts/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfonts/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xhost/.mtn2git_empty b/packages/xhost/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xhost/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xlibs/.mtn2git_empty b/packages/xlibs/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xlibs/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xmodmap/.mtn2git_empty b/packages/xmodmap/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xmodmap/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc
index 78146b1e78..53aa991b9f 100644
--- a/packages/xorg-app/xorg-app-common.inc
+++ b/packages/xorg-app/xorg-app-common.inc
@@ -6,7 +6,7 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 FILES_${PN} += "  /usr/lib/X11/${XORG_PN}"
diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc
index ade9fdec58..095bc095fc 100644
--- a/packages/xorg-data/xorg-data-common.inc
+++ b/packages/xorg-data/xorg-data-common.inc
@@ -6,7 +6,7 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc
index 91a297265b..3be252d076 100644
--- a/packages/xorg-doc/xorg-doc-common.inc
+++ b/packages/xorg-doc/xorg-doc-common.inc
@@ -6,7 +6,7 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc
index 361914db24..6d8204b9b1 100644
--- a/packages/xorg-driver/xorg-driver-common.inc
+++ b/packages/xorg-driver/xorg-driver-common.inc
@@ -7,7 +7,7 @@ LICENSE = "MIT-X"
 DEPENDS = "randrproto xorg-server xproto"
 
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc
index 38fd1af5a5..8a6bd0b475 100644
--- a/packages/xorg-font/xorg-font-common.inc
+++ b/packages/xorg-font/xorg-font-common.inc
@@ -7,7 +7,7 @@ DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-n
 RDEPENDS = "encodings font-util font-alias"
 
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-fonts/.mtn2git_empty b/packages/xorg-fonts/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xorg-fonts/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc
index 7a3e0425c7..8e5ba5874f 100644
--- a/packages/xorg-lib/xorg-lib-common.inc
+++ b/packages/xorg-lib/xorg-lib-common.inc
@@ -5,7 +5,7 @@ LICENSE = "MIT-X"
 
 DEPENDS = "util-macros"
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc
index 74e7312a50..4d189235f4 100644
--- a/packages/xorg-proto/xorg-proto-common.inc
+++ b/packages/xorg-proto/xorg-proto-common.inc
@@ -6,7 +6,7 @@ LICENSE = "MIT-X"
 
 #DEPENDS = ""
 XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 6c1bbd34a9..5f5f5c0dea 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -18,7 +18,7 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
 REPENDS="rgb"
 
 XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \
 	file://xorg.conf"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
diff --git a/packages/xprop/.mtn2git_empty b/packages/xprop/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xprop/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xproto/.mtn2git_empty b/packages/xproto/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xproto/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xrandr/.mtn2git_empty b/packages/xrandr/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xrandr/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xrdb/.mtn2git_empty b/packages/xrdb/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xrdb/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xserver-common/.mtn2git_empty b/packages/xserver-common/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xserver-common/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xset/.mtn2git_empty b/packages/xset/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xset/.mtn2git_empty
+++ /dev/null