[oe-commits] org.oe.dev merge of '56ceab0da14ebf9acac5e367a5e2300e7da4882f'

[hrw commit]

merge of '56ceab0da14ebf9acac5e367a5e2300e7da4882f'
     and '9235652d1f961fc07ff7bc1997a38323e8c46039'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: d2e24b5f03d423294d361578de6dc3e3efe1ea30
ViewMTN: http://monotone.openembedded.org/revision/info/d2e24b5f03d423294d361578de6dc3e3efe1ea30
Files:
1
packages/bash/bash-3.2
packages/bash/bash-3.2/001-005.patch
packages/bash/bash_3.2.bb
packages/gimp/gimp_2.4.0.bb
packages/gsm/libgsmd_svn.bb
Diffs:

#
# mt diff -r56ceab0da14ebf9acac5e367a5e2300e7da4882f -rd2e24b5f03d423294d361578de6dc3e3efe1ea30
#
# 
# 
# delete "packages/bash/bash-3.2"
# 
# delete "packages/bash/bash-3.2/001-005.patch"
# 
# patch "packages/bash/bash_3.2.bb"
#  from [8c159b76d706e4868425c200897f29f7df2c8f22]
#    to [b786439963d9345c6f91c3e915166fb710c7dce9]
# 
============================================================
--- packages/bash/bash_3.2.bb	8c159b76d706e4868425c200897f29f7df2c8f22
+++ packages/bash/bash_3.2.bb	b786439963d9345c6f91c3e915166fb710c7dce9
@@ -1,5 +1,30 @@ require bash.inc
 require bash.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-004;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-005;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-006;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-007;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-008;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-009;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-010;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-011;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-012;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-013;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-014;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-015;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-016;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-017;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-018;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-019;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-020;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-021;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-022;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-023;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-024;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-025;patch=1;pnum=0 \
+           "
-           file://001-005.patch;patch=1"


#
# mt diff -r9235652d1f961fc07ff7bc1997a38323e8c46039 -rd2e24b5f03d423294d361578de6dc3e3efe1ea30
#
# 
# 
# add_file "packages/gimp/gimp_2.4.0.bb"
#  content [a1fb306822b29622ceb17ac291c2b0d4db5bed0c]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [e318741cad8fdee3e2edc73f03e44e717e0d3cb7]
#    to [5d85c847c9c66f53ee54cc52c72c69fae4db0b44]
# 
============================================================
--- packages/gimp/gimp_2.4.0.bb	a1fb306822b29622ceb17ac291c2b0d4db5bed0c
+++ packages/gimp/gimp_2.4.0.bb	a1fb306822b29622ceb17ac291c2b0d4db5bed0c
@@ -0,0 +1,5 @@
+require gimp.inc
+
+SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.4/gimp-${PV}.tar.bz2 \
+                 file://configure-libwmf.patch;patch=1"
+
============================================================
--- packages/gsm/libgsmd_svn.bb	e318741cad8fdee3e2edc73f03e44e717e0d3cb7
+++ packages/gsm/libgsmd_svn.bb	5d85c847c9c66f53ee54cc52c72c69fae4db0b44
@@ -16,7 +16,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/
            file://0003-Correctly-segment-incoming-usock-data-into-packets.patch;patch=1;minrev=2957 \
            file://0004-Handle-read-and-write-return-values.patch;patch=1;minrev=2957 \ 
            file://0005-Add-ask-ds-option-forSMS.patch;patch=1;minrev=2957;maxrev=3201 \ 
-           file://lgsm_send_fix_return_value.patch;patch=1 \
+           file://lgsm_send_fix_return_value.patch;patch=1;maxrev=3266 \
            file://gsmd \
            file://default"
 S = "${WORKDIR}/gsm"