diff options
Diffstat (limited to 'packages/openmoko2')
35 files changed, 175 insertions, 54 deletions
diff --git a/packages/openmoko2/libjana/.mtn2git_empty b/packages/openmoko2/libjana/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko2/libjana/.mtn2git_empty diff --git a/packages/openmoko2/libjana/clockpatch.patch b/packages/openmoko2/libjana/clockpatch.patch new file mode 100644 index 0000000000..7b20222239 --- /dev/null +++ b/packages/openmoko2/libjana/clockpatch.patch @@ -0,0 +1,31 @@ +Index: jana/libjana-gtk/jana-gtk-clock.c +=================================================================== +--- jana.orig/libjana-gtk/jana-gtk-clock.c ++++ jana/libjana-gtk/jana-gtk-clock.c +@@ -695,7 +695,7 @@ draw_digital_clock (JanaGtkClock *clock, + cairo_fill (cr); + + /* Draw dark outline frame */ +- thickness = width/20; ++ thickness = width/40; + cairo_new_path (cr); + cairo_rectangle (cr, thickness/2, thickness/2, + width - thickness, height - thickness); +@@ -703,7 +703,7 @@ draw_digital_clock (JanaGtkClock *clock, + cairo_set_source_rgb (cr, base_color[0]/2, + base_color[1]/2, base_color[2]/2); + cairo_stroke (cr); +- ++#if 0 + /* Draw main outline frame */ + cairo_new_path (cr); + cairo_rectangle (cr, thickness, thickness, +@@ -728,7 +728,7 @@ draw_digital_clock (JanaGtkClock *clock, + base_color[1]/1.5, base_color[2]/1.5); + cairo_set_line_width (cr, thickness/2); + cairo_stroke (cr); +- ++#endif + cairo_identity_matrix (cr); + } + diff --git a/packages/openmoko2/libjana_svn.bb b/packages/openmoko2/libjana_svn.bb new file mode 100644 index 0000000000..065f380969 --- /dev/null +++ b/packages/openmoko2/libjana_svn.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "O-Hand Jana Library" +DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf" +PV = "0.1.0+svnr${SRCREV}" +PR = "r4" + +inherit autotools pkgconfig lib_package + +SRC_URI = "svn://svn.o-hand.com/repos/jana/;module=trunk;proto=http" +S = "${WORKDIR}/trunk/" + +do_configure_prepend() { + touch gtk-doc.make +} + +do_stage() { + autotools_stage_all +} + +PACKAGES =+ "libjana-ecal libjana-ecal-dbg \ + libjana-gtk libjana-gtk-dbg \ + " + +LEAD_SONAME = "libjana.so" + +FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*" +FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*" +FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf" +FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*" diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb index 2551519348..8e547b3663 100644 --- a/packages/openmoko2/libmokogsmd2_svn.bb +++ b/packages/openmoko2/libmokogsmd2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "libgsmd glib-2.0" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb index 09e249ff4f..354b8e3f26 100644 --- a/packages/openmoko2/libmokojournal2_svn.bb +++ b/packages/openmoko2/libmokojournal2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "eds-dbus" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r2" inherit openmoko2 lib_package diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb index 03159cc864..0813111821 100644 --- a/packages/openmoko2/libmokopanelui2_svn.bb +++ b/packages/openmoko2/libmokopanelui2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "gtk+ matchbox-panel-2" -PV = "0.3.0+svn${SVNREV}" +PV = "0.3.0+svnr${SRCREV}" PR = "r0" inherit openmoko2 diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb index 50c3928670..3785074a82 100644 --- a/packages/openmoko2/libmokoui2_svn.bb +++ b/packages/openmoko2/libmokoui2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "gtk+" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r2" inherit openmoko2 diff --git a/packages/openmoko2/moko-gtk-engine_svn.bb b/packages/openmoko2/moko-gtk-engine_svn.bb index 38bc691c8e..060bceaf8c 100644 --- a/packages/openmoko2/moko-gtk-engine_svn.bb +++ b/packages/openmoko2/moko-gtk-engine_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Moko GTK+ theme engine" SECTION = "openmoko/libs" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r0" inherit openmoko2 diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb index f68d2e4919..7e662de73a 100644 --- a/packages/openmoko2/neod_svn.bb +++ b/packages/openmoko2/neod_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management" SECTION = "openmoko/daemons" DEPENDS = "gtk+ pulseaudio" RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r4" inherit openmoko2 gconf diff --git a/packages/openmoko2/openmoko-appearance_svn.bb b/packages/openmoko2/openmoko-appearance_svn.bb new file mode 100644 index 0000000000..1e8fe2e0bd --- /dev/null +++ b/packages/openmoko2/openmoko-appearance_svn.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The OpenMoko Appearance Editor" +SECTION = "openmoko/pim" +DEPENDS = "libmokoui2 gconf gtk+" +RDEPENDS = "libedata-cal openmoko-today2-folders" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 gtk-icon-cache diff --git a/packages/openmoko2/openmoko-appmanager2_svn.bb b/packages/openmoko2/openmoko-appmanager2_svn.bb index 24b21c668b..3929f7e964 100644 --- a/packages/openmoko2/openmoko-appmanager2_svn.bb +++ b/packages/openmoko2/openmoko-appmanager2_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "The OpenMoko Application Manager" SECTION = "openmoko/applications" DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm ipkg" -PV = "0.1.0+svn${SVNREV}" -PR = "r0" +PV = "0.1.0+svnr${SRCREV}" +PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb index edfeca7702..431e40769c 100644 --- a/packages/openmoko2/openmoko-browser2_svn.bb +++ b/packages/openmoko2/openmoko-browser2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Webbrowser" SECTION = "openmoko/apps" DEPENDS += "intltool libmokoui2 check webkit-gtk" -PV = "0.0.1+svn${SVNREV}" -PR = "r0" +PV = "0.0.1+svnr${SRCREV}" +PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb index 8bb80c602b..8e0c9ad6da 100644 --- a/packages/openmoko2/openmoko-calculator2_svn.bb +++ b/packages/openmoko2/openmoko-calculator2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A Calculator for OpenMoko" SECTION = "openmoko/tools" DEPENDS = "libmokoui2" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r0" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb index 018f9a8e74..b0aed4c0e0 100644 --- a/packages/openmoko2/openmoko-common2_svn.bb +++ b/packages/openmoko2/openmoko-common2_svn.bb @@ -1,7 +1,7 @@ -DESCRIPTION = "Common files for the OpenMoko distribution" +DESCRIPTION = "Common files for the OpenMoko framework" SECTION = "openmoko/base" -PV = "0.0+svnr${SRCREV}" -PR = "r5" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" inherit openmoko2 @@ -13,7 +13,13 @@ ALLOW_EMPTY = "1" dirs = "pixmaps" do_install() { - : + find . -name .svn | xargs rm -rf + install -d ${D}${datadir} + for i in ${dirs}; do + cp -fR $i ${D}${datadir}/$i; + done + # moved to xserver-kdrive-common + rm -f ${D}${datadir}/pixmaps/xsplash* } PACKAGE_ARCH = "all" diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb index c63738a912..a6202e5284 100644 --- a/packages/openmoko2/openmoko-contacts2_svn.bb +++ b/packages/openmoko2/openmoko-contacts2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The OpenMoko Address Book" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 dbus-glib" RDEPENDS = "libedata-book" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r4" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb index 14a71d423a..f9c04f8f92 100644 --- a/packages/openmoko2/openmoko-dates2_svn.bb +++ b/packages/openmoko2/openmoko-dates2_svn.bb @@ -1,13 +1,14 @@ DESCRIPTION = "The OpenMoko Calendar" SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus" +DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana" RDEPENDS = "libedata-cal" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" +PR = "r2" -inherit openmoko2 +inherit openmoko2 pkgconfig -SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http" -S = "${WORKDIR}/jana/" +SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=openmoko2;proto=http" +S = "${WORKDIR}/openmoko2/" EXTRA_OECONF = "--with-frontend=openmoko" @@ -15,3 +16,4 @@ do_configure_prepend() { touch gtk-doc.make } + diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index b7a728521b..b01d9d3c05 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r5" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb index 97d598b7cc..c9a36312cf 100644 --- a/packages/openmoko2/openmoko-feedreader2_svn.bb +++ b/packages/openmoko2/openmoko-feedreader2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Feed Reader" SECTION = "openmoko/apps" DEPENDS += "libmokoui2 libmrss check webkit-gtk" -PV = "0.0.1+svn${SVNREV}" -PR = "r0" +PV = "0.0.1+svnr${SRCREV}" +PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-firststart2_svn.bb b/packages/openmoko2/openmoko-firststart2_svn.bb index 5b24d17d5e..2796a60df2 100644 --- a/packages/openmoko2/openmoko-firststart2_svn.bb +++ b/packages/openmoko2/openmoko-firststart2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko First Start Wizard" SECTION = "openmoko/apps" DEPENDS += "libmokoui2 libglade" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r0" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb index 723042da94..a02e05c1d2 100644 --- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb +++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb @@ -1,7 +1,8 @@ -DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution, QVGA edition" +DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko framework, QVGA edition" SECTION = "openmoko/base" -PV = "0.1.0+svn${SVNREV}" -PR = "r0" +DEPENDS = "imagemagick-native librsvg-native" +PV = "0.1.0+svnr${SRCREV}" +PR = "r2" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb index e443e36075..ddc87abced 100644 --- a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb +++ b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb @@ -1,7 +1,7 @@ -DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" +DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko framework" SECTION = "openmoko/base" -PV = "0.1.0+svn${SVNREV}" -PR = "r0" +PV = "0.1.0+svnr${SRCREV}" +PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb index 42a71b1472..4406c410dd 100644 --- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb +++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb @@ -1,10 +1,25 @@ DESCRIPTION = "A media player for OpenMoko" SECTION = "openmoko/tools" DEPENDS = "libmokoui2 expat gstreamer libspiff curl" -RDEPENDS = "gst-meta-audio" -PV = "0.1.0+svn${SVNREV}" -PR = "r2" +RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2" +PV = "0.1.0+svnr${SRCREV}" +PR = "r4" inherit openmoko2 FILES_${PN} += "${datadir}/openmoko-mediaplayer" + +do_install_append() { + install -d ${D}${sysconfdir}/gconf/schemas + install -m 0644 ${S}/openmoko-mediaplayer.schemas ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas +} + +pkg_postinst_openmoko-mediaplayer2 () { +#!/bin/sh -e +if [ "x$D" != "x" ]; then + exit 1 +fi + +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null +} diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 65cb7f1ca6..b71d35528d 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,13 +4,13 @@ SECTION = "x11" RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS = "openmoko-session" -PR = "r34" +PR = "r37" SRC_URI = "file://etc" S = ${WORKDIR} do_install() { - install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir} cp -R ${S}/etc/* ${D}${sysconfdir} rm -fR ${D}${sysconfdir}/.svn rm -fR ${D}${sysconfdir}/matchbox/.svn @@ -26,9 +26,11 @@ fi gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme openmoko-standard-2 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5" +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2 - +# gstreamer audio settings gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 558f55ee87..2f27a4cc6a 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -7,6 +7,6 @@ openmoko-dialer & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & matchbox-panel-2 --start-applets systray,startup \ - --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar & + --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,keyboard --titlebar & exec neod diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb index 1cfb519c99..f200b58cb2 100644 --- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb +++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb @@ -1,9 +1,9 @@ -DESCRIPTION = "Standard sound theme for the OpenMoko distribution" +DESCRIPTION = "Standard sound theme for the OpenMoko framework" SECTION = "openmoko/base" RREPLACES = "openmoko-sound-theme-standard" RPROVIDES = "openmoko-sound-theme-standard" PV = "0.1+svnr${SRCREV}" -PR = "r2" +PR = "r3" inherit openmoko2 autotools diff --git a/packages/openmoko2/openmoko-tasks2/.mtn2git_empty b/packages/openmoko2/openmoko-tasks2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko2/openmoko-tasks2/.mtn2git_empty diff --git a/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop b/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop new file mode 100644 index 0000000000..f9e813a734 --- /dev/null +++ b/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Tasks +Comment=What you need to do +Exec=tasks +Icon=openmoko-tasks +Terminal=false +Type=Application +Categories=GTK;Application;PIM;Office +MimeType=text/x-vcard; +SingleInstance=true +StartupNotify=true diff --git a/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png b/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png Binary files differnew file mode 100644 index 0000000000..f28d1ade99 --- /dev/null +++ b/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png diff --git a/packages/openmoko2/openmoko-tasks2_svn.bb b/packages/openmoko2/openmoko-tasks2_svn.bb index 866a1896e0..48ec113884 100644 --- a/packages/openmoko2/openmoko-tasks2_svn.bb +++ b/packages/openmoko2/openmoko-tasks2_svn.bb @@ -2,12 +2,22 @@ DESCRIPTION = "The OpenMoko Agenda" SECTION = "openmoko/pim" DEPENDS = "dbus-glib eds-dbus libmokoui2" RDEPENDS = "libedata-cal" -PV = "0.1.0+svn${SVNREV}" -PR = "r0" +PV = "0.1.0+svnr${SRCREV}" +PR = "r1" inherit openmoko2 -SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http" +SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http \ + file://openmoko-tasks.desktop \ + file://openmoko-tasks.png" S = "${WORKDIR}/trunk" EXTRA_OECONF = "--enable-omoko --disable-gtk" + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/openmoko-tasks.desktop ${D}${datadir}/applications/tasks.desktop + install -d ${D}${datadir}/pixmaps + install -m 0644 ${WORKDIR}/openmoko-tasks.png ${D}${datadir}/pixmaps +} + diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb index f90e99e9f1..7f6c9ebbba 100644 --- a/packages/openmoko2/openmoko-terminal2_svn.bb +++ b/packages/openmoko2/openmoko-terminal2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" DEPENDS = "vte libmokoui2" RDEPENDS = "ttf-liberation-mono" -PV = "2.1.0+${SVNREV}" +PV = "2.1.1+svnr${SRCREV}" PR = "r2" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb index 6ac1c3fca4..ec0af53763 100644 --- a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb +++ b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb @@ -1,9 +1,9 @@ -DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, QVGA edition" +DESCRIPTION = "Standard Gtk+ theme for the OpenMoko framework, QVGA edition" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" RPROVIDES = "openmoko-theme-standard-2" -PV = "0.1.0+${SVNREV}" -PR = "r0" +PV = "0.1.1+svnr${SRCREV}" +PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb index ec3b4f702e..a7812455cd 100644 --- a/packages/openmoko2/openmoko-theme-standard2_svn.bb +++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb @@ -1,8 +1,8 @@ -DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" +DESCRIPTION = "Standard Gtk+ theme for the OpenMoko framework" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" -PV = "0.1.0+${SVNREV}" -PR = "r4" +PV = "0.1.1+svnr${SRCREV}" +PR = "r5" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-today2-folders_svn.bb b/packages/openmoko2/openmoko-today2-folders_svn.bb index 7a7c90c091..ecd28d1b68 100644 --- a/packages/openmoko2/openmoko-today2-folders_svn.bb +++ b/packages/openmoko2/openmoko-today2-folders_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Today2 vfolder files" SECTION = "openmoko/misc" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCREV}" PR = "r1" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb index bfc5fc201d..998d22e308 100644 --- a/packages/openmoko2/openmoko-today2_svn.bb +++ b/packages/openmoko2/openmoko-today2_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "The OpenMoko Application Launcher" SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm" +DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm" RDEPENDS = "libedata-cal openmoko-today2-folders" -PV = "0.1.0+svn${SVNREV}" -PR = "r1" +PV = "0.1.0+svnr${SRCREV}" +PR = "r2" inherit openmoko2 gtk-icon-cache diff --git a/packages/openmoko2/openmoko-worldclock2_svn.bb b/packages/openmoko2/openmoko-worldclock2_svn.bb new file mode 100644 index 0000000000..bb849accfb --- /dev/null +++ b/packages/openmoko2/openmoko-worldclock2_svn.bb @@ -0,0 +1,6 @@ +DESCRIPTION = "A World-Clock for OpenMoko" +SECTION = "openmoko/tools" +DEPENDS = "libmokoui2 openmoko-dates2 libnotify" +PV = "0.1.0+svnr${SRCREV}" + +inherit openmoko2 |
