diff options
author | John Lee <john_lee@openmoko.org> | 2008-03-12 06:18:23 +0000 |
---|---|---|
committer | John Lee <john_lee@openmoko.org> | 2008-03-12 06:18:23 +0000 |
commit | 7c162428143a230e9980879fb8d55ceb5c018a5f (patch) | |
tree | 13e5ed80cc51548e3503e7ae1367d277b6f70ad8 | |
parent | fc430305d8fc4212336eebd7a0e45e8d1df5bb6d (diff) | |
parent | 0dd6c9d399e246ba8681e36e50a3b2df2a20db3d (diff) |
merge of '7ecf249aa01227cf559b984727eddf32c13c84a5'
and 'ef249adf427bcb2b167f2fde790ed1627e901111'
-rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 2 | ||||
-rw-r--r-- | packages/gnash/gnash_0.8.2.bb | 1 | ||||
-rw-r--r-- | packages/tasks/task-openmoko-feed.bb | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 0d988b41d7..a54cf9174f 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -2,7 +2,7 @@ PREFERRED_VERSION_asterisk = "1.4.17" PREFERRED_VERSION_busybox = "1.9.1" PREFERRED_VERSION_dbus = "1.1.20" PREFERRED_VERSION_dbus-glib = "0.74" -PREFERRED_VERSION_gnash = "0.8.1" +PREFERRED_VERSION_gnash = "0.8.2" PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_intltool = "0.35.5" diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb new file mode 100644 index 0000000000..da4b281e94 --- /dev/null +++ b/packages/gnash/gnash_0.8.2.bb @@ -0,0 +1 @@ +require gnash.inc diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 97f24a7624..ee8cdf8e6b 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -24,7 +24,8 @@ RDEPENDS_task-openmoko-feed = "\ nano \ ntpclient ntp \ openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \ - python python-pygtk python-pyserial python-efl \ + python python-pygtk python-pyserial \ +# python-efl \ ruby \ libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \ settingsgui \ |