Switch from gtkterm to matchbox-terminal

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2310 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 4 insertions, 31 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index dc534b247a..358b42a9d0 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -69,7 +69,7 @@ SRCDATE_contacts ?= "20070614"
 SRCDATE_dates ?= "20070706"
 SRCDATE_gtkhtml2 ?= "20060323"
 SRCDATE_web ?= "20070529"
-SRCDATE_eds-dbus ?= "20070704"
+SRCDATE_eds-dbus ?= "20070801"
 SRCDATE_minimo ?= "20070510"
 SRCDATE_ipkg-utils-native ?= "20050930"
 SRCDATE_ipkg-link-1 ?= "20050930"
@@ -84,7 +84,7 @@ SRCDATE_matchbox-panel-manager ?= "20060612"
 SRCDATE_matchbox-panel-2 ?= "20070715"
 SRCDATE_matchbox-stroke ?= "20070417"
 SRCDATE_matchbox-themes-extra ?= "20070417"
-SRCDATE_matchbox-terminal ?= "20070714"
+SRCDATE_matchbox-terminal ?= "20070719"
 SRCDATE_matchbox-wm ?= "20070417"
 SRCDATE_libmatchbox ?= "20070417"
 SRCDATE_settings-daemon ?= "20070728"
diff --git a/meta/packages/gtkterm/files/gtkterm.desktop b/meta/packages/gtkterm/files/gtkterm.desktop
deleted file mode 100644
index d09c26e125..0000000000
--- a/meta/packages/gtkterm/files/gtkterm.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Terminal
-Comment=When all else fails.
-Exec=gtkterm2
-Icon=utilities-terminal.png
-Terminal=false
-Categories=Utility;
-StartupNotify=true
diff --git a/meta/packages/gtkterm/gtkterm2_0.2.3.bb b/meta/packages/gtkterm/gtkterm2_0.2.3.bb
deleted file mode 100644
index 7e9c79b743..0000000000
--- a/meta/packages/gtkterm/gtkterm2_0.2.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "A lightweight terminal emulator based on VTE and Gtk+"
-HOMEPAGE = "http://gtkterm.feige.net/"
-AUTHOR = "Oliver Feige"
-SECTION = "x11/terminals"
-DEPENDS = "gtk+ vte"
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gtkterm/gtkterm2-${PV}.tar.gz \
-        file://gtkterm.desktop"
-
-inherit autotools
-
-do_install_append () {
-        install -d ${D}/${datadir}/applications
-        install -m 0644 ${WORKDIR}/gtkterm.desktop ${D}/${datadir}/applications
-}
diff --git a/meta/packages/tasks/task-poky.bb b/meta/packages/tasks/task-poky.bb
index fc7e51b1b9..890d4d0105 100644
--- a/meta/packages/tasks/task-poky.bb
+++ b/meta/packages/tasks/task-poky.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Tasks for OpenedHand Poky"
-PR = "r10"
+PR = "r11"
 
 PACKAGES = "\
     task-poky-apps-console \
@@ -72,7 +72,7 @@ RDEPENDS_task-poky-x11-base = "\
 RDEPENDS_task-poky-apps-x11-core = "\
     leafpad \
     pcmanfm \
-    gtkterm2 \
+    matchbox-terminal \
     screenshot"