[oe-commits] org.oe.dev merge of 'aa36aa92826b8f74328b39933671dd201b795054'

koen commit openembedded-commits at lists.openembedded.org
Fri Oct 19 20:04:45 UTC 2007 

merge of 'aa36aa92826b8f74328b39933671dd201b795054'
     and 'bc72cbe491bc556448f73971b4b962b9a60c9dd9'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 0d10da095e95a24a892ade5cac920039ad878ceb
ViewMTN: http://monotone.openembedded.org/revision/info/0d10da095e95a24a892ade5cac920039ad878ceb
Files:
1
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/openmoko2/openmoko-common2_svn.bb
packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
conf/distro/include/insane-srcrevs.inc
conf/distro/include/sane-srcrevs.inc
packages/gpephone/linphone_1.5.0.bb
packages/libfakekey/libfakekey_svn.bb
packages/libxml/libxml2_2.6.29.bb
Diffs:

#
# mt diff -raa36aa92826b8f74328b39933671dd201b795054 -r0d10da095e95a24a892ade5cac920039ad878ceb
#
# 
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [46ae1e41387e98c1c03cd7024584fc17634b1025]
#    to [0fc254e3f48f74d01590aa9c50f3ffb15aa60468]
# 
# patch "packages/openmoko2/openmoko-common2_svn.bb"
#  from [61a1a56981b35980d765c27ef65f8fcc84785e39]
#    to [0602e7f6a0a2737800ca104ff4d0574d94106dab]
# 
# patch "packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb"
#  from [b49376120f1dc1282d69613b3b21a271fe730912]
#    to [020e97d17fb83d30c85ffcaf93260d69d977124a]
# 
# patch "packages/openmoko2/openmoko-icon-theme-standard2_svn.bb"
#  from [234bbdff982afb5bc83ccaf941cf13030a3651e3]
#    to [46950cd4b5599e731eb1ade602e59b3baad6c99e]
# 
# patch "packages/openmoko2/openmoko-sound-theme-standard2_svn.bb"
#  from [b2778eab90cb33248599b19697944e169304f641]
#    to [6a7abd631a290d08fde787b173da7e1dc327d24f]
# 
# patch "packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb"
#  from [495850358f832a2fcc80aa7cf6bb796acea8fc42]
#    to [933a582f6f614cf6cd4713f1159e6a95bcc7da6e]
# 
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
#  from [6420f38b554beea805e3d0e7428a5751cfb6eae3]
#    to [4810d44dd9c496af1fd9ba86bef5008f51785f0b]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	46ae1e41387e98c1c03cd7024584fc17634b1025
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	0fc254e3f48f74d01590aa9c50f3ffb15aa60468
@@ -115,8 +115,6 @@ PREFERRED_VERSION_bl ?= "0.0"
 PREFERRED_VERSION_bitbake ?= "1.8.6"
 PREFERRED_VERSION_bitchx ?= "1.1"
 PREFERRED_VERSION_bl ?= "0.0"
-PREFERRED_VERSION_blassic ?= "0.10.1"
-PREFERRED_VERSION_blktool ?= "4"
 PREFERRED_VERSION_blueprobe ?= "0.18"
 PREFERRED_VERSION_bluesnarfer ?= "0.1"
 PREFERRED_VERSION_bluez-cups-backend ?= "3.20"
@@ -400,8 +398,6 @@ PREFERRED_VERSION_ethload ?= "1.2"
 PREFERRED_VERSION_essential-machine-image ?= "1.0"
 PREFERRED_VERSION_etherpuppet ?= "0.2"
 PREFERRED_VERSION_ethload ?= "1.2"
-PREFERRED_VERSION_ethload-native ?= "1.2"
-PREFERRED_VERSION_ethtool ?= "6"
 PREFERRED_VERSION_etk ?= "0.1.0"
 PREFERRED_VERSION_etk-native ?= "0.1.0"
 PREFERRED_VERSION_ettercap ?= "0.6.b"
@@ -816,7 +812,6 @@ PREFERRED_VERSION_htun ?= "0.9.5"
 PREFERRED_VERSION_htb-init ?= "0.8.5"
 PREFERRED_VERSION_httppc ?= "0.8.5"
 PREFERRED_VERSION_htun ?= "0.9.5"
-PREFERRED_VERSION_hugs ?= "hugs98-Nov2003"
 PREFERRED_VERSION_hvsc ?= "45"
 PREFERRED_VERSION_hwdata ?= "0.191"
 PREFERRED_VERSION_hydra ?= "4.5"
@@ -1108,10 +1103,6 @@ PREFERRED_VERSION_libmodule-build-perl-n
 PREFERRED_VERSION_libmodplug ?= "0.7"
 PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
 PREFERRED_VERSION_libmodule-build-perl-native ?= "0.2805"
-PREFERRED_VERSION_libmokogsmd2 ?= "0.1.0"
-PREFERRED_VERSION_libmokojournal2 ?= "0.1.0"
-PREFERRED_VERSION_libmokopanelui2 ?= "0.3.0"
-PREFERRED_VERSION_libmokoui2 ?= "0.1.0"
 PREFERRED_VERSION_libmpd ?= "0.0.0"
 PREFERRED_VERSION_libmrss ?= "0.17.2"
 PREFERRED_VERSION_libmsgenabler ?= "1.0"
@@ -1477,8 +1468,6 @@ PREFERRED_VERSION_moin ?= "1.5.8"
 PREFERRED_VERSION_modutils-cross ?= "2.4.27"
 PREFERRED_VERSION_modutils-initscripts ?= "1.0"
 PREFERRED_VERSION_moin ?= "1.5.8"
-PREFERRED_VERSION_moko-gtk-engine ?= "0.1.0"
-PREFERRED_VERSION_mokogateway-image ?= "1.0"
 PREFERRED_VERSION_mono ?= "1.2.5.1"
 PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
 PREFERRED_VERSION_mono-native ?= "1.2.5.1"
@@ -2099,42 +2088,6 @@ PREFERRED_VERSION_tar ?= "1.18"
 PREFERRED_VERSION_tapioca-xmpp ?= "0.3.9"
 PREFERRED_VERSION_tapiocaui ?= "0.3.9.1"
 PREFERRED_VERSION_tar ?= "1.18"
-PREFERRED_VERSION_tar-native ?= "1.13.93"
-PREFERRED_VERSION_task-angstrom-e ?= "1.0"
-PREFERRED_VERSION_task-base ?= "1.0"
-PREFERRED_VERSION_task-boot ?= "1.0"
-PREFERRED_VERSION_task-e-x11 ?= "1.0"
-PREFERRED_VERSION_task-gmae ?= "1.0"
-PREFERRED_VERSION_task-gpe ?= "1.0"
-PREFERRED_VERSION_task-gpe-apps ?= "1.0"
-PREFERRED_VERSION_task-gpe-base ?= "1.0"
-PREFERRED_VERSION_task-gpe-connectivity ?= "1.0"
-PREFERRED_VERSION_task-gpe-desktopapps ?= "1.0"
-PREFERRED_VERSION_task-gpe-games ?= "1.0"
-PREFERRED_VERSION_task-gpe-pim ?= "1.0"
-PREFERRED_VERSION_task-gpe-sectest ?= "1.0"
-PREFERRED_VERSION_task-gpe-settings ?= "1.0"
-PREFERRED_VERSION_task-gpe-web ?= "1.0"
-PREFERRED_VERSION_task-gpephone ?= "1.0"
-PREFERRED_VERSION_task-maemo ?= "1.0"
-PREFERRED_VERSION_task-mokogateway ?= "1.0"
-PREFERRED_VERSION_task-native-sdk ?= "1.0"
-PREFERRED_VERSION_task-proper-tools ?= "1.0"
-PREFERRED_VERSION_task-python-everything ?= "1.09"
-PREFERRED_VERSION_task-python-sharprom ?= "20060425-ml6"
-PREFERRED_VERSION_task-qpe ?= "1.0"
-PREFERRED_VERSION_task-sdk ?= "1.0"
-PREFERRED_VERSION_task-sdk-base ?= "1.0"
-PREFERRED_VERSION_task-sdk-extra ?= "1.0"
-PREFERRED_VERSION_task-sdk-gpephone ?= "1.0"
-PREFERRED_VERSION_task-sdk-host ?= "1.0"
-PREFERRED_VERSION_task-sdk-sbox ?= "1.0"
-PREFERRED_VERSION_task-sdk-sbox-gpe ?= "1.0"
-PREFERRED_VERSION_task-sdl ?= "1.0"
-PREFERRED_VERSION_task-self-hosting ?= "1.0"
-PREFERRED_VERSION_task-slugos ?= "1.0"
-PREFERRED_VERSION_task-xfce-base ?= "1.0"
-PREFERRED_VERSION_task-xterminal ?= "1.0"
 PREFERRED_VERSION_tasklistapplet ?= "1.0.5"
 PREFERRED_VERSION_tasks ?= "0.10"
 PREFERRED_VERSION_tcl ?= "8.4.11"
============================================================
--- packages/openmoko2/openmoko-common2_svn.bb	61a1a56981b35980d765c27ef65f8fcc84785e39
+++ packages/openmoko2/openmoko-common2_svn.bb	0602e7f6a0a2737800ca104ff4d0574d94106dab
@@ -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"
+PR = "r6"
 
 inherit openmoko2
 
============================================================
--- packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb	b49376120f1dc1282d69613b3b21a271fe730912
+++ packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb	020e97d17fb83d30c85ffcaf93260d69d977124a
@@ -1,7 +1,7 @@
-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"
+PR = "r1"
 
 inherit openmoko2
 
============================================================
--- packages/openmoko2/openmoko-icon-theme-standard2_svn.bb	234bbdff982afb5bc83ccaf941cf13030a3651e3
+++ packages/openmoko2/openmoko-icon-theme-standard2_svn.bb	46950cd4b5599e731eb1ade602e59b3baad6c99e
@@ -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"
+PR = "r1"
 
 inherit openmoko2
 
============================================================
--- packages/openmoko2/openmoko-sound-theme-standard2_svn.bb	b2778eab90cb33248599b19697944e169304f641
+++ packages/openmoko2/openmoko-sound-theme-standard2_svn.bb	6a7abd631a290d08fde787b173da7e1dc327d24f
@@ -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
 
============================================================
--- packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb	495850358f832a2fcc80aa7cf6bb796acea8fc42
+++ packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb	933a582f6f614cf6cd4713f1159e6a95bcc7da6e
@@ -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"
+PR = "r1"
 
 inherit openmoko2
 
============================================================
--- packages/openmoko2/openmoko-theme-standard2_svn.bb	6420f38b554beea805e3d0e7428a5751cfb6eae3
+++ packages/openmoko2/openmoko-theme-standard2_svn.bb	4810d44dd9c496af1fd9ba86bef5008f51785f0b
@@ -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"
+PR = "r5"
 
 inherit openmoko2
 


#
# mt diff -rbc72cbe491bc556448f73971b4b962b9a60c9dd9 -r0d10da095e95a24a892ade5cac920039ad878ceb
#
# 
# 
# patch "conf/distro/include/insane-srcrevs.inc"
#  from [f6f1325935ba628107e90adf8e9bdd193c2603c1]
#    to [b1efedd3d4ef2ad3d5f782c992e368ed4dd7e664]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [4a0c14afa5d337b4e5f355e69e87e256fe621f6e]
#    to [531eee7007b54c139368eb4fe74b8032d1c914d4]
# 
# patch "packages/gpephone/linphone_1.5.0.bb"
#  from [cf4c71c11372f4d8b35ca2746e59f3236d0f19c3]
#    to [06011c047a001c6f25d8e4f565fb3ed2e25f7595]
# 
# patch "packages/libfakekey/libfakekey_svn.bb"
#  from [a24756002694957644042904c9bb613ee55072ce]
#    to [92eba2714ca9c527505d1899d217c38321e2de8e]
# 
# patch "packages/libxml/libxml2_2.6.29.bb"
#  from [226ab2f3dffb4d2f943bfb48698ddd310ad25552]
#    to [ca6756e3d1b9992043fe02f4e975f218f817b270]
# 
============================================================
--- conf/distro/include/insane-srcrevs.inc	f6f1325935ba628107e90adf8e9bdd193c2603c1
+++ conf/distro/include/insane-srcrevs.inc	b1efedd3d4ef2ad3d5f782c992e368ed4dd7e664
@@ -82,5 +82,6 @@ SRCREV_pn-usbpath-native ?= "${AUTOREV}"
 SRCREV_pn-mplayer ?= "${AUTOREV}"
 SRCREV_pn-usbpath ?= "${AUTOREV}"
 SRCREV_pn-usbpath-native ?= "${AUTOREV}"
+SRCREV_pn-libfakekey ?= "${AUTOREV}"
 
 SRCREV ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	4a0c14afa5d337b4e5f355e69e87e256fe621f6e
+++ conf/distro/include/sane-srcrevs.inc	531eee7007b54c139368eb4fe74b8032d1c914d4
@@ -96,7 +96,7 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-settings-daemon ?= "1615"
+SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "44"
 SRCREV_pn-webkit-gtk ?= "26079"
@@ -107,4 +107,5 @@ SRCREV_pn-usbpath-native ?= "3108"
 SRCREV_pn-libw100 ?= "47"
 SRCREV_pn-usbpath ?= "3108"
 SRCREV_pn-usbpath-native ?= "3108"
+SRCREV_pn-libfakekey ?= "1455"
 
============================================================
--- packages/gpephone/linphone_1.5.0.bb	cf4c71c11372f4d8b35ca2746e59f3236d0f19c3
+++ packages/gpephone/linphone_1.5.0.bb	06011c047a001c6f25d8e4f565fb3ed2e25f7595
@@ -1,9 +1,9 @@ DEPENDS = "libosip2 speex libogg alsa-li
 
 DESCRIPTION = "SIP-based IP phone"
 HOMEPAGE = "http://www.linphone.org/?lang=us"
 LICENSE = "GPLv2"
 DEPENDS = "libosip2 speex libogg alsa-lib readline"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/linphone-${PV}.tar.gz \
            file://linphone-1.5.0.patch;patch=1 \
@@ -18,7 +18,7 @@ EXTRA_OECONF = "--disable-gnome_ui --dis
                 --with-osip=${STAGING_DIR}/${HOST_SYS} \
                 --with-readline=${STAGING_DIR}/${HOST_SYS} \
                 --disable-truespeech --disable-manual \
-                --disable-glibtest --disable-glib"
+                --disable-glibtest --disable-glib --disable-strict"
 
 do_configure () {
 	export LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool"
============================================================
--- packages/libfakekey/libfakekey_svn.bb	a24756002694957644042904c9bb613ee55072ce
+++ packages/libfakekey/libfakekey_svn.bb	92eba2714ca9c527505d1899d217c38321e2de8e
@@ -1,8 +1,8 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox keyboard"
 LICENSE = "GPL"
 DEPENDS = "libxtst"
 SECTION = "x11/wm"
-PV = "0.0+svnr${SRCREV}"
+PV = "0.2+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
============================================================
--- packages/libxml/libxml2_2.6.29.bb	226ab2f3dffb4d2f943bfb48698ddd310ad25552
+++ packages/libxml/libxml2_2.6.29.bb	ca6756e3d1b9992043fe02f4e975f218f817b270
@@ -1,6 +1,3 @@
-# NOTE! This is an update file and will go away when upstream updates
-# TODO: send this to upstream
-
 DESCRIPTION = "GNOME XML Parser library"
 SECTION = "libs"
 PRIORITY = "optional"

More information about the Openembedded-commits mailing list