[oe-commits] org.oe.dev merge of 'bf8c5e1e7ed3a5da0c5093ef25679dfa347661d0'

Wed Sep 12 11:20:53 UTC 2007

merge of 'bf8c5e1e7ed3a5da0c5093ef25679dfa347661d0'
     and 'c4e2e121643a61501bd54fc8c15f73fdd313e942'

Author: openmoko at openembedded.org
Branch: org.openembedded.dev
Revision: 917e630bc6246fb7b73a598e82412902e7dba1ca
ViewMTN: http://monotone.openembedded.org/revision/info/917e630bc6246fb7b73a598e82412902e7dba1ca
Files:
1
packages/uboot/uboot-openmoko_1.2.0+git8993e54b6f397973794f3d6f47d3b3c0c98dd4f6+svn20070819.bb
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/gpephone/libidn_0.5.19.bb
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
packages/openmoko2/neod_svn.bb
packages/openmoko2/openmoko-terminal2_svn.bb
packages/settings-daemon/settings-daemon_svn.bb
packages/tasks/task-openmoko.bb
Diffs:

#
# mt diff -rbf8c5e1e7ed3a5da0c5093ef25679dfa347661d0 -r917e630bc6246fb7b73a598e82412902e7dba1ca
#
# 
# 
# rename "packages/uboot/uboot-openmoko_1.2.0+git8993e54b6f397973794f3d6f47d3b3c0c98dd4f6+svn20070819.bb"
#     to "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
# 
# patch "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#  from [8d08d096caa72a97ccb48b2ac60bbc7435d1669a]
#    to [b42ad01a57090bd2d30d7aab77b4aa9e3607b31c]
# 
============================================================

--- packages/uboot/uboot-openmoko_1.2.0+git8993e54b6f397973794f3d6f47d3b3c0c98dd4f6+svn20070819.bb	8d08d096caa72a97ccb48b2ac60bbc7435d1669a
+++ packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb	b42ad01a57090bd2d30d7aab77b4aa9e3607b31c
@@ -1,22 +1,22 @@ PRIORITY = "optional"
 DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
 AUTHOR = "Harald Welte <laforge at openmoko.org>"
 LICENSE = "GPL"
 SECTION = "bootloader"
 PRIORITY = "optional"
 
-UBOOT_UPSTREAM_REV = "8993e54b6f397973794f3d6f47d3b3c0c98dd4f6"
-UBOOT_OPENMOKO_DATE = "20070819"
+UBOOT_UPSTREAM_REV = "f34024d4a328e6edd906456da98d2c537155c4f7"
+UBOOT_OPENMOKO_REV = "2943"
 UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4"
 
-PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_DATE}"
-PR = "r2"
+PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
+PR = "r0"
 
 PROVIDES = "virtual/bootloader"
 S = "${WORKDIR}/git"
 
 SRC_URI = "\
-  git://www.denx.de/git/u-boot.git/;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
-  svn://svn.openmoko.org/branches/u-boot/pre-20070822;module=patches;date=${UBOOT_OPENMOKO_DATE};proto=http \
+  git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
+  svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
 "


#
# mt diff -rc4e2e121643a61501bd54fc8c15f73fdd313e942 -r917e630bc6246fb7b73a598e82412902e7dba1ca
#
# 
# 
# patch "packages/gpephone/libidn_0.5.19.bb"
#  from [51ac3365c7f507ab5a227bf575e865b94063ce78]
#    to [5987865edc29ae5b9e804ba304e9e6c9ccd20f8b]
# 
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
#  from [b1117cd7aafdee0621dd4af3531528f543c555fb]
#    to [c83b2518da5c8c31d03ed19d8aed54afa6d26d38]
# 
# patch "packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb"
#  from [4a7d646254a8d53ef2d2072bb9b2a42b8ddd9621]
#    to [829c07ddef2c0dc2984f49728495a7e1af8a3422]
# 
# patch "packages/openmoko2/neod_svn.bb"
#  from [5425e0836b76f5378b1da4b9f6540f1595380b8d]
#    to [32bcbfdb1bfd2e330587154170f145bde2539594]
# 
# patch "packages/openmoko2/openmoko-terminal2_svn.bb"
#  from [4d18a6322c47ded2056c9d675777eaf945db7b35]
#    to [c03ebde8699bb2c4733c6fcdcd9ed4318fd438f1]
# 
# patch "packages/settings-daemon/settings-daemon_svn.bb"
#  from [57b9c6ad7daa156f0835654d8028ae25d5d308b5]
#    to [645f5cd35518ca1a4b650a7c494a2bed8154ac61]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [e4551bddd9d494b1f0a4941f72778979e4ec65c7]
#    to [edc6e08d757466a41e6940253f7486eb5c4ed2bc]
# 
============================================================
--- packages/gpephone/libidn_0.5.19.bb	51ac3365c7f507ab5a227bf575e865b94063ce78
+++ packages/gpephone/libidn_0.5.19.bb	5987865edc29ae5b9e804ba304e9e6c9ccd20f8b
@@ -1,8 +1,7 @@ PRIORITY    = "optional"
 LICENSE     = "LGPL"
 DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group."
 SECTION = "libs"
 PRIORITY    = "optional"
-DEPENDS     = "glibc"
 PR          = "r0"
 
 inherit pkgconfig autotools
============================================================
--- packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb	b1117cd7aafdee0621dd4af3531528f543c555fb
+++ packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb	c83b2518da5c8c31d03ed19d8aed54afa6d26d38
@@ -5,7 +5,7 @@ SECTION = "x11"
 RPROVIDES_${PN} = matchbox-keyboard
 #DEFAULT_PREFERENCE = "-1"
 SECTION = "x11"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
 PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
============================================================
--- packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb	4a7d646254a8d53ef2d2072bb9b2a42b8ddd9621
+++ packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb	829c07ddef2c0dc2984f49728495a7e1af8a3422
@@ -5,6 +5,8 @@ PR = "r3"
 DEPENDS = "gtk+"
 PR = "r3"
 
+PV = "0.0+git${SRCDATE}"
+
 SRC_URI = "git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git"
 
 S = "${WORKDIR}/git"
============================================================
--- packages/openmoko2/neod_svn.bb	5425e0836b76f5378b1da4b9f6540f1595380b8d
+++ packages/openmoko2/neod_svn.bb	32bcbfdb1bfd2e330587154170f145bde2539594
@@ -14,5 +14,5 @@ EXTRA_OECONF_rokre6    = "--with-platfor
 EXTRA_OECONF_rokre2    = "--with-platform=ezx"
 EXTRA_OECONF_rokre6    = "--with-platform=ezx"
 
-PACKAGE_ARCH = "${MACHINE}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
============================================================
--- packages/openmoko2/openmoko-terminal2_svn.bb	4d18a6322c47ded2056c9d675777eaf945db7b35
+++ packages/openmoko2/openmoko-terminal2_svn.bb	c03ebde8699bb2c4733c6fcdcd9ed4318fd438f1
@@ -1,7 +1,6 @@ SECTION = "openmoko/applications"
 DESCRIPTION = "The OpenMoko Command Line Console"
 SECTION = "openmoko/applications"
-DEPENDS = "libmokoui2"
-RDEPENDS = "vte"
+DEPENDS = "vte libmokoui2"
 PV = "2.1.0+${SVNREV}"
 PR = "r1"
 
============================================================
--- packages/settings-daemon/settings-daemon_svn.bb	57b9c6ad7daa156f0835654d8028ae25d5d308b5
+++ packages/settings-daemon/settings-daemon_svn.bb	645f5cd35518ca1a4b650a7c494a2bed8154ac61
@@ -1,10 +1,9 @@ SECTION = "x11"
 DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
 LICENSE = "GPL"
 DEPENDS = "gconf glib-2.0"
 RDEPENDS = "xrdb"
 SECTION = "x11"
-PV = "0.0+svn${SRCDATE}"
-PR = "r2"
+PV = "0.0+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
 	   file://70settings-daemon"
============================================================
--- packages/tasks/task-openmoko.bb	e4551bddd9d494b1f0a4941f72778979e4ec65c7
+++ packages/tasks/task-openmoko.bb	edc6e08d757466a41e6940253f7486eb5c4ed2bc
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r61"
+PR = "r62"
 
 inherit task
 
@@ -131,6 +131,7 @@ RDEPENDS_task-openmoko-pim = "\
   eds-dbus \
   openmoko-calculator2 \
   openmoko-contacts2 \
+  openmoko-dates2 \
   openmoko-feedreader2 \
   openmoko-tasks2 \
   openmoko-today2 \




