[oe-commits] org.oe.dev merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'

Sat Apr 5 22:10:51 UTC 2008

merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'
     and 'edac95232b05ccd8efaeee530e0442683d1ef50a'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3cb278173a15bedfbc4933dfb497f8b232b8b5c1
ViewMTN: http://monotone.openembedded.org/revision/info/3cb278173a15bedfbc4933dfb497f8b232b8b5c1
Files:
1
packages/classpath/classpath-minimal_0.97.bb
packages/classpath/classpath_0.97.bb
packages/openttd/openttd_0.6.0-beta4.bb
packages/fakeroot/fakeroot-native_1.9.1.bb
packages/fakeroot/fakeroot-native_1.9.4.bb
packages/fakeroot/fakeroot_1.9.1.bb
packages/fakeroot/fakeroot_1.9.4.bb
packages/gnuplot/gnuplot_4.2.2.bb
packages/gnuplot/gnuplot_4.2.3.bb
packages/hostap/hostap-daemon-0.6.0
packages/hostap/hostap-daemon-0.6.3
packages/hostap/hostap-daemon_0.6.0.bb
packages/hostap/hostap-daemon_0.6.3.bb
packages/libpixman/libpixman_0.9.6.bb
packages/libpixman/libpixman_0.10.0.bb
packages/wxwidgets/wxbase_2.6.2.bb
packages/wxwidgets/wxbase_2.6.4.bb
packages/wxwidgets/wxbase_2.7+cvs.bb
packages/wxwidgets/wxbase_2.8.7.bb
packages/wxwidgets/wxwidgets_2.6.3.bb
packages/wxwidgets/wxwidgets_2.8.7.bb
packages/gnuradio/gnuradio-3.1.2
packages/libopieobex/files
packages/sdcc/sdcc-2.8.0
packages/wxwidgets/wxbase-2.8.7
conf/machine/include/tune-x86.inc
contrib/mtn2git/update-script.example
packages/abiword/abiword-plugins_2.6.0.bb
packages/abiword/abiword_2.6.0.bb
packages/abiword/files/abiword-cxx-for-ld-fix.patch
packages/classpath/classpath-minimal_0.97.1.bb
packages/classpath/classpath_0.97.1.bb
packages/glibc/files/glibc-includes-fixed-isystem.patch
packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch
packages/gnuradio/gnuradio_3.1.2.bb
packages/klibc/files/dash_readopt.patch
packages/libopieobex/files/disable-bt-check.patch
packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff
packages/openttd/openttd_0.6.0.bb
packages/sdcc/sdcc-2.8.0/use-native-tools.patch
packages/sdcc/sdcc-native_2.8.0.bb
packages/sdcc/sdcc_2.8.0.bb
packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch
packages/wxwidgets/wxbase.inc
packages/wxwidgets/wxwidgets.inc
packages/wxwidgets/wxwidgets_2.6.4.bb
classes/autotools.bbclass
classes/base.bbclass
classes/cpan.bbclass
classes/kernel.bbclass
conf/checksums.ini
conf/distro/include/angstrom-glibc.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/beagleboard.conf
conf/machine/include/tune-cortexa8.inc
conf/machine/include/tune-strongarm.inc
conf/machine/x86.conf
packages/abiword/abiword-plugins_2.5.1.bb
packages/abiword/abiword-plugins_2.5.2.bb
packages/alsa/alsa-state/tosa/asound.state
packages/flumotion/flumotion_0.4.1.bb
packages/gcc/gcc-package-target.inc
packages/glibc/eglibc_svn.bb
packages/glibc/glibc.inc
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/glibc/glibc_cvs.bb
packages/gnome/libgnomecups_0.2.2.bb
packages/gnuplot/gnuplot.inc
packages/gnuplot/gnuplot_4.0.0.bb
packages/gnuplot/gnuplot_cvs.bb
packages/gnuplot/qtplot_0.2.bb
packages/gnuradio/gnuradio.inc
packages/gnuradio/gnuradio_svn.bb
packages/gtk+/gtk+_2.10.14.bb
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc_1.5.bb
packages/libopieobex/libopieobex0_1.2.3.bb
packages/libopieobex/libopieobex0_cvs.bb
packages/linux/linux-beagleboard/defconfig
packages/linux/linux-beagleboard_git.bb
packages/linux/linux-rp-2.6.24/defconfig-collie
packages/linux/linux-rp_2.6.24.bb
packages/linux/linux-rt_2.6.24.bb
packages/linux/linux.inc
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/linux/linux_2.6.23.bb
packages/linux/linux_2.6.24.bb
packages/meta/slugos-packages.bb
packages/ncurses/ncurses.inc
packages/ncurses/ncurses_5.4.bb
packages/packagekit/packagekit_git.bb
packages/rsync/rsync_2.6.9.bb
packages/slugos-init/files/leds
packages/slugos-init/slugos-init_4.8.bb
packages/tasks/task-opie-all.bb
packages/u-boot/u-boot.inc
packages/wv/wv_1.2.0.bb
packages/zaurus-updater/zaurus-updater.bb
packages/zaurusd/files/alsa-6000x-default.state.patch
site/common
site/common-uclibc
conf/distro/include/moko-autorev.inc
Diffs:

#
# mt diff -r2bc71b9b93f22417784c3a4ed3576a76841878f2 -r3cb278173a15bedfbc4933dfb497f8b232b8b5c1
#
#
#
# delete "packages/classpath/classpath-minimal_0.97.bb"
# 
# delete "packages/classpath/classpath_0.97.bb"
# 
# delete "packages/openttd/openttd_0.6.0-beta4.bb"
# 
# rename "packages/fakeroot/fakeroot-native_1.9.1.bb"
#     to "packages/fakeroot/fakeroot-native_1.9.4.bb"
# 
# rename "packages/fakeroot/fakeroot_1.9.1.bb"
#     to "packages/fakeroot/fakeroot_1.9.4.bb"
# 
# rename "packages/gnuplot/gnuplot_4.2.2.bb"
#     to "packages/gnuplot/gnuplot_4.2.3.bb"
# 
# rename "packages/hostap/hostap-daemon-0.6.0"
#     to "packages/hostap/hostap-daemon-0.6.3"
# 
# rename "packages/hostap/hostap-daemon_0.6.0.bb"
#     to "packages/hostap/hostap-daemon_0.6.3.bb"
# 
# rename "packages/libpixman/libpixman_0.9.6.bb"
#     to "packages/libpixman/libpixman_0.10.0.bb"
# 
# rename "packages/wxwidgets/wxbase_2.6.2.bb"
#     to "packages/wxwidgets/wxbase_2.6.4.bb"
# 
# rename "packages/wxwidgets/wxbase_2.7+cvs.bb"
#     to "packages/wxwidgets/wxbase_2.8.7.bb"
# 
# rename "packages/wxwidgets/wxwidgets_2.6.3.bb"
#     to "packages/wxwidgets/wxwidgets_2.8.7.bb"
# 
# add_dir "packages/gnuradio/gnuradio-3.1.2"
# 
# add_dir "packages/libopieobex/files"
# 
# add_dir "packages/sdcc/sdcc-2.8.0"
# 
# add_dir "packages/wxwidgets/wxbase-2.8.7"
# 
# add_file "conf/machine/include/tune-x86.inc"
#  content [6df546996c08b7962ed5c2698180a4846a70cda9]
# 
# add_file "contrib/mtn2git/update-script.example"
#  content [9f8caa85b400e9a7af49d8714a42648ffc346027]
# 
# add_file "packages/abiword/abiword-plugins_2.6.0.bb"
#  content [08cb74f7ccc32068a49834d218b474e7f487b3d5]
# 
# add_file "packages/abiword/abiword_2.6.0.bb"
#  content [e1a10b5275d12dca63a83d0c19b8277c9cd110ea]
# 
# add_file "packages/abiword/files/abiword-cxx-for-ld-fix.patch"
#  content [273f436489f287d13297340c5a6475232a4f933e]
# 
# add_file "packages/classpath/classpath-minimal_0.97.1.bb"
#  content [0ef04bfd389c769d1b67f97975fcdd35f68c4855]
# 
# add_file "packages/classpath/classpath_0.97.1.bb"
#  content [db8b170f0f6f53145caf1d439efa49971f8c4475]
# 
# add_file "packages/glibc/files/glibc-includes-fixed-isystem.patch"
#  content [e4a15eb6c16cd9cc9d0fb3ed592ed251c717f485]
# 
# add_file "packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch"
#  content [072034ad536d8d56f377a4eaf7757fddbc7f86fc]
# 
# add_file "packages/gnuradio/gnuradio_3.1.2.bb"
#  content [e935ec6d343e8fdb415db8992f198c118b3780af]
# 
# add_file "packages/klibc/files/dash_readopt.patch"
#  content [2d3de90f28a29999a66550e5aaca8a8f3cfaf83a]
# 
# add_file "packages/libopieobex/files/disable-bt-check.patch"
#  content [4531ca6db356b9e34c43ab4986901f13cbef2ad4]
# 
# add_file "packages/libpixman/libpixman_0.9.6.bb"
#  content [6058783591b5e89abad921c75fba92e49effa18c]
# 
# add_file "packages/linux/linux-beagleboard/beagle-board-patch-dirk.diff"
#  content [26d33fe3eee092e9a76e58699a234de1c191e2a3]
# 
# add_file "packages/openttd/openttd_0.6.0.bb"
#  content [9f2f06623392c97741dbe3c66bc3950b4462ecd0]
# 
# add_file "packages/sdcc/sdcc-2.8.0/use-native-tools.patch"
#  content [ee119cc69f4ca9df4d8592453bfe90bcf68b8c17]
# 
# add_file "packages/sdcc/sdcc-native_2.8.0.bb"
#  content [deceb5882dbe288232fde80041786a1bffec1a69]
# 
# add_file "packages/sdcc/sdcc_2.8.0.bb"
#  content [366906abfdd83eba56b9ad771c69484ab0468986]
# 
# add_file "packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch"
#  content [d8080db0d114246d6c73a05b6686c28507f58bb7]
# 
# add_file "packages/wxwidgets/wxbase.inc"
#  content [4738ec69cd6eb08328207aeec696ce949d662791]
# 
# add_file "packages/wxwidgets/wxwidgets.inc"
#  content [eccb35a8930a1ba389f737f0dba48b967cdee4b1]
# 
# add_file "packages/wxwidgets/wxwidgets_2.6.4.bb"
#  content [53e280a19decc87006f8d10412a482d67ada6c82]
# 
# patch "classes/autotools.bbclass"
#  from [aca69d07902b5d16cc3be9cc17ba2089144114e5]
#    to [9a1f7d12a63cbf1e66e09baeb4353d43d849f4fa]
# 
# patch "classes/base.bbclass"
#  from [4d25edd67b14eaf17a59f9a302de6db47d325d27]
#    to [5e061e6d4d77b3580be191bd0bf309b49d146574]
# 
# patch "classes/cpan.bbclass"
#  from [7a1ee7c60006de5f1fdeedf6a41459c55b0a894e]
#    to [37cd3844dffec6f7c9516f2353be95eda9f98c1a]
# 
# patch "classes/kernel.bbclass"
#  from [56eee918e2285b8298e9e2feecc353c0723683aa]
#    to [a2023556ff7f2b754b62219b795ef6bf47185281]
# 
# patch "conf/checksums.ini"
#  from [d56bc810ab61b67ed3f8810f504ed68e4e4c3a7d]
#    to [638739f66d6d9eca9fb02ee10e690f951d175bdf]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [b655e2595b0beb2adddbf6f2e4f114b047128d2a]
#    to [c9c2178c9ac5351dd18a863b3007828d54e05c14]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [24487dafafd112c005611a91cb976bf92efd6493]
#    to [1474e937489b8938c1858d53c427068ce882e743]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [2936a46334bf489c296dcf2c902b58adedb6cf91]
#    to [6ff9f0304e5d4462c4374384fd4e7eba9fda15a6]
# 
# patch "conf/machine/beagleboard.conf"
#  from [1143999fa2292dd52e80f29182a3b2a17ddd0494]
#    to [600f5c43f12d2de1e453ff501297abf5a5cc0f64]
# 
# patch "conf/machine/include/tune-cortexa8.inc"
#  from [734dda5b38d4eb44e7d1a77fec089371a02c50be]
#    to [735ab38d1af46e583d3967f46d6de643ea138edb]
# 
# patch "conf/machine/include/tune-strongarm.inc"
#  from [05471dc0b54ab7a2645738ef50732cc747c8c18b]
#    to [2d96262fc7de2c227cb3bf36728b3c7a0dc3b5a1]
# 
# patch "conf/machine/x86.conf"
#  from [96a9c14683b22db4b60943164fface49cc11e869]
#    to [5309d246381ff3e42c6ced3d4aa2fc56deb4eb9b]
# 
# patch "packages/abiword/abiword-plugins_2.5.1.bb"
#  from [62e4936aba824f0155caa54f5911ce2750c5a7ae]
#    to [80bb349de2e542daecc78e094218894b5f117405]
# 
# patch "packages/abiword/abiword-plugins_2.5.2.bb"
#  from [b02d055a699a18d721d373c5bcbe26e5d8a5f882]
#    to [156bd16e63ca8fba3be27dade721ca7936fbd5cf]
# 
# patch "packages/alsa/alsa-state/tosa/asound.state"
#  from [286b6f6d135ae0b735245ec22b02789d855daf99]
#    to [12a22ff5cbc6b483810a7b50d98fc34c24a7063d]
# 
# patch "packages/flumotion/flumotion_0.4.1.bb"
#  from [70c85428af57546952476b8d1a63581c1f51b43b]
#    to [888ee41205578b445b00295429cddc535e80a0f3]
# 
# patch "packages/gcc/gcc-package-target.inc"
#  from [6217d30373536c98f38cfc4aa3b0ac894933a675]
#    to [4b684b472845fdcfa0097afca580c0a3767aa195]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [cb974e86b28e37ab0ea845060367eb8c4e91a117]
#    to [1328dce82f5660e9a4ffa188f48b4f362872208a]
# 
# patch "packages/glibc/glibc.inc"
#  from [e9a2a880277298ca08e7f53a4e5c69127415a5ed]
#    to [94a32473f1193137d45da97d6ed786ae9e755094]
# 
# patch "packages/glibc/glibc_2.2.5.bb"
#  from [3d1bd1a720c5abaa3b42442f987772ecd2eb42ab]
#    to [34af38798fe6eb076ee1e44612cfb2e740abf174]
# 
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
#  from [4d898b91a2840cd06b8471e3dd810cfaad1f8766]
#    to [808ed86ced75140a1d3fc3218b2496f9cc4bf940]
# 
# patch "packages/glibc/glibc_2.3.2.bb"
#  from [b0f7c4497560c2dde6b48a9961d91b310f8a47b7]
#    to [c9271dd5bdf2fac00df5b90d4757176c5c7bb687]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
#  from [05d20a34a2d2225af3c8d5149a3158a9c2d14f6f]
#    to [de5dc3446aa94c3abfdc1f8edff39f19084142f7]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
#  from [bd0d5c36cebcff81c42b194508902193fca177b0]
#    to [cb07d9d3c55c4fcfc23ddfe1650281885b9ea5f6]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
#  from [19c9e2bd087f04ab2e44d5baafdd7ccd428f86c7]
#    to [07a49aaf94192d47ee2118328e09b13cf4c5aaa4]
# 
# patch "packages/glibc/glibc_2.3.3.bb"
#  from [682047d9f499de426cd3e8ceb45b9eb03d703156]
#    to [94f418faf76e360cb344f13e886941c63faeaa1c]
# 
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
#  from [c8fa5f79d6b7a85274b7c696675c6181bfb4423e]
#    to [002681533641cc0727653c163caa2b89d9554585]
# 
# patch "packages/glibc/glibc_2.4.bb"
#  from [6f8f5b26e247b17ac6456d6714d55cd940d438f0]
#    to [90ea22d4701fd976ebf54996b4f0f0f75fcbcb15]
# 
# patch "packages/glibc/glibc_2.5.bb"
#  from [4448b5d00d178de9e03d1a43d7c5803abbb93d2c]
#    to [0df9115aff23a65cf60cf318463e92afd9d4187d]
# 
# patch "packages/glibc/glibc_2.6.1.bb"
#  from [5ed9c93ca660afcc61380030ee1d8c4340997ae3]
#    to [d7da717daed6dd7a23f3d54789b6f28eafa6314a]
# 
# patch "packages/glibc/glibc_2.7.bb"
#  from [f62da4b0450f5fe51216328cf863ed074424defd]
#    to [0315c4d0fd55ed746d83fbe2e7512ce1dfe46237]
# 
# patch "packages/glibc/glibc_cvs.bb"
#  from [a323893710dd11d890799f9dac684c444d445a8f]
#    to [65a43c48f600ea8305861ae2b9bc8d44ac65c8d6]
# 
# patch "packages/gnome/libgnomecups_0.2.2.bb"
#  from [1e18b0c069eb97114d915039a5d4e0acffaa845c]
#    to [fcc1915e40dea30f0ee7712a6c1f3b198c47e8f2]
# 
# patch "packages/gnuplot/gnuplot.inc"
#  from [b5e69f41a9e8e5a0ed2bfe41cc35e1f90f02f6f9]
#    to [472ba166bf164babe286aa79617ef3b8992217aa]
# 
# patch "packages/gnuplot/gnuplot_4.0.0.bb"
#  from [87abbc86f29e81b6a1a2491e194323a8218723b7]
#    to [16871008e8222bc295d00cef8e2f21a08409658e]
# 
# patch "packages/gnuplot/gnuplot_cvs.bb"
#  from [fc07214c5ba39477584bd102d53aa602c87ab77c]
#    to [4f3c30d956c516dca8f8b486c9ea6b6b86383588]
# 
# patch "packages/gnuplot/qtplot_0.2.bb"
#  from [4eef3a5f414fdc6d5d2a0278712d1645cebda39a]
#    to [7d27f8f8f01ee2a765705733292187ae64c0c7e2]
# 
# patch "packages/gnuradio/gnuradio.inc"
#  from [3f1b2b5f3c69879f89afcc926dccabf8d0e5d5fe]
#    to [f3784a8b6e3c9fcbccabd3014638b35285a1adba]
# 
# patch "packages/gnuradio/gnuradio_svn.bb"
#  from [60afef07fd78cf20eec7eaec38e79318fa6ec205]
#    to [c208d7c99e0267f8380bd0efe7d3d2bffdfb6247]
# 
# patch "packages/gtk+/gtk+_2.10.14.bb"
#  from [3313c2f35c6f628c61f3ba5b11f173ecd26a3a8d]
#    to [247d2ac5425310cb2d950088afd144550b98e043]
# 
# patch "packages/klibc/klibc-common.inc"
#  from [0b9a0adbd117c10f5bb84fbf3ee804a7373b5cd4]
#    to [f63bcd79d6bf261ecf2b188db14fc0d05f566d49]
# 
# patch "packages/klibc/klibc-utils-static_1.5.bb"
#  from [bb59cb03472acf16f6afda69a0226c56b3cc6069]
#    to [294377bb13d3cf5efd6994870abd0ab9791b2c7b]
# 
# patch "packages/klibc/klibc_1.5.bb"
#  from [54454c58faea62364d535ea1e36fb73b2e9f8115]
#    to [7a3e8ba7ef141381c3e8bc1f15829474bcd8e2d8]
# 
# patch "packages/libopieobex/libopieobex0_1.2.3.bb"
#  from [d78020e74a92f741a163fff78e554f93bd96f91e]
#    to [0c803763dbf3b86af956d5c0b3d2520ece6bcc8c]
# 
# patch "packages/libopieobex/libopieobex0_cvs.bb"
#  from [0e5adb40de222cf5c66a7884fa46c00160d179a7]
#    to [8f777b6cc6d58e21975d108a806c55a81f01f4a4]
# 
# patch "packages/linux/linux-beagleboard/defconfig"
#  from [ba2feaf2f0083ac74de52a41b71871a616cffc51]
#    to [2f05b3e1110f33d603ff766c5f6eaa3de119b09c]
# 
# patch "packages/linux/linux-beagleboard_git.bb"
#  from [9c81d0693b4bfa32ed8d26b5a08369093b64bbcd]
#    to [077c803264f4eb6f92026728767864c3ed0ce619]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-collie"
#  from [00f12162c27b673416c405423b28120b2a874dfe]
#    to [8208bbebbe88540eb31ca08464d577669e2350f2]
# 
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [ce10df6d3a73ef3738f0718a582cff77e16c5954]
#    to [e4a4aabc3012812e10c0db59477c0588e77a0d80]
# 
# patch "packages/linux/linux-rt_2.6.24.bb"
#  from [29d97acddf75b09d01099358d07240db5d4e2353]
#    to [108bbff7661bc9d0a62d80e522cfb37313ce823c]
# 
# patch "packages/linux/linux.inc"
#  from [0196432d82c97552c01b010a212e24c2a8b0016a]
#    to [7bf95936e9aa2c19910b87746edc070ad1cdbea5]
# 
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
#  from [8cef3230be1ba924b6e2c80492f1092a17566910]
#    to [801134850169bd093cb2c9401f2e93bbd3acc903]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [2440043a73616ef8837486eec4d51aa891d62868]
#    to [6991c88082897d8ca8c8f3777423bdb092b34a0b]
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [4eabbe972f1ffeca4ea26e4d897079e1542a5624]
#    to [1698797d4e832dd0ac53b480d89c620c02d4add1]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [f72a5746db26eeb3651f9bc8be05f02450d39c48]
#    to [a8de050f9b9bde46ec2fe91cdf9d93c69da445cb]
# 
# patch "packages/ncurses/ncurses.inc"
#  from [7eb4e260d67cd98e1401062553cf01da9cfb97c7]
#    to [4164caed933388463dadf057e4b722cfd6631553]
# 
# patch "packages/ncurses/ncurses_5.4.bb"
#  from [1b3d153d70dfb9c8369190b60cb214c75e79fcfb]
#    to [c26a0d1dc90281a8f33c6cfbbe371959f12698ad]
# 
# patch "packages/packagekit/packagekit_git.bb"
#  from [fc3f7a476902a37e1583bae4e519d012d218598a]
#    to [360888f913726f29b6299c269b64f58b48fe5834]
# 
# patch "packages/rsync/rsync_2.6.9.bb"
#  from [c04a11b738d476c5a38376838a0c9a42a41cc5b4]
#    to [46d56c1ae65397da35a2b8871cfecde62e0a382e]
# 
# patch "packages/slugos-init/files/leds"
#  from [24aa798d8ca8877e75d2307dff73aedb6e7d107a]
#    to [a8c1cfca1b8aa19ac2ec92d4835b46b680b1b2fe]
# 
# patch "packages/slugos-init/slugos-init_4.8.bb"
#  from [d527fb3796c109605dc769795fc18fb7f0c2e066]
#    to [75e3e3bbb749ba3ed4b9dd416c48f960db65b58f]
# 
# patch "packages/tasks/task-opie-all.bb"
#  from [15c14539dc8f8cae41b6fac4fa108dce9012a130]
#    to [247d329aa6a21cecb1f4f74f1a838072b8aa22d8]
# 
# patch "packages/u-boot/u-boot.inc"
#  from [d4f085c1b9855dc02618f4cf5c5e6887bfbfb4e9]
#    to [7917f362ce1c8e8af7d66f127b3249c45484d29b]
# 
# patch "packages/wv/wv_1.2.0.bb"
#  from [dd195b7fef9868817a0197412faacfbc5978e525]
#    to [6c83952d5cd537068999ca340f7e8e9135646cbd]
# 
# patch "packages/wxwidgets/wxbase_2.6.4.bb"
#  from [9a0349a002c487ae06200180300c12a4fe92ec39]
#    to [cfd1c0469ead8760e67d21a3ee1b1b963f1ed0f9]
# 
# patch "packages/wxwidgets/wxbase_2.8.7.bb"
#  from [0aeb3fb06613533a94e4896159c46c2ca079e2d1]
#    to [98a18ce02394987f97007f6b643a9299f830e688]
# 
# patch "packages/wxwidgets/wxwidgets_2.8.7.bb"
#  from [fc1afd8d31bcfa1da4f98844e54b445e550ec02b]
#    to [ae1f88cb8a91f0395b7105c031dd88471e2709c0]
# 
# patch "packages/zaurus-updater/zaurus-updater.bb"
#  from [6e0132a319145e0bee0939723f38518cc48760b8]
#    to [2b959c7a89c5e81e41024dbd651be2f09998f09e]
# 
# patch "packages/zaurusd/files/alsa-6000x-default.state.patch"
#  from [2940f776646d13eb005ea2b593a31b403c0de924]
#    to [43a34a521c730c8997711c08b9f9217794ae97c4]
# 
# patch "site/common"
#  from [cdf94deb262bc3c01c24a16c1228e5b016e9fb04]
#    to [857abced4aa9fe4d65b58b9a23c6d110159eb31a]
# 
# patch "site/common-uclibc"
#  from [a086778ff7aa07ec040f6f0a673669a4c4c3e38d]
#    to [5e2a71f7c17c399176ed9badbe2e50fd7b45deea]
#
============================================================

--- conf/machine/include/tune-x86.inc	6df546996c08b7962ed5c2698180a4846a70cda9
+++ conf/machine/include/tune-x86.inc	6df546996c08b7962ed5c2698180a4846a70cda9
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=i486"
+
+
============================================================
--- contrib/mtn2git/update-script.example	9f8caa85b400e9a7af49d8714a42648ffc346027
+++ contrib/mtn2git/update-script.example	9f8caa85b400e9a7af49d8714a42648ffc346027
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+export PATH=/home/zecke/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
+
+cd $HOME/mtn2git-scm/oe-convert/
+
+# Update monotone
+mtn --db ../OE.mtn pull monotone.linuxtogo.org "org.openembedded.*"
+
+OLD_OE_DIR=openembedded-git.$$.$RANDOM
+
+git-clone -l openembedded-git $OLD_OE_DIR
+cp git-import-marks2 $OLD_OE_DIR/
+cp mtn2git-status.v2 $OLD_OE_DIR/
+cp mtn2git-marks     $OLD_OE_DIR/
+
+cd openembedded-git
+# Convert (this could fail as our marks are not complete...) and we hardcode the revision
+#../../mtn2git/mtn2git.py --db ../../OE.mtn --marks=../mtn2git-marks --status=../mtn2git-status.v2 2> /dev/null | git-fast-import --date-format=rfc2822 --import-marks=../git-import-marks2 --export-marks=../git-import-marks2
+../../mtn2git/mtn2git.py --db ../../OE.mtn --marks=../mtn2git-marks --status=../mtn2git-status.v2 | git-fast-import --date-format=rfc2822 --import-marks=../git-import-marks2 --export-marks=../git-import-marks2
+
+
+
+# Push all changes to the server, update the master tag as well
+for branch in dev dreambox documentation oetest oz354x packaged-staging oz354fam083 angstrom-2007.12-stable entity stable;
+do
+    git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.$branch;
+done
+
+#dev is our master
+git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.dev:master;
+
============================================================
--- packages/abiword/abiword-plugins_2.6.0.bb	08cb74f7ccc32068a49834d218b474e7f487b3d5
+++ packages/abiword/abiword-plugins_2.6.0.bb	08cb74f7ccc32%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -redac95232b05ccd8efaeee530e0442683d1ef50a -r3cb278173a15bedfbc4933dfb497f8b232b8b5c1
#
#
#
# patch "conf/distro/include/moko-autorev.inc"
#  from [9a1c96718efce77233cdcd54100dcf160e30b2c4]
#    to [8da4790adafd1e42f3daf64be054e6bc26ee8c2e]
#
============================================================
--- conf/distro/include/moko-autorev.inc	9a1c96718efce77233cdcd54100dcf160e30b2c4
+++ conf/distro/include/moko-autorev.inc	8da4790adafd1e42f3daf64be054e6bc26ee8c2e
@@ -1,3 +1,10 @@
+SRCREV_pn-assassin ?= "${AUTOREV}"
+SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
+SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-dfu-util ?= "${AUTOREV}"
+SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+SRCREV_pn-illume ?= "${AUTOREV}"
+
 SRCREV_pn-libgsmd ?= "${AUTOREV}"
 SRCREV_pn-libjana ?= "${AUTOREV}"
 SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
@@ -7,16 +14,10 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUT
 SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 
-SRCREV_pn-assassin ?= "${AUTOREV}"
-SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
-SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-multitap-pad ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
-SRCREV_pn-opkg ?= "${AUTOREV}"
-SRCREV_pn-opkg-native ?= "${AUTOREV}"
 
-SRCREV_pn-multitap-pad ?= "${AUTOREV}"
-
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
@@ -52,12 +53,12 @@ SRCREV_pn-openocd-native ?= "${AUTOREV}"
 
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
 
 SRCREV_pn-python-gsmd ?= "${AUTOREV}"
 
 SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}"
-SRCREV_pn-dfu-util ?= "${AUTOREV}"
-SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
 SRCREV_pn-usbpath ?= "${AUTOREV}"
 SRCREV_pn-usbpath-native ?= "${AUTOREV}"




