[oe-commits] org.oe.dev merge of '1ac2e0e784cd41f10bc1873b42ca201381b538e4'

[oe commit]

merge of '1ac2e0e784cd41f10bc1873b42ca201381b538e4'
     and '72a3a26c741dda13cbbf305c4d6a9abad735fd85'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f25ee9f4905390095da5b802bdeb967b82494c18
ViewMTN: http://monotone.openembedded.org/revision/info/f25ee9f4905390095da5b802bdeb967b82494c18
Files:
1
packages/tasks/task-openmoko-feed.bb
packages/mythtv/mythtv_0.21.bb
packages/openssh/openssh_4.6p1.bb
packages/sugar/sugar-base_0.82.0.bb
Diffs:

#
# mt diff -r1ac2e0e784cd41f10bc1873b42ca201381b538e4 -rf25ee9f4905390095da5b802bdeb967b82494c18
#
#
#
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [6c9d14f781da8cd6061d7caac00db3856b96784e]
#    to [a236d83f49b15fe73d6135a8065aa85f99eb7d4d]
#
============================================================
--- packages/tasks/task-openmoko-feed.bb	6c9d14f781da8cd6061d7caac00db3856b96784e
+++ packages/tasks/task-openmoko-feed.bb	a236d83f49b15fe73d6135a8065aa85f99eb7d4d
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r39"
+PR = "r40"
 
 inherit task
 
@@ -98,4 +98,7 @@ RDEPENDS_task-openmoko-feed = "\
   tichy \
   pidgin \
   epdfview \
+  midori \
+  microcom \
+  emacs \
 "


#
# mt diff -r72a3a26c741dda13cbbf305c4d6a9abad735fd85 -rf25ee9f4905390095da5b802bdeb967b82494c18
#
#
#
# patch "packages/mythtv/mythtv_0.21.bb"
#  from [11c9903ba5a2d62b47e984d6c45a432010f6bbab]
#    to [5fa160f936006e93a6e2bcba0d308ddcc3b105f6]
# 
# patch "packages/openssh/openssh_4.6p1.bb"
#  from [10c9d7afb3cf9de6cae64ac94cf32103fa96bce6]
#    to [98a3923a4964f4b492c8103d6a1c475fd9861a2a]
# 
# patch "packages/sugar/sugar-base_0.82.0.bb"
#  from [752924beabb314108c93457e7a9ae3505e9ba428]
#    to [8a8755b6c6780cbd5d610ce943f0ab95959c7f52]
#
============================================================
--- packages/mythtv/mythtv_0.21.bb	11c9903ba5a2d62b47e984d6c45a432010f6bbab
+++ packages/mythtv/mythtv_0.21.bb	5fa160f936006e93a6e2bcba0d308ddcc3b105f6
@@ -73,7 +73,8 @@ do_configure_prepend() {
 			--cpu=${MYTHTV_ARCH}	\
 			--arch=${MYTHTV_ARCH} \
 			--disable-altivec	\
-		 	--disable-opengl-video \
+		 	--disable-directfb	\
+			--disable-opengl-video \
 			--disable-strip \
 			--enable-v4l		\
 			--enable-audio-oss	\
@@ -81,7 +82,7 @@ do_configure_prepend() {
 			--enable-dvb		\
 			--enable-libmp3lame \
 			--cross-compile	\
-            --dvb-path=${STAGING_INCDIR} \
+			--dvb-path=${STAGING_INCDIR} \
 			--with-bindings= \
 			${EXTRA_OECONF}
 
============================================================
--- packages/openssh/openssh_4.6p1.bb	10c9d7afb3cf9de6cae64ac94cf32103fa96bce6
+++ packages/openssh/openssh_4.6p1.bb	98a3923a4964f4b492c8103d6a1c475fd9861a2a
@@ -14,7 +14,7 @@ LICENSE = "BSD"
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
            file://sftp-server-nolibcrypto.patch;patch=1 \
@@ -57,17 +57,18 @@ do_install_append() {
 	rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
 }
 
-PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc openssh-sftp-server"
+PACKAGES =+ " ssh-keygen openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc openssh-sftp-server"
 FILES_openssh-dbg +=${bindir}/.debug ${libdir}exec/.debug"
 FILES_openssh-scp = "${bindir}/scp.${PN}"
 FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config"
-FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen"
+FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd"
 FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config"
 FILES_openssh-sftp = "${bindir}/sftp"
 FILES_openssh-sftp-server = "${libdir}exec/sftp-server"
 FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*"
+FILES_ssh-keygen = "${bindir}/ssh-keygen"
 
-RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd"
+RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd ssh-keygen "
 DEPENDS_openssh-sshd += " update-rc.d"
 RDEPENDS_openssh-sshd += " update-rc.d"
 
============================================================
--- packages/sugar/sugar-base_0.82.0.bb	752924beabb314108c93457e7a9ae3505e9ba428
+++ packages/sugar/sugar-base_0.82.0.bb	8a8755b6c6780cbd5d610ce943f0ab95959c7f52
@@ -1,7 +1,7 @@ LICENSE = "LGPLv2"
 DESCRIPTION = "Sugar base system"
 LICENSE = "LGPLv2"
 
-PR = "r8"
+PR = "r9"
 
 DEPENDS = "python-pygtk sugar-toolkit"
 RDEPENDS = "librsvg-gtk \
@@ -23,7 +23,7 @@ RDEPENDS = "librsvg-gtk \
 	    python-simplejson \
 	    python-misc \
 	    python-xmlrpc \
-	    "
+	    ssh-keygen"
 
 SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-base/${PN}-${PV}.tar.bz2"