[oe-commits] org.oe.dev merge of 'b15a72d39d751ca408617bf95b875f434f8a6377'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Jul 30 22:11:56 UTC 2007
merge of 'b15a72d39d751ca408617bf95b875f434f8a6377'
and 'e96694990902ffb76becba56bab471a323fab49e'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 8826e783d845aaca4ceeb6d3ef0475b70a4753e1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8826e783d845aaca4ceeb6d3ef0475b70a4753e1
Files:
1
packages/gpephone/gpe-applauncher_0.9.bb
packages/gpephone/machined_svn.bb
packages/gpephone/ptim-manager_svn.bb
packages/images/openmoko-devel-image.bb
packages/images/openmoko-image.bb
packages/openmoko-base/openmoko-theme-standard_svn.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/tasks/task-openmoko.bb
conf/distro/include/openmoko.inc
conf/distro/openmoko.conf
Diffs:
#
# mt diff -rb15a72d39d751ca408617bf95b875f434f8a6377 -r8826e783d845aaca4ceeb6d3ef0475b70a4753e1
#
#
#
# add_file "packages/gpephone/gpe-applauncher_0.9.bb"
# content [fc172f9eabde581dd56130838da9ef7c15723ca3]
#
# patch "packages/gpephone/machined_svn.bb"
# from [c192d49beecd4b546ada28a1e7cd67964213339b]
# to [b1aa2bc7c8b777a29ced8ae606722efa408e1301]
#
# patch "packages/gpephone/ptim-manager_svn.bb"
# from [4c3fe941a6e90ebc9e6e3297be02b3de9df72b1f]
# to [e0ddcec53b318d7b7301948e99d5a260791f538f]
#
# patch "packages/images/openmoko-devel-image.bb"
# from [ecf5172ab77fb14261f7f1fb0d5855bfeb84255e]
# to [bb656d3436f7ee0e279febc18b64f72d1a329c5d]
#
# patch "packages/images/openmoko-image.bb"
# from [91d5d8ee618188f062f3fcf355123fda72b7ec6b]
# to [9ebccfa80e88143c38645f7f13c90a3a90e51288]
#
# patch "packages/openmoko-base/openmoko-theme-standard_svn.bb"
# from [5943ed10b8995d9ed32c666193baa127c9f72b9a]
# to [ff0592bad5222f7d71a955c7e1708a1a5f1d9909]
#
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
# from [63e4490c76e470ecdf213580aa34e8a3c10d1da7]
# to [35b2127baed9a06ff6abae932dbd14077257dbde]
#
# patch "packages/tasks/task-openmoko.bb"
# from [ec3fef5477399d4762dbd4338b3c5f44bafa2f96]
# to [70958e9a532d30c1db1e1fb965132fe55518f45a]
#
============================================================
--- packages/gpephone/gpe-applauncher_0.9.bb fc172f9eabde581dd56130838da9ef7c15723ca3
+++ packages/gpephone/gpe-applauncher_0.9.bb fc172f9eabde581dd56130838da9ef7c15723ca3
@@ -0,0 +1,12 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += '${datadir}/themes'
============================================================
--- packages/gpephone/machined_svn.bb c192d49beecd4b546ada28a1e7cd67964213339b
+++ packages/gpephone/machined_svn.bb b1aa2bc7c8b777a29ced8ae606722efa408e1301
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Device abstraction and support daemon"
SECTION = "gpephone"
PRIORITY = "required"
LICENSE = "GPL"
-DEPENDS = "glib-2.0"
+DEPENDS = "glib-2.0 dbus-glib gtk+"
PV = "0.1+svn-${SRCDATE}"
PR = "r0"
@@ -13,6 +13,3 @@ S = "${WORKDIR}/${PN}"
SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
S = "${WORKDIR}/${PN}"
-
-#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
-
============================================================
--- packages/gpephone/ptim-manager_svn.bb 4c3fe941a6e90ebc9e6e3297be02b3de9df72b1f
+++ packages/gpephone/ptim-manager_svn.bb e0ddcec53b318d7b7301948e99d5a260791f538f
@@ -1,17 +1,16 @@ PV = "0.1+svn-${SRCDATE}"
DESCRIPTION = "Phone input method manager module"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ ptim-headers libiac"
PV = "0.1+svn-${SRCDATE}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
inherit gpephone pkgconfig autotools
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager \
- file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager"
S = "${WORKDIR}/immanager"
============================================================
--- packages/images/openmoko-devel-image.bb ecf5172ab77fb14261f7f1fb0d5855bfeb84255e
+++ packages/images/openmoko-devel-image.bb bb656d3436f7ee0e279febc18b64f72d1a329c5d
@@ -1,7 +1,5 @@ export PACKAGE_INSTALL += "\
require openmoko-image.bb
export PACKAGE_INSTALL += "\
- task-openmoko-demo \
task-openmoko-debug \
- task-openmoko-examples \
"
============================================================
--- packages/images/openmoko-image.bb 91d5d8ee618188f062f3fcf355123fda72b7ec6b
+++ packages/images/openmoko-image.bb 9ebccfa80e88143c38645f7f13c90a3a90e51288
@@ -14,7 +14,6 @@ export PACKAGE_INSTALL = "\
task-openmoko-phone \
task-openmoko-finger \
task-openmoko-pim \
- task-openmoko-demo \
"
DEPENDS = "\
============================================================
--- packages/openmoko-base/openmoko-theme-standard_svn.bb 5943ed10b8995d9ed32c666193baa127c9f72b9a
+++ packages/openmoko-base/openmoko-theme-standard_svn.bb ff0592bad5222f7d71a955c7e1708a1a5f1d9909
@@ -1,7 +1,7 @@ PV = "0.0+svn${SRCDATE}"
DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
SECTION = "openmoko/base"
PV = "0.0+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
inherit openmoko-base
@@ -21,5 +21,7 @@ do_install() {
echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
}
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
PACKAGE_ARCH = "all"
FILES_${PN} = "${datadir} ${sysconfdir}"
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb 63e4490c76e470ecdf213580aa34e8a3c10d1da7
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb 35b2127baed9a06ff6abae932dbd14077257dbde
@@ -6,7 +6,7 @@ inherit openmoko2
inherit openmoko2
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2008/artwork/themes;module=openmoko-standard-2;proto=http"
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
S = "${WORKDIR}/openmoko-standard-2"
do_install() {
@@ -19,5 +19,7 @@ do_install() {
echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
}
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
PACKAGE_ARCH = "all"
FILES_${PN} = "${datadir} ${sysconfdir}"
============================================================
--- packages/tasks/task-openmoko.bb ec3fef5477399d4762dbd4338b3c5f44bafa2f96
+++ packages/tasks/task-openmoko.bb 70958e9a532d30c1db1e1fb965132fe55518f45a
@@ -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 = "r49"
+PR = "r50"
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "all"
@@ -65,9 +65,8 @@ RDEPENDS_task-openmoko-ui = "\
xset \
xrandr \
settings-daemon \
- openmoko-common \
- openmoko-session \
- openmoko-theme-standard \
+ openmoko-session2 \
+ openmoko-theme-standard2 \
openmoko-icon-theme-standard \
openmoko-sound-system \
openmoko-sound-theme-standard \
@@ -83,10 +82,10 @@ RDEPENDS_task-openmoko-base = "\
matchbox-panel-2 \
matchbox-panel-2-applets \
matchbox-applet-inputmanager \
- openmoko-appmanager \
+# openmoko-appmanager \
+ matchbox-keyboard \
+ matchbox-stroke \
openmoko-keyboard \
- openmoko-footer \
- openmoko-taskmanager \
openmoko-panel-mainmenu \
openmoko-panel-battery \
openmoko-panel-bt \
@@ -102,7 +101,7 @@ RDEPENDS_task-openmoko-phone = "\
RDEPENDS_task-openmoko-phone = "\
gsmd \
libgsmd-tools \
- openmoko-dialer \
+ openmoko-dialer2 \
openmoko-panel-gsm \
# ppp \
"
@@ -112,7 +111,7 @@ RDEPENDS_task-openmoko-finger = "\
#
DESCRIPTION_task-openmoko-finger = "OpenMoko: Finger UI Applications"
RDEPENDS_task-openmoko-finger = "\
- openmoko-calculator \
+# openmoko-calculator \
"
#
@@ -121,12 +120,10 @@ RDEPENDS_task-openmoko-pim = "\
DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications"
RDEPENDS_task-openmoko-pim = "\
eds-dbus \
- openmoko-contacts \
- openmoko-dates \
- openmoko-tasks \
- openmoko-today \
- openmoko-messages \
- openmoko-rssreader \
+ openmoko-contacts2 \
+ openmoko-today2 \
+# openmoko-messages \
+# openmoko-rssreader \
"
#
@@ -139,32 +136,6 @@ RDEPENDS_task-openmoko-net = "\
"
#
-# task-openmoko-demo
-#
-DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications"
-RDEPENDS_task-openmoko-demo = "\
- matchbox-desktop-2 \
- matchbox-keyboard \
- matchbox-stroke \
- matchbox-config-gtk \
- xcursor-transparent-theme \
- web \
- mtpaint \
-"
-
-#
-# task-openmoko-examples
-#
-DESCRIPTION_task-openmoko-examples = "OpenMoko: Example Applications"
-RDEPENDS_task-openmoko-examples = "\
- openmoko-stylus-demo-simple \
- openmoko-stylus-demo \
- openmoko-finger-demo \
- openmoko-panel-demo-simple \
- openmoko-panel-demo \
- openmoko-chordmaster"
-
-#
# task-openmoko-debug
#
DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools"
#
# mt diff -re96694990902ffb76becba56bab471a323fab49e -r8826e783d845aaca4ceeb6d3ef0475b70a4753e1
#
#
#
# patch "conf/distro/include/openmoko.inc"
# from [caacdb749b409053268f23e4ddaae432bd769d59]
# to [27a5d36dc0bcfacb3e5fde995bce62a5bfa53dfb]
#
# patch "conf/distro/openmoko.conf"
# from [fb009383a61be983899d01b4c7a8a16126bf43f9]
# to [9ee470ae2ab5b0da70f07995572874c2e4de6c1e]
#
============================================================
--- conf/distro/include/openmoko.inc caacdb749b409053268f23e4ddaae432bd769d59
+++ conf/distro/include/openmoko.inc 27a5d36dc0bcfacb3e5fde995bce62a5bfa53dfb
@@ -1,7 +1,7 @@
#
# Header
#
-DISTRO_NAME = "OpenMoKo"
+DISTRO_NAME = "OpenMoko"
#
# Naming schemes
============================================================
--- conf/distro/openmoko.conf fb009383a61be983899d01b4c7a8a16126bf43f9
+++ conf/distro/openmoko.conf 9ee470ae2ab5b0da70f07995572874c2e4de6c1e
@@ -9,7 +9,7 @@ require conf/distro/angstrom-2007.1.conf
#
# Header
#
-DISTRO_NAME = "OpenMoKo"
+DISTRO_NAME = "OpenMoko"
DISTRO_VERSION = ".dev-snapshot-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
More information about the Openembedded-commits
mailing list