5 files changed, 7 insertions, 56 deletions
diff --git a/packages/openmoko2/openmoko-terminal2/.mtn2git_empty b/packages/openmoko2/openmoko-terminal2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openmoko2/openmoko-terminal2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop
deleted file mode 100644
index 2777736039..0000000000
--- a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100644
index 3b383c10e6..0000000000
--- a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png
+++ /dev/null
diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
deleted file mode 100644
index afb0592050..0000000000
--- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "The OpenMoko Command Line Console"
-SECTION = "openmoko/applications"
-RDEPENDS += "mrxvt"
-RCONFLICTS = "openmoko-terminal"
-RREPLACES = "openmoko-terminal"
-PR = "r5"
-
-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/
-}
-
-pkg_postinst_${PN}() {
-        if [ "x$D" != "x" ]; then
-                exit 1
-        fi
-		echo "adding font defaults to system-wide mrxvtrc..."
-		cat <<EOF >> ${sysconfdir}/mrxvt/mrxvtrc
-#
-# ---------------------------------- FONTS ----------------------------------- #
-#
-Mrxvt.xft:                      1
-Mrxvt.xftFont:                  Bitstream Vera Sans Mono
-Mrxvt.xftSize:                  5
-Mrxvt.xftAntialias:             1
-
-# Don't load a multi-char font. This will reduce the line space if your multi
-# char font has different dimensions than the regular font. You might need to
-# comment it out if you want to use XIM and non-english fonts.
-Mrxvt.xftNomFont:               1
-
-# Font to use for tab bar / menus. This need not be mono-spaced ;).
-Mrxvt.xftPFont:                 Bitstream Vera Sans
-Mrxvt.xftPSize:                 6
-EOF
-
-}
diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb
new file mode 100644
index 0000000000..dc9acfec14
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "The OpenMoko Command Line Console"
+SECTION = "openmoko/applications"
+DEPENDS = "libmokoui2 vte"
+PV = "2.1.0+${SVNREV}"
+PR = "r0"
+
+inherit openmoko2