add openmoko-terminal2, using mrxvt instead of gtkterm2

5 files changed, 31 insertions, 3 deletions

diff --git a/packages/openmoko2/openmoko-terminal2/.mtn2git_empty b/packages/openmoko2/openmoko-terminal2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2/.mtn2git_empty
diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop
new file mode 100644
index 0000000000..2777736039
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Terminal
+Comment=Command Line Interface Terminal
+Exec=mrxvt
+Icon=openmoko-terminal
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=false
+StartupNotify=true
diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png
new file mode 100644
index 0000000000..56e8e59628
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png
diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
new file mode 100644
index 0000000000..5b21cc4e57
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "The OpenMoko Command Line Console"
+SECTION = "openmoko/applications"
+RDEPENDS += "mrxvt"
+PR = "r0"
+
+inherit openmoko2
+
+SRC_URI = "file://openmoko-terminal.png \
+           file://openmoko-terminal.desktop"
+
+do_install() {
+        install -d ${D}${datadir}/pixmaps
+        install -d ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/openmoko-terminal.png ${D}${datadir}/pixmaps/
+        install -m 0644 ${WORKDIR}/openmoko-terminal.desktop ${D}${datadir}/applications/
+}
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 7ad13c7acc..8641ca5090 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r54"
+PR = "r55"
 
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
@@ -77,13 +77,13 @@ RDEPENDS_task-openmoko-ui = "\
 #
 DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer"
 RDEPENDS_task-openmoko-base = "\
-  openmoko-terminal \
   matchbox-panel-2 \
   matchbox-panel-2-applets \
   matchbox-applet-inputmanager \
 #  openmoko-appmanager \
   matchbox-keyboard \
   matchbox-stroke \
+  openmoko-terminal2 \
   openmoko-keyboard \
 #  openmoko-panel-mainmenu \
   openmoko-panel-battery \
@@ -115,7 +115,7 @@ RDEPENDS_task-openmoko-pim = "\
   openmoko-contacts2 \
   openmoko-today2 \
 #  openmoko-messages \
-#  openmoko-rssreader \
+#  openmoko-feedreader2 \
 "
 
 #