[oe-commits] org.oe.dev add openmoko-terminal2, using mrxvt instead of gtkterm2

[mickeyl commit]

add openmoko-terminal2, using mrxvt instead of gtkterm2

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e3b95b3fe2c80011875abb2aa582b3d6eeba8d1e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e3b95b3fe2c80011875abb2aa582b3d6eeba8d1e
Files:
1
packages/openmoko2/openmoko-terminal2
packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop
packages/openmoko2/openmoko-terminal2/openmoko-terminal.png
packages/openmoko2/openmoko-terminal2_1.0.0.bb
packages/tasks/task-openmoko.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -ra770244da47e4419034d13e439c5344a5491ec4a -re3b95b3fe2c80011875abb2aa582b3d6eeba8d1e
#
# 
# 
# add_dir "packages/openmoko2/openmoko-terminal2"
# 
# add_file "packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop"
#  content [81f89f2862881ba3526e1023bcfff8415f985af6]
# 
# add_file "packages/openmoko2/openmoko-terminal2/openmoko-terminal.png"
#  content [e7db9d314755face71a3ad7fd49d186333e1202f]
# 
# add_file "packages/openmoko2/openmoko-terminal2_1.0.0.bb"
#  content [dac523cf78aa60821651434210c00c5eb6511343]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [d268c3cc077fe92e490a25cbde7cac22df2d2334]
#    to [fe7b19222379917a6afddcc3a5c0252f541bd0b7]
# 
#   set "packages/openmoko2/openmoko-terminal2/openmoko-terminal.png"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
--- packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop	81f89f2862881ba3526e1023bcfff8415f985af6
+++ packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop	81f89f2862881ba3526e1023bcfff8415f985af6
@@ -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
============================================================
# packages/openmoko2/openmoko-terminal2/openmoko-terminal.png is binary
============================================================
--- packages/openmoko2/openmoko-terminal2_1.0.0.bb	dac523cf78aa60821651434210c00c5eb6511343
+++ packages/openmoko2/openmoko-terminal2_1.0.0.bb	dac523cf78aa60821651434210c00c5eb6511343
@@ -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/
+}
============================================================
--- packages/tasks/task-openmoko.bb	d268c3cc077fe92e490a25cbde7cac22df2d2334
+++ packages/tasks/task-openmoko.bb	fe7b19222379917a6afddcc3a5c0252f541bd0b7
@@ -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 = "r54"
+PR = "r55"
 
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
@@ -77,13 +77,13 @@ RDEPENDS_task-openmoko-base = "\
 #
 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 \
 "
 
 #