[oe-commits] org.oe.dev merge of '399ad82a65eae57d617ef7178f450016dcc3c1da'

[hrw commit]

merge of '399ad82a65eae57d617ef7178f450016dcc3c1da'
     and '5e7921c266d5822c71d7e845436f0c477d53892e'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 7443e610d29689df173f029ef7d5222df3667a21
ViewMTN: http://monotone.openembedded.org/revision/info/7443e610d29689df173f029ef7d5222df3667a21
Files:
1
packages/glibc/glibc_2.3.3+cvs20050221.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r399ad82a65eae57d617ef7178f450016dcc3c1da -r7443e610d29689df173f029ef7d5222df3667a21
#
# 
# 
# 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 -r5e7921c266d5822c71d7e845436f0c477d53892e -r7443e610d29689df173f029ef7d5222df3667a21
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [aefa995223c2b1cb4e7bf9e3bfc313e5522f4938]
#    to [32c8bb4a0fd7ec05c2bb58544741775fd310207b]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	aefa995223c2b1cb4e7bf9e3bfc313e5522f4938
+++ conf/distro/include/sane-srcrevs.inc	32c8bb4a0fd7ec05c2bb58544741775fd310207b
@@ -52,7 +52,7 @@ SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "617"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3141"
+SRCREV_pn-openmoko-dialer2 ?= "3150"
 SRCREV_pn-openmoko-feedreader2 ?= "3080"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "2873"