merge of '1c519945061442d855a10b3cd32d8bc44eb00a0e'

     and 'b1dfeb0971313e5a75fb5eac8403953e417ef855'

16 files changed, 76 insertions, 31 deletions

diff --git a/packages/efl/etk_20060418.bb b/packages/efl/etk_0.1.0.003.bb
index bf1f98d497..86e1ce9f8e 100644
--- a/packages/efl/etk_20060418.bb
+++ b/packages/efl/etk_0.1.0.003.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
 DEPENDS = "evas-x11 ecore-x11 edje"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r0"
 
 inherit efl
 
diff --git a/packages/fbgrab/fbgrab-viewer-native_1.0.bb b/packages/fbgrab/fbgrab-viewer-native_1.0.bb
new file mode 100644
index 0000000000..2494918c31
--- /dev/null
+++ b/packages/fbgrab/fbgrab-viewer-native_1.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Viewer for a network enabled fbgrab"
+HOMEPAGE = "http://svn.openezx.org/trunk/src/userspace/fbgrab/"
+LICENSE = "GPL"
+SECTION = "console/network"
+DEPENDS = "libpng-native"
+PV = "0.0+svn${SRCDATE}"
+PR = "r30"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=fbgrab;proto=http"
+S = "${WORKDIR}/fbgrab"
+
+inherit native
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} -g -Wall -lpng -lX11 -o fbgrab-viewer fbgrab-viewer.c
+}
+
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0755 fbgrab-viewer ${DEPLOY_DIR_IMAGE}/fbgrab-viewer
+}
+
+do_stage() {
+    :
+}
+
+do_install() {
+    :
+}
+
+addtask deploy before do_install after do_compile
diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index 6e35227f41..9a9ef9119b 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -4,10 +4,10 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus-glib ncurses python"
 
-EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
-		--x-libraries=${STAGING_LIBDIR} \
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
                 --enable-dbus \
-		--disable-python  "
+                --enable-python"
 
 SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
            file://gpsd-default \
@@ -45,8 +45,13 @@ do_install_append() {
         install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd
 }
 
-PACKAGES =+ "libgps"
+PACKAGES =+ "libgps python-pygps"
 
 FILES_${PN} += "${sysconfdir}"
 FILES_libgps = "${libdir}/*.so*"
 CONFFILES_${PN} = "${sysconfdir}/default/gpsd"
+
+DESCRIPTION_python-pygps = "Python bindings to gpsd"
+FILES_python-pygps = "${libdir}/*/site-packages/*"
+RDEPENDS_python-pygps = "python-core gpsd"
+
diff --git a/packages/gpsd/gpsd_2.32.bb b/packages/gpsd/gpsd_2.32.bb
deleted file mode 100644
index 12ef7f47a3..0000000000
--- a/packages/gpsd/gpsd_2.32.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gpsd.inc
-PR = "r2"
diff --git a/packages/gpsd/gpsd_2.33.bb b/packages/gpsd/gpsd_2.33.bb
deleted file mode 100644
index a3b5b0bc25..0000000000
--- a/packages/gpsd/gpsd_2.33.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gpsd.inc
-
-DEPENDS = "ncurses"
-
-PR = "r2"
diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb
index 726ba42481..92b4d59bf1 100644
--- a/packages/gpsd/gpsd_2.34.bb
+++ b/packages/gpsd/gpsd_2.34.bb
@@ -1,3 +1,3 @@
 require gpsd.inc
 
-PR = "r2"
+PR = "r3"
diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc
index e14bfdeefe..c417280cd6 100644
--- a/packages/iproute2/iproute2.inc
+++ b/packages/iproute2/iproute2.inc
@@ -12,15 +12,23 @@ SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz"
 
 S = "${WORKDIR}/${DIRNAME}-${PV}-${DATE}"
 
+inherit update-alternatives
+
 EXTRA_OEMAKE = "CC='${CC}' \
                 KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include \
                 DOCDIR=${docdir}/iproute2 \
                 SUBDIRS='lib tc ip' \
-                SBINDIR=/sbin"
+                SBINDIR=${base_sbindir}"
 
 do_install () {
         oe_runmake DESTDIR=${D} install
+        mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2
 }
 
 FILES_${PN} += "/usr/lib/tc/*"
 FILES_${PN}-dbg += "/usr/lib/tc/.debug"
+
+ALTERNATIVE_NAME = "ip"
+ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2"
+ALTERNATIVE_LINK = "${base_bindir}/ip"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/packages/iproute2/iproute2_2.6.16.bb b/packages/iproute2/iproute2_2.6.16.bb
index fc87b9e3b5..9d261927f6 100644
--- a/packages/iproute2/iproute2_2.6.16.bb
+++ b/packages/iproute2/iproute2_2.6.16.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
                    file://new-flex-fix.patch;patch=1"
diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb
index 9d85126b68..ad62b5344a 100644
--- a/packages/iproute2/iproute2_2.6.18.bb
+++ b/packages/iproute2/iproute2_2.6.18.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
                    file://new-flex-fix.patch;patch=1"
diff --git a/packages/iproute2/iproute2_2.6.20.bb b/packages/iproute2/iproute2_2.6.20.bb
new file mode 100644
index 0000000000..5efdf98f2d
--- /dev/null
+++ b/packages/iproute2/iproute2_2.6.20.bb
@@ -0,0 +1,11 @@
+PR = "r2"
+
+SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
+                   file://ip6tunnel.patch;patch=1 \
+                   file://man-pages-fix.patch;patch=1 \
+                   file://no-strip.patch;patch=1"
+
+require iproute2.inc
+
+DIRNAME = "iproute"
+DATE = "070313"
diff --git a/packages/xorg-app/mkfontdir-native_1.0.3.bb b/packages/xorg-app/mkfontdir-native_1.0.3.bb
index c4c5e5d259..2753b185ba 100644
--- a/packages/xorg-app/mkfontdir-native_1.0.3.bb
+++ b/packages/xorg-app/mkfontdir-native_1.0.3.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "X mkfontdir app"
 SECTION = "x11/applications"
 LICENSE = "MIT-X"
-
+DEPENDS = "util-macros-native mkfontscale-native"
+PR = "r1"
 PE = "1"
 
-S="${WORKDIR}/mkfontdir-${PV}"
+S = "${WORKDIR}/mkfontdir-${PV}"
 SRC_URI = "${XORG_MIRROR}/X11R7.1/src/app/mkfontdir-${PV}.tar.bz2"
 
-DEPENDS = "util-macros-native"
 inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
index 0787a7ced7..7bfea3e84c 100644
--- a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "X mkfontdir app"
 SECTION = "x11/applications"
 LICENSE = "MIT-X"
+DEPENDS = "util-macros-native mkfontscale-native"
+PR = "r1"
 
-S="${WORKDIR}/mkfontdir-${PV}"
+S = "${WORKDIR}/mkfontdir-${PV}"
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontdir-${PV}.tar.bz2"
 
-DEPENDS = "util-macros-native"
 inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
index 0eb85010b9..ac6d19fd95 100644
--- a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "X mkfontdir app"
 SECTION = "x11/applications"
 LICENSE = "MIT-X"
+DEPENDS = "util-macros-native mkfontscale-native"
+PR = "r1"
 
-S="${WORKDIR}/mkfontdir-${PV}"
+S = "${WORKDIR}/mkfontdir-${PV}"
 SRC_URI = "${XORG_MIRROR}/X11R7.1/src/app/mkfontdir-${PV}.tar.bz2"
 
-DEPENDS = "util-macros-native"
 inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir_1.0.3.bb b/packages/xorg-app/mkfontdir_1.0.3.bb
index cf7839586f..a65149408d 100644
--- a/packages/xorg-app/mkfontdir_1.0.3.bb
+++ b/packages/xorg-app/mkfontdir_1.0.3.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 PE = "1"
-#DESCRIPTION = ""
 
-#DEPENDS += " "
+RDEPENDS += "mkfontscale"
 
diff --git a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
index 556afd2867..d721fd07b7 100644
--- a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
@@ -1,6 +1,4 @@
 require xorg-app-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
+RDEPENDS += "mkfontscale"
 
diff --git a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
index 556afd2867..d721fd07b7 100644
--- a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
@@ -1,6 +1,4 @@
 require xorg-app-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
+RDEPENDS += "mkfontscale"