summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/openmoko2/openmoko-terminal2_svn.bb9
-rw-r--r--packages/tasks/task-openmoko-base.bb4
-rw-r--r--packages/vala-terminal/vala-terminal_git.bb7
3 files changed, 6 insertions, 14 deletions
diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb
deleted file mode 100644
index 48adca8e96..0000000000
--- a/packages/openmoko2/openmoko-terminal2_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "The Openmoko Command Line Terminal"
-SECTION = "openmoko/applications"
-DEPENDS = "vala-native vte libmokoui2"
-RDEPENDS = "ttf-liberation-mono"
-PV = "3.0.0+svnr${SRCREV}"
-PR = "r2"
-PKG_TAGS_${PN} = "group::programming alias::Om_Terminal2"
-
-inherit openmoko2
diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
index 34739285ec..b7b7b58ee4 100644
--- a/packages/tasks/task-openmoko-base.bb
+++ b/packages/tasks/task-openmoko-base.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Openmoko: Base Task for the Openmoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r73"
+PR = "r74"
inherit task
@@ -17,7 +17,7 @@ RDEPENDS_task-openmoko-base = "\
# matchbox-keyboard-applet \
matchbox-stroke \
multitap-pad \
- openmoko-terminal2 \
+ vala-terminal \
# openmoko-keyboard \
openmoko-panel-battery \
openmoko-panel-clock \
diff --git a/packages/vala-terminal/vala-terminal_git.bb b/packages/vala-terminal/vala-terminal_git.bb
index 8a5d3acfad..00b92de07d 100644
--- a/packages/vala-terminal/vala-terminal_git.bb
+++ b/packages/vala-terminal/vala-terminal_git.bb
@@ -1,13 +1,14 @@
DESCRIPTION = "A lightweight Terminal Emulator based on libvte, written in Vala."
SECTION = "x11/applications"
DEPENDS = "vala-native vte"
-RDEPENDS = "ttf-liberation-mono"
PV = "1.0.0.0+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
inherit autotools
SRC_URI = "${FREESMARTPHONE_GIT}/vala-terminal.git;protocol=git;branch=master"
S = "${WORKDIR}/git"
-
+RDEPENDS = "ttf-liberation-mono"
+RREPLACES = "openmoko-terminal2"
+RPROVIDES = "openmoko-terminal2"