[oe-commits] org.oe.dev merge of '2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7'

mickeyl commit openembedded-commits at lists.openembedded.org
Tue Jul 31 23:56:52 UTC 2007


merge of '2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7'
     and '62b5fc0f9207b54a854b0ea813248e4ab12bdb81'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9c859a543fc786163facf04e76c3bee8ee994486
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9c859a543fc786163facf04e76c3bee8ee994486
Files:
1
packages/gtkhtml2/gtkhtml2_cvs.bb
packages/gtkhtml2/gtkhtml2_svn.bb
packages/gaim/pidgin_2.1.0.bb
classes/base.bbclass
conf/bitbake.conf
conf/distro/openmoko.conf
packages/e17/edje-editor_cvs.bb
packages/e17/edje-viewer_cvs.bb
packages/starling/starling_0.2.bb
packages/starling/starling_svn.bb
packages/uboot/u-boot-mkimage-gta01-native_oe.bb
packages/libowl
packages/libowl/libowl_svn.bb
packages/openmoko2/openmoko-calculator2_svn.bb
packages/puzzles/oh-puzzles_svn.bb
classes/openmoko2.bbclass
packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
packages/openmoko2/libmokogsmd2_svn.bb
packages/openmoko2/libmokojournal2_svn.bb
packages/openmoko2/libmokopanelui2_svn.bb
packages/openmoko2/libmokoui2_svn.bb
packages/openmoko2/openmoko-contacts2_svn.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/openmoko2/openmoko-feedreader2_svn.bb
packages/openmoko2/openmoko-icon-theme-standard_svn.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/openmoko2/openmoko-today2_svn.bb
packages/tasks/task-openmoko.bb
packages/webkit/webkit_svn.bb
Diffs:

#
# mt diff -r2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7 -r9c859a543fc786163facf04e76c3bee8ee994486
#
# 
# 
# rename "packages/gtkhtml2/gtkhtml2_cvs.bb"
#     to "packages/gtkhtml2/gtkhtml2_svn.bb"
# 
# add_file "packages/gaim/pidgin_2.1.0.bb"
#  content [f38dd9af51ab37706164482bcece1477daca655a]
# 
# patch "classes/base.bbclass"
#  from [8ae82b899b740b9da403e698610bf6ca49f8e64c]
#    to [26453f8831d23d5ae6400f403116c9272347807d]
# 
# patch "conf/bitbake.conf"
#  from [ee130e54dc68eb5516e965696fbced464a542166]
#    to [d7da259bfd8ea8f8052f4258ba7b9c6e58a864ef]
# 
# patch "conf/distro/openmoko.conf"
#  from [3301ae1374b3e083a581693e45861ad90a73ea39]
#    to [5be15b63c7d76afbff22878ff4c51b995922ff5f]
# 
# patch "packages/e17/edje-editor_cvs.bb"
#  from [740c05ae1ecafcda56ba3f18f5b2fe0dac6332be]
#    to [cfa6ec43d5f9faae882abbe2efa486f7fa6523f3]
# 
# patch "packages/e17/edje-viewer_cvs.bb"
#  from [2a7237f77298295dcb9a891068279c010aea803f]
#    to [a789e404a347e1eedc48636e834ce762cb837e4a]
# 
# patch "packages/starling/starling_0.2.bb"
#  from [1289158f34b79de9d3820f8c6022a7107c0cb99a]
#    to [9d0522f1342ae339228f0a79a466835a9483cb9c]
# 
# patch "packages/starling/starling_svn.bb"
#  from [6486e2268453d17257250749dc505d0f9325d01e]
#    to [41c225219a46f25d88d800d602cfc111847d3a8b]
# 
# patch "packages/uboot/u-boot-mkimage-gta01-native_oe.bb"
#  from [148eadcd4b31c1fc73879e61409c8db14331aaeb]
#    to [d2ac07afa8091ccc0ab72e917cab17dad786d31e]
# 
============================================================
--- packages/gaim/pidgin_2.1.0.bb	f38dd9af51ab37706164482bcece1477daca655a
+++ packages/gaim/pidgin_2.1.0.bb	f38dd9af51ab37706164482bcece1477daca655a
@@ -0,0 +1,9 @@
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+           file://sanitize-configure.ac.patch;patch=1 \
+           file://gconf-no-errors.patch;patch=1 \
+	   file://pidgin.desktop-set-icon.patch;patch=1 \
+	  " 
+
+PR = "r0"
============================================================
--- classes/base.bbclass	8ae82b899b740b9da403e698610bf6ca49f8e64c
+++ classes/base.bbclass	26453f8831d23d5ae6400f403116c9272347807d
@@ -892,6 +892,13 @@ python () {
     base_after_parse(d)
 }
 
+# Remove me when we switch to bitbake 1.8.8
+def base_get_srcrev(d):
+    import bb
+    
+    if bb.fetch.get_srcrev:
+        return bb.fetch.get_srcrev(d)
+    return "NOT IMPLEMENTED"
 
 # Patch handling
 inherit patch
============================================================
--- conf/bitbake.conf	ee130e54dc68eb5516e965696fbced464a542166
+++ conf/bitbake.conf	d7da259bfd8ea8f8052f4258ba7b9c6e58a864ef
@@ -365,7 +365,7 @@ SRCDATE = "${DATE}"
 UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
 SRCDATE = "${DATE}"
-SRCREV = "${@bb.fetch.get_srcrev(d)}"
+SRCREV = "${@base_get_srcrev(d)}"
 
 SRC_URI = "file://${FILE}"
 
============================================================
--- conf/distro/openmoko.conf	3301ae1374b3e083a581693e45861ad90a73ea39
+++ conf/distro/openmoko.conf	5be15b63c7d76afbff22878ff4c51b995922ff5f
@@ -15,3 +15,12 @@ DISTRO_TYPE = "debug"
 DISTRO_VERSION = ".dev-snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
+
+CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
+
+PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/"
+
+FEED_URIS = "\
+  all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \
+  armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \
+  fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01"
============================================================
--- packages/e17/edje-editor_cvs.bb	740c05ae1ecafcda56ba3f18f5b2fe0dac6332be
+++ packages/e17/edje-editor_cvs.bb	cfa6ec43d5f9faae882abbe2efa486f7fa6523f3
@@ -1,7 +1,7 @@ DEPENDS = "etk"
 DESCRIPTION = "Edje-Editor is just that."
 LICENSE = "MIT"
 DEPENDS = "etk"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
============================================================
--- packages/e17/edje-viewer_cvs.bb	2a7237f77298295dcb9a891068279c010aea803f
+++ packages/e17/edje-viewer_cvs.bb	a789e404a347e1eedc48636e834ce762cb837e4a
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Edje_Viewer is just that."
 DEPENDS = "etk"
 LICENSE = "MIT"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
============================================================
--- packages/starling/starling_0.2.bb	1289158f34b79de9d3820f8c6022a7107c0cb99a
+++ packages/starling/starling_0.2.bb	9d0522f1342ae339228f0a79a466835a9483cb9c
@@ -1,9 +1,10 @@ DEPENDS = "gtk+ libgpewidget gstreamer g
 DESCRIPTION = "Starling audio player for GPE"
 SECTION = "gpe/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
-RDEPENDS = "pulseaudio-bin \
+
+RDEPENDS = "esd \
         gst-plugin-audioconvert \
         gst-plugin-esd \
         gst-plugin-typefindfunctions \
============================================================
--- packages/starling/starling_svn.bb	6486e2268453d17257250749dc505d0f9325d01e
+++ packages/starling/starling_svn.bb	41c225219a46f25d88d800d602cfc111847d3a8b
@@ -14,9 +14,8 @@ RRECOMMENDS = "gst-plugin-mad \
         gst-plugin-ivorbis \
         gst-plugin-tcp"
 
-PV = "0.1+svn${SRCDATE}"
+PV = "0.2+svn${SRCDATE}"
 
-
 inherit gpe autotools
 
 SRC_URI = "${GPE_EXTRA_SVN}"
============================================================
--- packages/uboot/u-boot-mkimage-gta01-native_oe.bb	148eadcd4b31c1fc73879e61409c8db14331aaeb
+++ packages/uboot/u-boot-mkimage-gta01-native_oe.bb	d2ac07afa8091ccc0ab72e917cab17dad786d31e
@@ -5,7 +5,6 @@ file://ext2load_hex.patch;patch=1 \
 SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
 file://uboot-machtypes.patch;patch=1 \
 file://ext2load_hex.patch;patch=1 \
-file://uboot-mokoversion.patch;patch=1 \
 file://uboot-s3c2410-warnings-fix.patch;patch=1 \
 file://uboot-strtoul.patch;patch=1 \
 file://uboot-cramfs_but_no_jffs2.patch;patch=1 \


#
# mt diff -r62b5fc0f9207b54a854b0ea813248e4ab12bdb81 -r9c859a543fc786163facf04e76c3bee8ee994486
#
# 
# 
# add_dir "packages/libowl"
# 
# add_file "packages/libowl/libowl_svn.bb"
#  content [3130df44fd115dea07f7f96a3b64bc622176da7f]
# 
# add_file "packages/openmoko2/openmoko-calculator2_svn.bb"
#  content [64eba89e85f82eb9dfff97ba06635e4346bedd50]
# 
# add_file "packages/puzzles/oh-puzzles_svn.bb"
#  content [49224067698adffd6aaa85ac7ba650a497ef66bc]
# 
# patch "classes/openmoko2.bbclass"
#  from [80c28ba30fcb1a7997d64595641141f1a49e3c68]
#    to [465a2fdbdaa8a9f2d258d0f3db274cf06b6ae722]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb"
#  from [9e3bcc0a584850f07d72044109a2899acd5f3b67]
#    to [aea7b4780c1ef56b1525907e84e9cdc7800a372a]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb"
#  from [90ba0eb3822a476f4a0af3ddf3a3f27daefbe6e3]
#    to [26148603ad12255f81061a7c63029fbc575538db]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb"
#  from [a3f3992317c4b916878d25e7d812bcdff5d7a8ed]
#    to [c45f118fea9d9056538bb5598221f1f0342a98d1]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb"
#  from [5de3b990934d46c8128c805202ce21d19cb21895]
#    to [612639ea089431473f3ec9da7c8d49bae7ca79df]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb"
#  from [d10c6b1d36d72f3b3c8049d1bb2159c96ab7c45b]
#    to [594e28e126038d100ac65fbc93c8beb75bc46b08]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb"
#  from [260a4ef2e7491dfc23d96d055a0a0e1ed674ee54]
#    to [7304fa83f04a875f8423c542adaeefd30b767ddf]
# 
# patch "packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb"
#  from [695d1da5d037f26533a81987819cfee7a9df7601]
#    to [0ccabfca2ec3a05bd1e2ee7bb7ec38f68e0cc95d]
# 
# patch "packages/openmoko2/libmokogsmd2_svn.bb"
#  from [fdaa954512eb9af1f964483f9c2fc585cb677608]
#    to [37257745643dc337dbe76f5c6b0c8c55883fa32b]
# 
# patch "packages/openmoko2/libmokojournal2_svn.bb"
#  from [15b332f5c75a6f64de12d666bf71409ae4ab8999]
#    to [0f61c6ecb80a04d697a6afc1662a38f3b2bce2b8]
# 
# patch "packages/openmoko2/libmokopanelui2_svn.bb"
#  from [cae0414648cd159c9b09a353cb29019fdf139af7]
#    to [27d2e62425fa7629097814a33d11aad51c5b6f52]
# 
# patch "packages/openmoko2/libmokoui2_svn.bb"
#  from [fc8c35f6eb460dc277d372d31baffef3c4b04d52]
#    to [5d4e43536cf9cddc41d7d438ea815bcde15f84ad]
# 
# patch "packages/openmoko2/openmoko-contacts2_svn.bb"
#  from [fe8ddc379d3397d04fcb2bf58940316edb474428]
#    to [75970f318e57d74e7bd9d365d50cb58a4022209f]
# 
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
#  from [10449f420626a2dc7eb7ffddcdc2588946e18e7f]
#    to [bd0cf06b6716271a14903834f2eec8860e79c71d]
# 
# patch "packages/openmoko2/openmoko-feedreader2_svn.bb"
#  from [a5066ba7ccf9101b4635687704d2ecca47441fa2]
#    to [34a51029c8d3cff7ef8ded80931fca00a22a14a2]
# 
# patch "packages/openmoko2/openmoko-icon-theme-standard_svn.bb"
#  from [3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b]
#    to [899afef7d966d953f88a9cca0597dbe91ac64cb8]
# 
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
#  from [fe0910c4f9d4b2220369f293fdf57c3fcb0b1bf4]
#    to [1f363d64742737bc103dabdfe8ea7079ea768b49]
# 
# patch "packages/openmoko2/openmoko-today2_svn.bb"
#  from [19b5a82e4b9df73c893f35975ee0e6717ea38027]
#    to [9bd8fe5b88a3bd55ba28bbdb66afae33f5019c20]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [a87ce3caddce4b12644a8550b43e5aaa8989d5d8]
#    to [d6daadd4be13a618f792c38b29c7ba72fb80da73]
# 
# patch "packages/webkit/webkit_svn.bb"
#  from [2a5fcb37237fbc5d9d76134e97ba8b23dcfe8948]
#    to [cb5b674496bc18948802b1c9b8f634d574e64268]
# 
============================================================
--- packages/libowl/libowl_svn.bb	3130df44fd115dea07f7f96a3b64bc622176da7f
+++ packages/libowl/libowl_svn.bb	3130df44fd115dea07f7f96a3b64bc622176da7f
@@ -0,0 +1,48 @@
+# This recipe builds libowl and then stages the header and static lib;
+# it intentionally does not stage the shared lib and create a package.
+#
+# Libowl is currently a 'cut and paste' library; this package makes our
+# life a touch easier by not having to patch the source directly into
+# applications; instead we add -lowl to the linker cmdline. Also, when
+# we eventually make libowl into a normal shared library, this package
+# will make that transition rather simple.
+
+DESCRIPTION = "OpenedHand Widget Library"
+HOMEPAGE = "http://www.o-hand.com"
+LICENSE = "LGPL"
+SECTION = "libs"
+PR = "r3"
+PV = "0.0+svn${SRCDATE}"
+
+DEPENDS = "gtk+ glib-2.0"
+PACKAGES = ""
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+	# have to unstage the library first so that the tests build
+	rm -f ${STAGING_LIBDIR}/libowl*
+	rm -f ${STAGING_INCDIR}/owl*
+}
+
+do_stage() {
+	headers=`eval ls libowl/owl*.h`
+	for header in $headers; do
+		hdr_base=`eval basename $header`
+		install -m 644 $header ${STAGING_INCDIR}/$hdr_base
+	done
+	install -m 644 libowl/.libs/libowl.a ${STAGING_LIBDIR}/
+}
+
+do_install() {
+}
+
+do_package() {
+}
+
+do_package_write() {
+}
============================================================
--- packages/openmoko2/openmoko-calculator2_svn.bb	64eba89e85f82eb9dfff97ba06635e4346bedd50
+++ packages/openmoko2/openmoko-calculator2_svn.bb	64eba89e85f82eb9dfff97ba06635e4346bedd50
@@ -0,0 +1,7 @@
+DESCRIPTION = "A Calculator for OpenMoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
============================================================
--- packages/puzzles/oh-puzzles_svn.bb	49224067698adffd6aaa85ac7ba650a497ef66bc
+++ packages/puzzles/oh-puzzles_svn.bb	49224067698adffd6aaa85ac7ba650a497ef66bc
@@ -0,0 +1,43 @@
+DESCRIPTION = "Portable Puzzle Collection"
+LICENSE = "MIT"
+SECTION = "x11"
+DEPENDS = "gtk+ gconf intltool-native librsvg libowl"
+PV = "0.1+svn${SRCDATE}"
+PR = "r5"
+
+inherit autotools pkgconfig
+
+SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
+S = "${WORKDIR}/${PN}"
+
+do_install_append() {
+    mv ${D}${bindir} ${D}/usr/games
+
+    install -d ${D}/${datadir}/applications/
+
+    cd ${D}/${prefix}/games
+    for prog in *; do
+        if [ -x $prog ]; then
+            # Convert prog to Title Case
+            title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
+            echo "making ${D}/${datadir}/applications/$prog.desktop"
+            cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Name=$title
+Exec=${prefix}/games/$prog
+Icon=applications-games
+Terminal=false
+Type=Application
+Categories=Game
+StartupNotify=true
+SingleInstance=true
+Comment=Play $title.
+STOP
+        fi
+    done
+}
+
+FILES_${PN} += "${prefix}/games/*"
+FILES_${PN}-dbg += "${prefix}/games/.debug/*"
+
============================================================
--- classes/openmoko2.bbclass	80c28ba30fcb1a7997d64595641141f1a49e3c68
+++ classes/openmoko2.bbclass	465a2fdbdaa8a9f2d258d0f3db274cf06b6ae722
@@ -26,3 +26,6 @@ FILES_${PN} += "${datadir}/icons"
 S = "${WORKDIR}/${PN}"
 
 FILES_${PN} += "${datadir}/icons"
+
+# until we have SRCREV computing
+SRCREV ?= "0${SRCDATE}"
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb	9e3bcc0a584850f07d72044109a2899acd5f3b67
+++ packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb	aea7b4780c1ef56b1525907e84e9cdc7800a372a
@@ -1,6 +1,6 @@ DEPENDS = "apmd"
 DESCRIPTION = "Shows the battery/AC status in the OpenMoko panel"
 DEPENDS = "apmd"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb	90ba0eb3822a476f4a0af3ddf3a3f27daefbe6e3
+++ packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb	26148603ad12255f81061a7c63029fbc575538db
@@ -1,6 +1,6 @@ DEPENDS = "bluez-libs"
 DESCRIPTION = "Shows the bluetooth status in the OpenMoko panel"
 DEPENDS = "bluez-libs"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb	a3f3992317c4b916878d25e7d812bcdff5d7a8ed
+++ packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb	c45f118fea9d9056538bb5598221f1f0342a98d1
@@ -1,5 +1,5 @@ DESCRIPTION = "Shows the current time in
 DESCRIPTION = "Shows the current time in the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb	5de3b990934d46c8128c805202ce21d19cb21895
+++ packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb	612639ea089431473f3ec9da7c8d49bae7ca79df
@@ -1,6 +1,6 @@ DEPENDS = "gpsd"
 DESCRIPTION = "Shows the GPS status in the OpenMoko panel"
 DEPENDS = "gpsd"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb	d10c6b1d36d72f3b3c8049d1bb2159c96ab7c45b
+++ packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb	594e28e126038d100ac65fbc93c8beb75bc46b08
@@ -1,10 +1,6 @@
-DESCRIPTION = "Shows the GSM status in the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
+DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel"
+DEPENDS = "libgsmd"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
 
-DEPENDS_append = " libgsmd"
-
 inherit openmoko-panel-plugin
-
-FILES_${PN} += "${bindir}/${PN}"
-
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb	260a4ef2e7491dfc23d96d055a0a0e1ed674ee54
+++ packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb	7304fa83f04a875f8423c542adaeefd30b767ddf
@@ -1,6 +1,6 @@ DEPENDS += "pulseaudio startup-notificat
 DESCRIPTION = "Main menu applet for the OpenMoko panel"
 DEPENDS += "pulseaudio startup-notification"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko-panel-plugin
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb	695d1da5d037f26533a81987819cfee7a9df7601
+++ packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb	0ccabfca2ec3a05bd1e2ee7bb7ec38f68e0cc95d
@@ -1,5 +1,5 @@ DESCRIPTION = "USB applet for the OpenMo
 DESCRIPTION = "USB applet for the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 
 inherit openmoko-panel-plugin
 
============================================================
--- packages/openmoko2/libmokogsmd2_svn.bb	fdaa954512eb9af1f964483f9c2fc585cb677608
+++ packages/openmoko2/libmokogsmd2_svn.bb	37257745643dc337dbe76f5c6b0c8c55883fa32b
@@ -1,6 +1,6 @@ DEPENDS = "libgsmd glib-2.0"
 SECTION = "openmoko/libs"
 DEPENDS = "libgsmd glib-2.0"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
============================================================
--- packages/openmoko2/libmokojournal2_svn.bb	15b332f5c75a6f64de12d666bf71409ae4ab8999
+++ packages/openmoko2/libmokojournal2_svn.bb	0f61c6ecb80a04d697a6afc1662a38f3b2bce2b8
@@ -1,6 +1,6 @@ DEPENDS = "eds-dbus"
 SECTION = "openmoko/libs"
 DEPENDS = "eds-dbus"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
============================================================
--- packages/openmoko2/libmokopanelui2_svn.bb	cae0414648cd159c9b09a353cb29019fdf139af7
+++ packages/openmoko2/libmokopanelui2_svn.bb	27d2e62425fa7629097814a33d11aad51c5b6f52
@@ -1,6 +1,6 @@ DEPENDS = "gtk+"
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1" 
 
 inherit openmoko2
============================================================
--- packages/openmoko2/libmokoui2_svn.bb	fc8c35f6eb460dc277d372d31baffef3c4b04d52
+++ packages/openmoko2/libmokoui2_svn.bb	5d4e43536cf9cddc41d7d438ea815bcde15f84ad
@@ -1,6 +1,6 @@ DEPENDS = "gtk+"
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
============================================================
--- packages/openmoko2/openmoko-contacts2_svn.bb	fe8ddc379d3397d04fcb2bf58940316edb474428
+++ packages/openmoko2/openmoko-contacts2_svn.bb	75970f318e57d74e7bd9d365d50cb58a4022209f
@@ -1,12 +1,12 @@ RDEPENDS = "libedata-book"
 DESCRIPTION = "The OpenMoko address book"
 SECTION = "openmoko/pim"
 RDEPENDS = "libedata-book"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r2"
 
 inherit openmoko2
 
-SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches/;module=hito;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http"
 S = "${WORKDIR}/hito/"
 
 EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko"
============================================================
--- packages/openmoko2/openmoko-dialer2_svn.bb	10449f420626a2dc7eb7ffddcdc2588946e18e7f
+++ packages/openmoko2/openmoko-dialer2_svn.bb	bd0cf06b6716271a14903834f2eec8860e79c71d
@@ -1,7 +1,7 @@ DEPENDS = "libmokogsmd2 libmokoui2 libmo
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
============================================================
--- packages/openmoko2/openmoko-feedreader2_svn.bb	a5066ba7ccf9101b4635687704d2ecca47441fa2
+++ packages/openmoko2/openmoko-feedreader2_svn.bb	34a51029c8d3cff7ef8ded80931fca00a22a14a2
@@ -1,9 +1,7 @@
-DESCRIPTION = "The OpenMoko RSS Reader"
-SECTION = "openmoko/applications"
+DESCRIPTION = "The OpenMoko Feed Reader"
+SECTION = "openmoko/apps"
 DEPENDS += "libmrss check webkit"
-
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.0.1+svnr${SRCREV}"
 PR = "r0"
 
 inherit openmoko2
-
============================================================
--- packages/openmoko2/openmoko-icon-theme-standard_svn.bb	3889e0cbc8b415f8ccc206cf34c0b2d3f5324e5b
+++ packages/openmoko2/openmoko-icon-theme-standard_svn.bb	899afef7d966d953f88a9cca0597dbe91ac64cb8
@@ -1,6 +1,6 @@ SECTION = "openmoko/base"
 DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SRCREV}"
 PR = "r1"
 
 inherit openmoko-base autotools
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb	fe0910c4f9d4b2220369f293fdf57c3fcb0b1bf4
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb	1f363d64742737bc103dabdfe8ea7079ea768b49
@@ -1,7 +1,7 @@ RCONFLICTS = "openmoko-theme-standard"
 DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCDATE}"
 PR = "r1"
 
 inherit openmoko2
============================================================
--- packages/openmoko2/openmoko-today2_svn.bb	19b5a82e4b9df73c893f35975ee0e6717ea38027
+++ packages/openmoko2/openmoko-today2_svn.bb	9bd8fe5b88a3bd55ba28bbdb66afae33f5019c20
@@ -1,7 +1,6 @@ DEPENDS = "libmokoui2 startup-notificati
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
+PV = "0.1.0+svnr${SRCREV}"
 
-PV = "0.1.0+srvn${SRCDATE}"
-
 inherit openmoko2 gtk-icon-cache 
============================================================
--- packages/tasks/task-openmoko.bb	a87ce3caddce4b12644a8550b43e5aaa8989d5d8
+++ packages/tasks/task-openmoko.bb	d6daadd4be13a618f792c38b29c7ba72fb80da73
@@ -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 = "r50"
+PR = "r52"
 
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
@@ -12,11 +12,10 @@ PACKAGES = "\
   task-openmoko-ui \
   task-openmoko-base \
   task-openmoko-phone \
-  task-openmoko-finger \
   task-openmoko-pim \
   task-openmoko-net \
   \
-  task-openmoko-demo \
+  task-openm%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list