[oe-commits] org.oe.dev merge of '7c2dfd8725acfc6de0286a17d58cccbfa6c141f8'

[cbrake commit]

merge of '7c2dfd8725acfc6de0286a17d58cccbfa6c141f8'
     and 'a06a3079e29738b3d834a584143671d46904548d'

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: 5e7921c266d5822c71d7e845436f0c477d53892e
ViewMTN: http://monotone.openembedded.org/revision/info/5e7921c266d5822c71d7e845436f0c477d53892e
Files:
1
packages/glibc/glibc_2.3.3+cvs20050221.bb
conf/distro/include/sane-srcrevs.inc
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
Diffs:

#
# mt diff -r7c2dfd8725acfc6de0286a17d58cccbfa6c141f8 -r5e7921c266d5822c71d7e845436f0c477d53892e
#
# 
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
#  from [c81a4dcb60d85da204ee67a9cb24ee2248fed1a3]
#    to [919a8c98d395b0551b87a5ed37d92dce15fe0db6]
# 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050221.bb	c81a4dcb60d85da204ee67a9cb24ee2248fed1a3
+++ packages/glibc/glibc_2.3.3+cvs20050221.bb	919a8c98d395b0551b87a5ed37d92dce15fe0db6
@@ -22,7 +22,7 @@ SRC_URI = "cvs://anoncvs@sources.redhat.
 	   file://arm-longlong.patch;patch=1;pnum=0 \
 	   file://arm-machine-gmon.patch;patch=1;pnum=0 \
 	   file://trampoline.patch;patch=1;pnum=0 \
-	   file://dl-cache-libcmp.patch;patch=1;pnum=0 \
+	   file://dl-cache-libcmp.patch;patch=1 \
 	   \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"


#
# mt diff -ra06a3079e29738b3d834a584143671d46904548d -r5e7921c266d5822c71d7e845436f0c477d53892e
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [6d7da7c18b623ba8dcffc6118a858c2c9569f235]
#    to [aefa995223c2b1cb4e7bf9e3bfc313e5522f4938]
# 
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
#  from [5c8d9b5867669d654a875bd9b3a202b283d0dade]
#    to [1887d8e703285a0665b7a07c3d4c98e2165f30ee]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	6d7da7c18b623ba8dcffc6118a858c2c9569f235
+++ conf/distro/include/sane-srcrevs.inc	aefa995223c2b1cb4e7bf9e3bfc313e5522f4938
@@ -30,8 +30,8 @@ SRCREV_pn-matchbox-desktop-2 ?= "1649"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "108"
 SRCREV_pn-matchbox-desktop-2 ?= "1649"
-SRCREV_pn-matchbox-keyboard ?= "1675"
-SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
+SRCREV_pn-matchbox-keyboard ?= "1739"
+SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-moko-gtk-engine ?= "3146"
 SRCREV_pn-neod ?= "2956"
============================================================
--- packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb	5c8d9b5867669d654a875bd9b3a202b283d0dade
+++ packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb	1887d8e703285a0665b7a07c3d4c98e2165f30ee
@@ -6,13 +6,11 @@ PV = "0.0+svnr${SRCREV}"
 #DEFAULT_PREFERENCE = "-1"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
 	file://smallscreen-fontsize.patch;patch=1 \
-        file://matchbox-keyboard-applet.patch;patch=1;pnum=0 \
-	file://80matchboxkeyboard \
-	file://matchbox-keyboard-hide-delay.patch;patch=1"
+	file://80matchboxkeyboard"
 
 SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1"