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

oe commit openembedded-commits at lists.openembedded.org
Fri Jan 18 14:27:10 UTC 2008 

merge of 'a0f0a04325ed193844895cf9b74e8b1b48deac4e'
     and 'e55bf39595a78df12d17e4b80e9ed474ad5a467d'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec
ViewMTN: http://monotone.openembedded.org/revision/info/0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec
Files:
1
conf/machine/include/collie-2.6.inc
conf/machine/include/poodle-2.6.inc
packages/asterisk-core-sounds-en-alaw
packages/asterisk-core-sounds-en-g729
packages/asterisk-core-sounds-en-gsm
packages/asterisk-core-sounds-en-ulaw
packages/asterisk-extra-sounds-en-alaw
packages/asterisk-extra-sounds-en-g729
packages/asterisk-extra-sounds-en-gsm
packages/asterisk-extra-sounds-en-ulaw
packages/asterisk-moh-freeplay-alaw
packages/asterisk-moh-freeplay-g729
packages/asterisk-moh-freeplay-gsm
packages/asterisk-moh-freeplay-ulaw
packages/e17/e-wm_0.16.999.038.bb
packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch
packages/gcc/gcc-4.2.2/fortran-static-linking.patch
packages/gnutls/gnutls
packages/gnutls/gnutls-1.6.3
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/tasks/task-openmoko-toolchain-target.bb
packages/gpe-scap/gpe-scap-1.3
packages/linux/chumby-kernel
packages/monit
packages/monit/files
packages/monit/monit-4.10.1
packages/pwsafe
packages/swt
packages/swt/files
packages/xcursor-transparent-theme/xcursor-watchonly-theme
classes/java-library.bbclass
classes/java.bbclass
conf/machine/chumby.conf
packages/e17/e-wm_cvs.bb
packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch
packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch
packages/linux/chumby-kernel/chumby-override-cmdline.patch
packages/linux/chumby-kernel/defconfig
packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb
packages/monit/files/init
packages/monit/monit-4.10.1/init
packages/monit/monit_4.10.1.bb
packages/orinoco/orinoco-modules.inc
packages/pwsafe/pwsafe_0.2.0.bb
packages/rt2x00/rt73-chumby_1.2.bb
packages/supertux/files/gp2x.patch
packages/supertux/files/img-resize.sh
packages/supertux/files/supertux-smallsize-data.tar.bz2
packages/supertux/supertux-qvga_0.1.3.bb
packages/swt/files/Makefile
packages/swt/files/swt-hildon.patch
packages/swt/swt-gtk.inc
packages/swt/swt3.3-gtk_3.3.1.bb
packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
packages/swt/swt3.4-gtk_3.3+3.4M3.bb
packages/tasks/task-openmoko-toolchain-host.bb
packages/wifistix/wifistix-modules/sk_buff.patch
packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent
packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch
conf/checksums.ini
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openprotium.conf
conf/machine/collie.conf
conf/machine/fic-gta02.conf
conf/machine/include/zaurus-2.6.inc
conf/machine/include/zaurus-clamshell.inc
conf/machine/nokia770.conf
conf/machine/nokia800.conf
packages/cacao/cacao_0.98+hg20071001.bb
packages/cacao/cacaoh-native.inc
packages/cacao/files/cacao-0.98+hg-attachthread.patch
packages/e17/e-utils_cvs.bb
packages/e17/e-wm_0.16.999.041.bb
packages/e17/edje-editor_cvs.bb
packages/e17/edje-viewer_cvs.bb
packages/e17/entice_cvs.bb
packages/e17/entrance_0.9.0.010.bb
packages/e17/examine_cvs.bb
packages/e17/exhibit_cvs.bb
packages/e17/expedite_cvs.bb
packages/e17/rage_0.2.0.005.bb
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/edje-native_cvs.bb
packages/efl1/edje_cvs.bb
packages/efl1/eet_cvs.bb
packages/efl1/efreet_cvs.bb
packages/efl1/embryo_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/gcc/gcc-cross-sdk_4.2.2.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
packages/gnutls/gnutls.inc
packages/gnutls/gnutls_1.6.3.bb
packages/gpe-scap/gpe-scap_1.3.bb
packages/gpe-session-scripts/files/angstrom/matchbox-session
packages/gpe-session-scripts/files/matchbox-session
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-collie
packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
packages/linux/linux_2.6.23.bb
packages/meta/meta-toolchain-openmoko.bb
packages/meta/meta-toolchain.bb
packages/meta/slugos-packages.bb
packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/orinoco/orinoco-modules_0.13e.bb
packages/orinoco/orinoco-modules_0.15rc1.bb
packages/orinoco/orinoco-modules_0.15rc2.bb
packages/orinoco/orinoco-modules_cvs.bb
packages/supertux/files/supertux.desktop
packages/tasks/task-openmoko-debug.bb
packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
mtn:manual_merge
true
mtn:execute
packages/gsm/files/stdint.patch
packages/gpephone/libgpephone_svn.bb
packages/gsm/libgsmd-lips_svn.bb
Diffs:

#
# mt diff -ra0f0a04325ed193844895cf9b74e8b1b48deac4e -r0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec
#
# 
# 
# delete "conf/machine/include/collie-2.6.inc"
# 
# delete "conf/machine/include/poodle-2.6.inc"
# 
# delete "packages/asterisk-core-sounds-en-alaw"
# 
# delete "packages/asterisk-core-sounds-en-g729"
# 
# delete "packages/asterisk-core-sounds-en-gsm"
# 
# delete "packages/asterisk-core-sounds-en-ulaw"
# 
# delete "packages/asterisk-extra-sounds-en-alaw"
# 
# delete "packages/asterisk-extra-sounds-en-g729"
# 
# delete "packages/asterisk-extra-sounds-en-gsm"
# 
# delete "packages/asterisk-extra-sounds-en-ulaw"
# 
# delete "packages/asterisk-moh-freeplay-alaw"
# 
# delete "packages/asterisk-moh-freeplay-g729"
# 
# delete "packages/asterisk-moh-freeplay-gsm"
# 
# delete "packages/asterisk-moh-freeplay-ulaw"
# 
# delete "packages/e17/e-wm_0.16.999.038.bb"
# 
# rename "packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb"
# 
# rename "packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb"
# 
# rename "packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb"
# 
# rename "packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb"
#     to "packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb"
# 
# rename "packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb"
# 
# rename "packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb"
# 
# rename "packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb"
# 
# rename "packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
#     to "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
# 
# rename "packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb"
# 
# rename "packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb"
# 
# rename "packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb"
# 
# rename "packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb"
#     to "packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb"
# 
# rename "packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch"
#     to "packages/gcc/gcc-4.2.2/fortran-static-linking.patch"
# 
# rename "packages/gnutls/gnutls"
#     to "packages/gnutls/gnutls-1.6.3"
# 
# rename "packages/tasks/task-toolchain-openmoko-sdk.bb"
#     to "packages/tasks/task-openmoko-toolchain-target.bb"
# 
# add_dir "packages/gpe-scap/gpe-scap-1.3"
# 
# add_dir "packages/linux/chumby-kernel"
# 
# add_dir "packages/monit"
# 
# add_dir "packages/monit/files"
# 
# add_dir "packages/monit/monit-4.10.1"
# 
# add_dir "packages/pwsafe"
# 
# add_dir "packages/swt"
# 
# add_dir "packages/swt/files"
# 
# add_dir "packages/xcursor-transparent-theme/xcursor-watchonly-theme"
# 
# add_file "classes/java-library.bbclass"
#  content [ba884554b916e0ee77988f7e42644eb50f0bcf92]
# 
# add_file "classes/java.bbclass"
#  content [4c1064a0c1677fa3f136bebf5736ace413a11f30]
# 
# add_file "conf/machine/chumby.conf"
#  content [3d7a9c183a4567571b4914f1a614545e5029b69c]
# 
# add_file "packages/e17/e-wm_cvs.bb"
#  content [529ec72e179f26986c7e4391d4699e598b77096a]
# 
# add_file "packages/gcc/gcc-4.2.2/fortran-cross-compile-hack.patch"
#  content [544859e05e08d2a0b5639e1182a8a2a4ef114d07]
# 
# add_file "packages/gpe-scap/gpe-scap-1.3/allow-glade-2.4.0.patch"
#  content [3fca637842d4f56756161b44d99ea894218489ab]
# 
# add_file "packages/linux/chumby-kernel/chumby-override-cmdline.patch"
#  content [8305fa51831e4f5f03145b9ab02e8829bed237e7]
# 
# add_file "packages/linux/chumby-kernel/defconfig"
#  content [e441481afa7cbe13cb1efd4e7002b9688d07bedb]
# 
# add_file "packages/linux/chumby-kernel_2.6.16-chumby-1.2.bb"
#  content [11545265005ad661949a73715ea36b89f4bd6235]
# 
# add_file "packages/monit/files/init"
#  content [0803d04f265b5e23401f6611b137dd47114def35]
# 
# add_file "packages/monit/monit-4.10.1/init"
#  content [0803d04f265b5e23401f6611b137dd47114def35]
# 
# add_file "packages/monit/monit_4.10.1.bb"
#  content [ce8f34274bb715666a2aceab80b44e5f4b8bcbec]
# 
# add_file "packages/orinoco/orinoco-modules.inc"
#  content [a0f71de24feba1b09e5a8e110fed2b234ea823b7]
# 
# add_file "packages/pwsafe/pwsafe_0.2.0.bb"
#  content [74b026623cf0a33873ea495d93977109766da810]
# 
# add_file "packages/rt2x00/rt73-chumby_1.2.bb"
#  content [96ccbba0b9b10dc2424492a1baa986c6a2f1944c]
# 
# add_file "packages/supertux/files/gp2x.patch"
#  content [26a86f577e4742adc10c15df42c058f4cea5183a]
# 
# add_file "packages/supertux/files/img-resize.sh"
#  content [0179d1a7105160d62d20293a7513dd948a13cd3c]
# 
# add_file "packages/supertux/files/supertux-smallsize-data.tar.bz2"
#  content [982bfb74c80c28fa6574ec3ccd3facae4e943404]
# 
# add_file "packages/supertux/supertux-qvga_0.1.3.bb"
#  content [53598bc864a257e7201e4e07636d2e6c83095af2]
# 
# add_file "packages/swt/files/Makefile"
#  content [6a0e11147f246807075b03fa7fa27e739f8b6e5d]
# 
# add_file "packages/swt/files/swt-hildon.patch"
#  content [cc6d6cb67722d189122f70411ef01e0639206d86]
# 
# add_file "packages/swt/swt-gtk.inc"
#  content [bcadfa700e7fc0872ab1d3a38e456f41e5ebefed]
# 
# add_file "packages/swt/swt3.3-gtk_3.3.1.bb"
#  content [ac1e6656f8358a0ce3928cd18fcdc21d2d36511e]
# 
# add_file "packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb"
#  content [2659ee0d88eeab0a2f7012db8f483cc8a4e0373c]
# 
# add_file "packages/swt/swt3.4-gtk_3.3+3.4M3.bb"
#  content [cf948019bf5ff1d457cbe1999cc6651269b7ea70]
# 
# add_file "packages/tasks/task-openmoko-toolchain-host.bb"
#  content [b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c]
# 
# add_file "packages/wifistix/wifistix-modules/sk_buff.patch"
#  content [07ad752e578a675b4aaf3843012740c28acd3d2d]
# 
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent"
#  content [a5b22f1aa71c4d2079e2875c22ecfb1735d68612]
# 
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme/skip_watch_cursor.patch"
#  content [6b2c049ef8e46368a7a8c9d7cfac98a1eff1c03c]
# 
# patch "conf/checksums.ini"
#  from [6107a0e5221d7dd5b1ba6940f49cfd2a8d3e256c]
#    to [f05da39a10f23c8142329999e0bd7acc81e8dea6]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [2f7cb2290c8041be1845553e70a09af8c92e718d]
#    to [1243c122ad661be1683a045938d93537f205ce15]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [8119c811984dd538a4b239217a82174295ecb22f]
#    to [d560814623625b6b57fc9aad038a6e4e6b62f271]
# 
# patch "conf/distro/openprotium.conf"
#  from [675a168a57ce9b21aa838b950b5ae0da07243da2]
#    to [c91df50d1b1b24f6a52eba1264c1e195813952dd]
# 
# patch "conf/machine/collie.conf"
#  from [a0553e914a9461a2f8f27c4cf8972dcebb056d0d]
#    to [7c673b43c50f37bbb2d12b14434564b0e9613ec3]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [47adecd1ee4496da827ee13c515774484b0373ec]
#    to [9c53b1252d1b563a297e0d6174f4eb462b003de1]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
#    to [0baab00ebcdca461a1c5f13d5bcba53c6099622a]
# 
# patch "conf/machine/include/zaurus-clamshell.inc"
#  from [460b6649ab7636b92a7031abd0f2850fcb6700f5]
#    to [75189b78d2f98b4b5156904ea7515f88fcd23b77]
# 
# patch "conf/machine/nokia770.conf"
#  from [828d8946d7940a421a16941b49f4c1c5740fd755]
#    to [b58eed429663f0f6aabcf2e4b041d266fdc463f3]
# 
# patch "conf/machine/nokia800.conf"
#  from [ede2d35668185c917664bdbafa710c61e835ac69]
#    to [1e9e59dde23e9afccf1a426c1fb934923f8dd124]
# 
# patch "packages/cacao/cacao_0.98+hg20071001.bb"
#  from [d618915c42d4979c7f29cc99c5014d3bc2d99c50]
#    to [ab5bff912c3f54f9c37573994562c9a793c71e6f]
# 
# patch "packages/cacao/cacaoh-native.inc"
#  from [b5ccb2775f6560095089e77316fc173dd4abc9c5]
#    to [21cb933b74df6d2ac41c9593d5df8f193f74b51a]
# 
# patch "packages/cacao/files/cacao-0.98+hg-attachthread.patch"
#  from [8c2c1d3d004946d41425dd8ce6e7c4602fa41437]
#    to [4aaacaa58d869f91cd245871bcad90a6ec0c72c1]
# 
# patch "packages/e17/e-utils_cvs.bb"
#  from [e6eb282e49d65f3e06eb55ea717c134fba7af668]
#    to [13eda31345812ee61f2c570492ae524db13ae518]
# 
# patch "packages/e17/e-wm_0.16.999.041.bb"
#  from [5b5487dd36444b2311993eda6fd92201cc77756c]
#    to [3e2fd3edf15b79ca5ab6153ffedff83c9a4377d9]
# 
# patch "packages/e17/edje-editor_cvs.bb"
#  from [cfa6ec43d5f9faae882abbe2efa486f7fa6523f3]
#    to [534fc5e91d55fb8c29bd354a5e05e3cea2306190]
# 
# patch "packages/e17/edje-viewer_cvs.bb"
#  from [81171cf34f4ee80dedbbea9870abd1936cd37058]
#    to [c67aeed187c3498ae31201e23527742188a003ff]
# 
# patch "packages/e17/entice_cvs.bb"
#  from [274be844e586453c60181c552aaf67eaa4ce68f0]
#    to [33eec12af3a8a595505dee84d6347f9b5838ecf0]
# 
# patch "packages/e17/entrance_0.9.0.010.bb"
#  from [ed458d1dc2cf8825ad4757aebd77cb0b2b29e7db]
#    to [3a66d6b8fa5fb38b7fd0bb185a6767b5b47343ed]
# 
# patch "packages/e17/examine_cvs.bb"
#  from [870495278ea331e527bb9645ba0d19caec0672c8]
#    to [61fe2242600f8ed7c398a64d329d89d6208c6a10]
# 
# patch "packages/e17/exhibit_cvs.bb"
#  from [0fb73195eb74fba616a7e95d1b0fc13facb15932]
#    to [692c70acbd1a0589a77ca74304075419d2c345f4]
# 
# patch "packages/e17/expedite_cvs.bb"
#  from [a3eb9e6385c5b2460ac7c5d0c3509a4e97e5820f]
#    to [cfee447f9ceb3541ddb38d005d85add8ae8ad60b]
# 
# patch "packages/e17/rage_0.2.0.005.bb"
#  from [be8c5ba108c7b91ce0516d15c10fa44c67f9be4d]
#    to [04c645b7d3b04bcdf13b9188cb1283d991a72e39]
# 
# patch "packages/efl1/ecore-native_cvs.bb"
#  from [4a00d1d0cad23d61b7411ae50b847f83086398ce]
#    to [5bd60a7af1398231f76c6398fe56302fd0365b70]
# 
# patch "packages/efl1/ecore_cvs.bb"
#  from [e5059f4bf4f7c76e1c65effb2dcd11b7e18a4c0c]
#    to [d5252beb6447db426e62970a50a59407b9c1dc8b]
# 
# patch "packages/efl1/edbus_cvs.bb"
#  from [c1a0f93864dece01ef62aab214eb056162154ffa]
#    to [132848ec2182987753b4827a0c27d567ca12cce7]
# 
# patch "packages/efl1/edje-native_cvs.bb"
#  from [61b907b3153cd9a90f2727727c2eb99ff6a16c59]
#    to [3af2a3c86daed707172b160f5352e4e1f92518ed]
# 
# patch "packages/efl1/edje_cvs.bb"
#  from [354d625fd1e123d1629c55a11d24421decfc22a5]
#    to [ac767ddd6ef3e33594e36c32d80fcb551a3bb380]
# 
# patch "packages/efl1/eet_cvs.bb"
#  from [63e1fa0da683beda5648ae75c2cc04153f06b92b]
#    to [869675713b0e92b00b79fd8ff8fe0bbd329e76cc]
# 
# patch "packages/efl1/efreet_cvs.bb"
#  from [9493180d2ccf9d967fe7bd6096988708028f0eb0]
#    to [5fa16dafdd558aa8bf82a006243cb7c86950003a]
# 
# patch "packages/efl1/embryo_cvs.bb"
#  from [be59294be518936cb4e0986abd744b4a70e86e3e]
#    to [3004da545ec73d718d11b18e16c97a533af9ae75]
# 
# patch "packages/efl1/evas.inc"
#  from [cc99e778d7f3640905f0dc835736906c5393874c]
#    to [b5cd048c85bc9f9f299682fb9fc1db9a8a381a45]
# 
# patch "packages/efl1/evas_cvs.bb"
#  from [7ac3a08c9fc17a3cc7a34dc582fc93b978ab9144]
#    to [8c14a37af3d4c6356ba37624a420d4dc7b485196]
# 
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
#  from [eafe51eac49ac2790c536077488698261ee29452]
#    to [03f62477a6bd8456dc0f7e5444bf0e62bf2575c3]
# 
# patch "packages/gcc/gcc-4.2.2/fortran-static-linking.patch"
#  from [96ee0c885c5757fde97f61188ec0c799ae5c7b18]
#    to [e51538f27d036e3418faae17b7dcd656ae38313a]
# 
# patch "packages/gcc/gcc-cross-sdk_4.2.2.bb"
#  from [8ef30993fffbbd19108406cd37d0b36449e5143d]
#    to [c51f994c61ce378fb2761f8e6d0cc77071b8dcfe]
# 
# patch "packages/gcc/gcc-cross_4.2.2.bb"
#  from [bd6eaf9021e129dcbd70794a3e80ac820d764246]
#    to [638f8a17318b6c935909d7b7f11cc6506e57d6af]
# 
# patch "packages/gcc/gcc_4.2.2.bb"
#  from [6bcef9ceeb471bcf1d54c4ae08e78e9b80d6a44c]
#    to [b649640ada6aa7b3be9155792213ea7689d6e6ac]
# 
# patch "packages/gnutls/gnutls.inc"
#  from [cc20d75c7e1753143d7a8fd4b2ec7fc8a708868a]
#    to [684fa353da238f622dd47843a2ab39f725289869]
# 
# patch "packages/gnutls/gnutls_1.6.3.bb"
#  from [dbb7cf9f7c57730e2f8cac2d3f4c14485a44bf85]
#    to [00f6ee42f807520ea4255904e757ed8cd210a4da]
# 
# patch "packages/gpe-scap/gpe-scap_1.3.bb"
#  from [ea05f8ee476d853b1883d58d4bc62e8d23ba9041]
#    to [73e961b984f8eaea1c3a6678341b1484dd688c22]
# 
# patch "packages/gpe-session-scripts/files/angstrom/matchbox-session"
#  from [5f2775906eeda8b22303d2452c158ba979a9595d]
#    to [cd7ffc92541caae372d21de0550aacc7d535d533]
# 
# patch "packages/gpe-session-scripts/files/matchbox-session"
#  from [5c0f9302bc62e8b8612888f54ec5d2c9300d75ab]
#    to [864395d7fb408233687a04db272c51799b6d5d5d]
# 
# patch "packages/gpe-session-scripts/gpe-session-scripts_0.67.bb"
#  from [e886f9c3d56e6dba00f20b02fdb8cff205713397]
#    to [b9030ecb91f1a88e063dc31e35f8a61d905d29eb]
# 
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
#  from [fd3ecb56d2f926384dc852689d17e18430014b2e]
#    to [9ec0920876981474a325a47766fa7d50bbb1cfd3]
# 
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-collie"
#  from [d04adf43f4133208ae5284b94bbd81d1d721a81e]
#    to [de80ee68423529a4709a5d47badd9a1e383768fc]
# 
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb"
#  from [076ea04844ab570db5f22cfc2d543f19f9f2af3d]
#    to [bc12e1d906e1b92a01c582c78b78b98683f01099]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [f8ca05a376ad8770405546e8c39e711d2fcbb477]
#    to [578a8f7bc99edbd97bba396a1766993c401990d2]
# 
# patch "packages/meta/meta-toolchain-openmoko.bb"
#  from [2c36f31834b317cfdc81cff2dc8cd7db05229bcf]
#    to [76d692ed056a9397df52f5d27a16c97f29b032cd]
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [b52d096ec913c333f9bb14b192bc922b80854834]
#    to [d53849cfd4dc2f21fcd44b4cc0926382313fc1e9]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [1a2ceb929514b8bcf127cdcde0a9622c8ac4a28a]
#    to [9d6f880bd2880baef83e5822947f5771707add1a]
# 
# patch "packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb"
#  from [e3fd4a716a5bcfff74dd72a3a454d8c2ce401e7d]
#    to [d90b9e48b2570a1906b72dcb19d0a8764fe6c23b]
# 
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
#  from [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
#    to [90b2cf8a49d86bb43022f62052a46f47d57edcee]
# 
# patch "packages/orinoco/orinoco-modules_0.13e.bb"
#  from [b3160262a35ad7ebdea0018698a346c8d779e410]
#    to [42df7a5fe957c5a457e5b6d10f5fa99b0eccf8ee]
# 
# patch "packages/orinoco/orinoco-modules_0.15rc1.bb"
#  from [b585752da378cdbadf684f6e4698451b398e8f12]
#    to [2e800a3702a89c002b802721cb278ccc07a0c3c7]
# 
# patch "packages/orinoco/orinoco-modules_0.15rc2.bb"
#  from [812f6cf32cdf408de6e218e5e20e447358fc8e68]
#    to [365c34b2f550cda6dee19a2707bddd5521d4426f]
# 
# patch "packages/orinoco/orinoco-modules_cvs.bb"
#  from [b5b9752f46dc04b12fb12c8786ae4924cb7142a0]
#    to [5deb2baa3d4811d2c877109a966a271eed2abc9d]
# 
# patch "packages/supertux/files/supertux.desktop"
#  from [ca0d07025948eea625b61a4c138657fd300ff7ac]
#    to [f35df068437792660755385fb36d3287092c27ea]
# 
# patch "packages/tasks/task-openmoko-debug.bb"
#  from [6f16b58858e9a8858a34530bccc7db757e1303ab]
#    to [7f29d58704ca954c5e6e5ff766840cc0cff0eb5e]
# 
# patch "packages/tasks/task-openmoko-toolchain-target.bb"
#  from [4526d09a7c1a87ae65eac1a78599062dad98e280]
#    to [28005de19ec998c9abe5e7d383d158bf18bbfc14]
# 
# patch "packages/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb"
#  from [83636847e2f3799d184bc0748eee686270a61c79]
#    to [d0ff8b4ceeb0e382d68cfb2d7c93a44c3c848ed8]
# 
# patch "packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb"
#  from [96f40a33b74048e73d3054500e402469dc47f737]
#    to [ecb7bdd88141efe8406a5d86de1c5c26340090c9]
# 
#   set "packages/supertux/files/supertux-smallsize-data.tar.bz2"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xcursor-transparent-theme/xcursor-watchonly-theme/20xcursor-transparent"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- classes/java-library.bbclass	ba884554b916e0ee77988f7e42644eb50f0bcf92
+++ classes/%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -re55bf39595a78df12d17e4b80e9ed474ad5a467d -r0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec
#
# 
# 
# delete "packages/gsm/files/stdint.patch"
# 
# add_file "packages/gpephone/libgpephone_svn.bb"
#  content [c3f4dfe67ee079fe71f23797fde9a011e9fa8fae]
# 
# patch "packages/gsm/libgsmd-lips_svn.bb"
#  from [9ce3eff62bdc12b8fdc3880b21d14c4ddca11602]
#    to [5a08648332d815a28b314d8a0046b2a0e629b0bd]
# 
============================================================
--- packages/gpephone/libgpephone_svn.bb	c3f4dfe67ee079fe71f23797fde9a011e9fa8fae
+++ packages/gpephone/libgpephone_svn.bb	c3f4dfe67ee079fe71f23797fde9a011e9fa8fae
@@ -0,0 +1,14 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "Base library for GPE phone environment."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ gtk-doc dbus-glib"
+PV = "0.4+svnr-${SRCREV}"
+PR          = "r0"
+
+SRC_URI = "${GPEPHONE_SVN}"
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/gsm/libgsmd-lips_svn.bb	9ce3eff62bdc12b8fdc3880b21d14c4ddca11602
+++ packages/gsm/libgsmd-lips_svn.bb	5a08648332d815a28b314d8a0046b2a0e629b0bd
@@ -6,10 +6,9 @@ PV = "0.0+svnr${SRCREV}"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel libtapi libgsmd-dev"
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=gsm \
-           file://stdint.patch;patch=1;pnum=0 \
            file://gsmd \
            file://default"

More information about the Openembedded-commits mailing list