[oe-commits] org.oe.dev merge of '528c70fd35c4abbbc5ca2d29a08877e037f09e69'

[xora commit]

merge of '528c70fd35c4abbbc5ca2d29a08877e037f09e69'
     and 'ece94f3cd93d33253efe66ddd94e233b026e7d47'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 35958473cb3e7c22ae3b948f47dcd57d676d22a0
ViewMTN: http://monotone.openembedded.org/revision/info/35958473cb3e7c22ae3b948f47dcd57d676d22a0
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/openmoko2/openmoko-dates2_svn.bb
packages/atk/atk_1.19.3.bb
Diffs:

#
# mt diff -r528c70fd35c4abbbc5ca2d29a08877e037f09e69 -r35958473cb3e7c22ae3b948f47dcd57d676d22a0
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [17f28a36948bf26950e4e783b1b5935187bfe68d]
#    to [999d24c1deb2b05e4196f5a908351d36396ee7dd]
# 
# patch "packages/openmoko2/openmoko-dates2_svn.bb"
#  from [3be39f7f10cdcd32b56ee3135d4c0ce268a14ea5]
#    to [c0b82b2d1232131cff214e735e422d252a154e6d]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	17f28a36948bf26950e4e783b1b5935187bfe68d
+++ conf/distro/include/sane-srcrevs.inc	999d24c1deb2b05e4196f5a908351d36396ee7dd
@@ -49,7 +49,7 @@ SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-contacts ?= "2298"
 SRCREV_pn-openmoko-contacts2 ?= "335"
 SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "563"
+SRCREV_pn-openmoko-dates2 ?= "617"
 SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "2976"
 SRCREV_pn-openmoko-feedreader2 ?= "3060"
============================================================
--- packages/openmoko2/openmoko-dates2_svn.bb	3be39f7f10cdcd32b56ee3135d4c0ce268a14ea5
+++ packages/openmoko2/openmoko-dates2_svn.bb	c0b82b2d1232131cff214e735e422d252a154e6d
@@ -10,3 +10,8 @@ EXTRA_OECONF = "--with-frontend=openmoko
 S = "${WORKDIR}/jana/"
 
 EXTRA_OECONF = "--with-frontend=openmoko"
+
+do_configure_prepend() {
+	touch gtk-doc.make
+}
+


#
# mt diff -rece94f3cd93d33253efe66ddd94e233b026e7d47 -r35958473cb3e7c22ae3b948f47dcd57d676d22a0
#
# 
# 
# patch "packages/atk/atk_1.19.3.bb"
#  from [656b768718fa0fb3c29376f5b6d2cecb01f2f4c1]
#    to [e94d8f3fd021065300ad78c840ea3acacdb490d8]
# 
============================================================
--- packages/atk/atk_1.19.3.bb	656b768718fa0fb3c29376f5b6d2cecb01f2f4c1
+++ packages/atk/atk_1.19.3.bb	e94d8f3fd021065300ad78c840ea3acacdb490d8
@@ -1,7 +1,5 @@ require atk.inc
 require atk.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
 
 do_stage () {