diff options
-rw-r--r-- | conf/distro/include/sane-srcdates.inc | 3 | ||||
-rw-r--r-- | packages/mrxvt/mrxvt_0.5.2.bb | 4 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-terminal2/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop | 12 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-terminal2/openmoko-terminal.png | bin | 0 -> 11078 bytes | |||
-rw-r--r-- | packages/openmoko2/openmoko-terminal2_1.0.0.bb | 16 | ||||
-rw-r--r-- | packages/tasks/task-openmoko.bb | 6 |
7 files changed, 35 insertions, 6 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 18d5c07495..a1c0246aff 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -95,7 +95,7 @@ SRCDATE_entice ?= "20070601" SRCDATE_e-utils ?= "20070601" SRCDATE_enna ?= "20070721" -# Misc apps, sorted by alphabet +# Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" SRCDATE_bl ?= "20060814" SRCDATE_dvbstream ?= "20060814" @@ -129,6 +129,7 @@ SRCDATE_roadster ?= "20060814" SRCDATE_sctzap ?= "20060814" SRCDATE_tslib ?= "20051101" SRCDATE_waimea ?= "20060814" +SRCDATE_webkit ?= "20070801" SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" diff --git a/packages/mrxvt/mrxvt_0.5.2.bb b/packages/mrxvt/mrxvt_0.5.2.bb index 4a5b71f0c9..9b1b4a4c24 100644 --- a/packages/mrxvt/mrxvt_0.5.2.bb +++ b/packages/mrxvt/mrxvt_0.5.2.bb @@ -3,11 +3,11 @@ HOMEPAGE = "http://materm.sourceforge.net" AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>" LICENSE = "GPL" SECTION = "x11/applications" -RDEPENDS = "freetype fontconfig libxft" DEPENDS = "freetype fontconfig libxft virtual/libx11" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ + ${SOURCEFORGE_MIRROR}/materm/no_debug_x.patch;pnum=0;patch=1 \ file://fix-compile.patch;patch=1" inherit autotools 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 Binary files differnew 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 \ " # |