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

[hrw commit]

merge of 'ac4b5988727da1d0b584ac9a22c5fa12a864842f'
     and 'e0fcc3e13cf457c4a58354625e80d7451ff357b7'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: bc0501821ce0d1c124e42dd4530f3829e896ffe7
ViewMTN: http://monotone.openembedded.org/revision/info/bc0501821ce0d1c124e42dd4530f3829e896ffe7
Files:
1
packages/libxml/libxml2_2.6.29.bb
packages/openmoko2/openmoko-appearance_svn.bb
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -rac4b5988727da1d0b584ac9a22c5fa12a864842f -rbc0501821ce0d1c124e42dd4530f3829e896ffe7
#
# 
# 
# patch "packages/libxml/libxml2_2.6.29.bb"
#  from [226ab2f3dffb4d2f943bfb48698ddd310ad25552]
#    to [ca6756e3d1b9992043fe02f4e975f218f817b270]
# 
============================================================
--- 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"


#
# mt diff -re0fcc3e13cf457c4a58354625e80d7451ff357b7 -rbc0501821ce0d1c124e42dd4530f3829e896ffe7
#
# 
# 
# add_file "packages/openmoko2/openmoko-appearance_svn.bb"
#  content [9c16ee551c7973be9ff5495835872d63bf640a06]
# 
# patch "conf/distro/include/insane-srcrevs.inc"
#  from [56b1cdd28ecceacfd01475b723bc119e0dec9086]
#    to [f6f1325935ba628107e90adf8e9bdd193c2603c1]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [3869ea9313b7cdedb815f168ca91cb2c92787e52]
#    to [377acba46a95e8d0301744e9742074791d93ed2e]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [6d247e57acf43556bed807d2ee29ccc6ccc9de71]
#    to [4a0c14afa5d337b4e5f355e69e87e256fe621f6e]
# 
============================================================
--- packages/openmoko2/openmoko-appearance_svn.bb	9c16ee551c7973be9ff5495835872d63bf640a06
+++ packages/openmoko2/openmoko-appearance_svn.bb	9c16ee551c7973be9ff5495835872d63bf640a06
@@ -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+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2 gtk-icon-cache 
============================================================
--- conf/distro/include/insane-srcrevs.inc	56b1cdd28ecceacfd01475b723bc119e0dec9086
+++ conf/distro/include/insane-srcrevs.inc	f6f1325935ba628107e90adf8e9bdd193c2603c1
@@ -70,6 +70,7 @@ SRCREV_pn-openmoko-today2-folders ?= "${
 SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
 SRCREV_pn-psplash ?= "${AUTOREV}"
============================================================
--- conf/distro/include/moko-autorev.inc	3869ea9313b7cdedb815f168ca91cb2c92787e52
+++ conf/distro/include/moko-autorev.inc	377acba46a95e8d0301744e9742074791d93ed2e
@@ -9,6 +9,7 @@ SRCREV_pn-openmoko-appmanager ?= "${AUTO
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 
 SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	6d247e57acf43556bed807d2ee29ccc6ccc9de71
+++ conf/distro/include/sane-srcrevs.inc	4a0c14afa5d337b4e5f355e69e87e256fe621f6e
@@ -92,6 +92,7 @@ SRCREV_pn-openmoko-today2-folders ?= "26
 SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "3180"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
+SRCREV_pn-openmoko-appearance ?= "3227"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
 SRCREV_pn-psplash ?= "249"