[oe-commits] org.oe.dev merge of '396d43c9459edaab2f04c5dd3825de0391fc1b73'
thebohemian commit
openembedded-commits at lists.openembedded.org
Mon Jan 14 08:07:36 UTC 2008
merge of '396d43c9459edaab2f04c5dd3825de0391fc1b73'
and 'e4f83871a267ab0720e73ef096ce3ab5fc40a303'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: ba76f4856806d81e983ec7db3a011d59a30abf15
ViewMTN: http://monotone.openembedded.org/revision/info/ba76f4856806d81e983ec7db3a011d59a30abf15
Files:
1
packages/navit/files/compile-fix.patch
packages/navit/navit_0.0.1.bb
packages/navit/navit_0.0.2.bb
packages/xerces-c/xerces-c_2.6.0.bb
packages/xerces-c/xerces-c_2.7.0.bb
conf/machine/include/tune-strongarm.inc
conf/machine/include/tune-strongarm1100.inc
packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
packages/alsa/alsa-state/fic-gta02
packages/asterisk/asterisk-1.4.17
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/dtnrg
packages/e17/edje-viewer
packages/linux/linux-2.6.22.6/mx31moboard
packages/netbase/netbase/mx31moboard
packages/supertux/files
conf/machine/mx31moboard.conf
packages/alsa/alsa-state/fic-gta02/asound.state
packages/alsa/alsa-state/fic-gta02/stereoout.state
packages/asterisk/asterisk-1.4.17/Makefile.patch
packages/asterisk/asterisk-1.4.17/init
packages/asterisk/asterisk-1.4.17/logrotate
packages/asterisk/asterisk-1.4.17/sounds.xml.patch
packages/asterisk/asterisk-1.4.17/volatiles
packages/asterisk/asterisk_1.4.17.bb
packages/asterisk-core-sounds-en-alaw/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-core-sounds-en-gsm/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-extra-sounds-en-alaw/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-extra-sounds-en-gsm/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-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/dtnrg/dtn_2.5.0.bb
packages/e17/edje-viewer/no-minimal-size.patch
packages/gcc/gcc-cross-sdk_4.2.2.bb
packages/gtk+/gtk+-2.10.14/small-gtkfilechooser.patch
packages/imagemagick/imagemagick-native_6.3.5-10.bb
packages/images/openmoko-python-devel-image.bb
packages/linux/linux-2.6.22.6/mx31moboard/defconfig
packages/netbase/netbase/mx31moboard/interfaces
packages/python/python-edbus_cvs.bb
packages/python/python-efl-examples.bb
packages/roadmap/files/roadmap_path.patch
packages/supertux/files/supertux.desktop
packages/supertux/files/supertux.png
packages/supertux/supertux_0.1.3.bb
packages/tasks/task-openmoko-python-devel.bb
packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
packages/xerces-c/xerces-c_2.8.0.bb
classes/insane.bbclass
classes/sanity.bbclass
classes/sdl.bbclass
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/angstrom.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/collie.conf
conf/machine/h3600.conf
conf/machine/htcwallaby.conf
conf/machine/include/collie-2.6.inc
conf/machine/include/qemu.inc
conf/machine/include/zaurus-2.6.inc
conf/machine/jornada56x.conf
conf/machine/jornada7xx.conf
conf/machine/shark.conf
conf/machine/simpad.conf
contrib/mtn2git/mtn2git.py
contrib/python/generate-manifest-2.5.py
packages/alsa/alsa-state.bb
packages/e17/edje-viewer_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/gtk+/gtk+_2.10.14.bb
packages/images/opie-image-16mb.bb
packages/images/opie-image.bb
packages/libsdl/libsdl-mixer_1.2.6.bb
packages/linux/linux/simpad/defconfig
packages/linux/linux-openmoko/gta02-sound.patch
packages/linux/linux-openmoko.inc
packages/linux/linux-openmoko_2.6.22.5.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-collie
packages/linux/linux-rp.inc
packages/linux/linux_2.6.21.bb
packages/linux/linux_2.6.22.6.bb
packages/meta/slugos-packages.bb
packages/navit/navit.inc
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
packages/python/python-2.5-manifest.inc
packages/python/python-ecore_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-efl.bb
packages/python/python-efl.inc
packages/python/python-emotion_cvs.bb
packages/python/python-epsilon_cvs.bb
packages/python/python-evas_cvs.bb
packages/python/python_2.5.1.bb
packages/qpf-fonts/qpf-unismall_1.0.0.bb
packages/roadmap/roadmap-gtk2.inc
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap.inc
packages/roadmap/zroadmap_1.1.0.bb
packages/roadmap/zroadmap_cvs.bb
packages/screen/screen_4.0.2.bb
packages/supertux/supertux_0.1.2.bb
packages/tasks/task-openmoko-feed.bb
packages/tasks/task-python-everything.bb
packages/tea/tea_17.3.5.bb
packages/ttf-fonts/ttf.inc
packages/u-boot/u-boot-openmoko_svn.bb
mtn:manual_merge
true
packages/midpath/midpath.inc
Diffs:
#
# mt diff -r396d43c9459edaab2f04c5dd3825de0391fc1b73 -rba76f4856806d81e983ec7db3a011d59a30abf15
#
#
#
# delete "packages/navit/files/compile-fix.patch"
#
# delete "packages/navit/navit_0.0.1.bb"
#
# delete "packages/navit/navit_0.0.2.bb"
#
# delete "packages/xerces-c/xerces-c_2.6.0.bb"
#
# delete "packages/xerces-c/xerces-c_2.7.0.bb"
#
# rename "conf/machine/include/tune-strongarm.inc"
# to "conf/machine/include/tune-strongarm1100.inc"
#
# rename "packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
# to "packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb"
#
# add_dir "packages/alsa/alsa-state/fic-gta02"
#
# add_dir "packages/asterisk/asterisk-1.4.17"
#
# add_dir "packages/asterisk-core-sounds-en-alaw"
#
# add_dir "packages/asterisk-core-sounds-en-g729"
#
# add_dir "packages/asterisk-core-sounds-en-gsm"
#
# add_dir "packages/asterisk-core-sounds-en-ulaw"
#
# add_dir "packages/asterisk-extra-sounds-en-alaw"
#
# add_dir "packages/asterisk-extra-sounds-en-g729"
#
# add_dir "packages/asterisk-extra-sounds-en-gsm"
#
# add_dir "packages/asterisk-extra-sounds-en-ulaw"
#
# add_dir "packages/asterisk-moh-freeplay-alaw"
#
# add_dir "packages/asterisk-moh-freeplay-g729"
#
# add_dir "packages/asterisk-moh-freeplay-gsm"
#
# add_dir "packages/asterisk-moh-freeplay-ulaw"
#
# add_dir "packages/dtnrg"
#
# add_dir "packages/e17/edje-viewer"
#
# add_dir "packages/linux/linux-2.6.22.6/mx31moboard"
#
# add_dir "packages/netbase/netbase/mx31moboard"
#
# add_dir "packages/supertux/files"
#
# add_file "conf/machine/mx31moboard.conf"
# content [4fbbc4efbfa3c6a7e53d028698e453da918a952c]
#
# add_file "packages/alsa/alsa-state/fic-gta02/asound.state"
# content [1757352784f5374c1f573a503aae63c17415a14a]
#
# add_file "packages/alsa/alsa-state/fic-gta02/stereoout.state"
# content [1757352784f5374c1f573a503aae63c17415a14a]
#
# add_file "packages/asterisk/asterisk-1.4.17/Makefile.patch"
# content [27eb251099e58f059255d07054eaad58d78587b9]
#
# add_file "packages/asterisk/asterisk-1.4.17/init"
# content [ab9f4c6af832cc4a94d2a5e256988be381675969]
#
# add_file "packages/asterisk/asterisk-1.4.17/logrotate"
# content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
#
# add_file "packages/asterisk/asterisk-1.4.17/sounds.xml.patch"
# content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
#
# add_file "packages/asterisk/asterisk-1.4.17/volatiles"
# content [66814aff0fd07e02c83bf90010a95c0845067557]
#
# add_file "packages/asterisk/asterisk_1.4.17.bb"
# content [060df18e986c1290e557ca7de184d66634bcb25a]
#
# add_file "packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb"
# content [5937b70427319f211e2c6e621c67920a55b30d26]
#
# add_file "packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb"
# content [3749a81c19bb6ece50291cfc1e8b8f51c743891d]
#
# add_file "packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb"
# content [9ee5cf5d0245b1883eaa997690cc72c7eac1df4c]
#
# add_file "packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb"
# content [cb70f337ec851d833b4772bb15bece0fcdd788fd]
#
# add_file "packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb"
# content [2cf4bac2b83ff6352cb4315ebe9bcea76fa47ce7]
#
# add_file "packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb"
# content [84fc3a38f5414cbd71aabdebd2df8cb422c94290]
#
# add_file "packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb"
# content [49e28cdbdf947670361e9bf063c2e5cb74702417]
#
# add_file "packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
# content [43abb0834bd9e900f53ffd78c329cdc8ba920e57]
#
# add_file "packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb"
# content [7c1bf1fa2e9f82ba101416c2950affac0d78270a]
#
# add_file "packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb"
# content [f02532baf8649b02c0bea6f21eaef543f76c44cd]
#
# add_file "packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb"
# content [98809f216b57bfaf8be2324c05315b99eeb80b24]
#
# add_file "packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb"
# content [3b80353861635af18fa9f1b070716a83b7a1c835]
#
# add_file "packages/dtnrg/dtn_2.5.0.bb"
# content [3c974b28f58a46ed1bd5f18206aee37d6d8779c6]
#
# add_file "packages/e17/edje-viewer/no-minimal-size.patch"
# content [8b482e8c0719f0c8649f3b416d404b975ac18283]
#
# add_file "packages/gcc/gcc-cross-sdk_4.2.2.bb"
# content [8ef30993fffbbd19108406cd37d0b36449e5143d]
#
# add_file "packages/gtk+/gtk+-2.10.14/small-gtkfilechooser.patch"
# content [771b5f95c8458b42a196b4b69130f7954dadfe6d]
#
# add_file "packages/imagemagick/imagemagick-native_6.3.5-10.bb"
# content [12767989ecd51eae729f7a561f0b330a9ac11994]
#
# add_file "packages/images/openmoko-python-devel-image.bb"
# content [314c670f5711b4e925e3261db65ca753dbbd5a78]
#
# add_file "packages/linux/linux-2.6.22.6/mx31moboard/defconfig"
# content [f34bbca781351493141d2ae81b724e47a950b9ac]
#
# add_file "packages/netbase/netbase/mx31moboard/interfaces"
# content [54e9b7d4b6227cfd47e2a88d7fe76e1f12f56795]
#
# add_file "packages/python/python-edbus_cvs.bb"
# content [7812abc4380b4050cff4b3d2ce5a3d321fad99de]
#
# add_file "packages/python/python-efl-examples.bb"
# content [bf69dc5858a5a32c723a3146a32c4d96419db9ab]
#
# add_file "packages/roadmap/files/roadmap_path.patch"
# content [a9de0d93760921a56341d70da42a7b27da04fc34]
#
# add_file "packages/supertux/files/supertux.desktop"
# content [ca0d07025948eea625b61a4c138657fd300ff7ac]
#
# add_file "packages/supertux/files/supertux.png"
# content [95e94bf022d8fe098f34b15b577aa8c08b089bc3]
#
# add_file "packages/supertux/supertux_0.1.3.bb"
# content [3bdf0dcd28c6bdec7e0869499bb81b27bbfb9d35]
#
# add_file "packages/tasks/task-openmoko-python-devel.bb"
# content [9e274c55cc6f029b3adec34e38bedeacbb8c2ca9]
#
# add_file "packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch"
# content [bd915dc287d002b9db3f2531ecbd27dadbb7d336]
#
# add_file "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
# content [5906c2607fc6aca5a48fa0b21942c425013f9722]
#
# add_file "packages/xerces-c/xerces-c_2.8.0.bb"
# content [1bd7bf05dbfb2569fe7ca72425698a484c6741fa]
#
# patch "classes/insane.bbclass"
# from [f17809480bc525b37862480d1e30ae135d59385f]
# to [00d6311affb65ec365a80a9b833de2945df35660]
#
# patch "classes/sanity.bbclass"
# from [c93bcb7294008f5c9b589ee59a39efbdb9a82616]
# to [ebf6cc13d544c4d677c13e3ea8dd18655c21e172]
#
# patch "classes/sdl.bbclass"
# from [3ddeb18d45e65c5c010d546459991244e42573ea]
# to [5f1c659d9ecfa56214c29c1ef56adb91b4aab3d0]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [b63adaffd19f973e76be44bc0544e96ff3e9c602]
# to [cb176be489c8cc84cc322cac2f96f85758f594fe]
#
# patch "conf/distro/include/angstrom.inc"
# from [6d2902857b621e681b3f0d4780dcd51ee236074e]
# to [d7101c0944e02681c38c2ba79d8a78e3d4005df9]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [0ee8e930339f1d201ab01060c7de4f6f0e484056]
# to [0ef58973df9b8941b8366442a3ddffad77ae1202]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [6d7b2bbfb57a80d4d3d27fe559300eeca5f0af22]
# to [7a99a2a6c43c4d8082370e9dcbe481855f365a4d]
#
# patch "conf/machine/collie.conf"
# from [8ec2568fe9cb9c9b5580adf5e26eb873400e040c]
# to [a0553e914a9461a2f8f27c4cf8972dcebb056d0d]
#
# patch "conf/machine/h3600.conf"
# from [baccbbb3fd46dea023ff7dc49ac173b169688428]
# to [946b47e617dd5bb30df3ee547902b05861e89f5b]
#
# patch "conf/machine/htcwallaby.conf"
# from [f536aa7626c709ec12492ce50cec7af6c4062a8c]
# to [d6588b12e47e4671574a6a9f611ca56ed3e54a66]
#
# patch "conf/machine/include/collie-2.6.inc"
# from [a71f2479ea4e652346eccf4594034af29bb74651]
# to [2858f44a6c2ce67dc7346721a699db944961f936]
#
# patch "conf/machine/include/qemu.inc"
# from [298c9ee68a35039a8a520bff72b70c1f9f939c4a]
# to [f4d52db83b15750777ba577b34575b3260213b7c]
#
# patch "conf/machine/include/tune-strongarm1100.inc"
# from [4bb1dc721e55061bb98b49bae4f57bd4ff088f02]
# to [6b646008e17bfa06b0b28e48fd811701e7f4ea78]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [7ecb352669b5b71228489192cdeb5826dc02b46a]
# to [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
#
# patch "conf/machine/jornada56x.conf"
# from [feef2730324948026b5302d47b01bae79fa6bc39]
# to [6e67e41a8cb53163822499066dcf76e2ed17c3eb]
#
# patch "conf/machine/jornada7xx.conf"
# from [931f12408f78e84eaafc92103fd2590493bcd246]
# to [b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac]
#
# patch "conf/machine/shark.conf"
# from [8a744b9daf9db02c05297d317225e9f6d6cb012e]
# to [45f471879704cfba13dd30daae06942e7bdd6716]
#
# patch "conf/machine/simpad.conf"
# from [9987d298771d159fd85308e85bdb5a82fd16832d]
# to [b9316853a8b1c9a28a1c4df96b4166a416335cc3]
#
# patch "contrib/mtn2git/mtn2git.py"
# from [152252b8f2f7f57c70d678432bd6cb8fa63f8946]
# to [1358f112d3cb844a52d78b014809a8a5a6609bc4]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [b7e8bd24539139e7ffcc8d7a6f869f503d1c3ff5]
# to [42794139eb5d2d065e423c46dd2858a4b6a04f34]
#
# patch "packages/alsa/alsa-state.bb"
# from [01b3bf425533199f948a122a8612b2535773c47b]
# to [790f2ce45c0d7d9471cb29f1a157071adb29ea3b]
#
# patch "packages/e17/edje-viewer_cvs.bb"
# from [a789e404a347e1eedc48636e834ce762cb837e4a]
# to [81171cf34f4ee80dedbbea9870abd1936cd37058]
#
# patch "packages/efl1/ecore.inc"
# from [5ef6dea417efa9f7631ce9cec1d293af7ba5a110]
# to [934d94fad3c6bfd69212decb7aab06ab9b476048]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [34fa2c31d706db70d37636189c65cd730d33abc0]
# to [e5059f4bf4f7c76e1c65effb2dcd11b7e18a4c0c]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [1826c7cb68c61f853f9e04fb53e1b03a022c7894]
# to [c1a0f93864dece01ef62aab214eb056162154ffa]
#
# patch "packages/efl1/evas.inc"
# from [4cd4cdcaa21c3ceb07a4a0332e00f4e195d48a01]
# to [cc99e778d7f3640905f0dc835736906c5393874c]
#
# patch "packages/efl1/evas_cvs.bb"
# from [90e74de5f2fa3fd6a8b49a0bee9105d6ce33103a]
# to [7ac3a08c9fc17a3cc7a34dc582fc93b978ab9144]
#
# patch "packages/gtk+/gtk+_2.10.14.bb"
# from [04c9956cab18c353c456a1340133ce32f3ec30af]
# to [3313c2f35c6f628c61f3ba5b11f173ecd26a3a8d]
#
# patch "packages/images/opie-image-16mb.bb"
# from [3a0a66249e372569c26b37c7367ab42831e5d656]
# to [1228a8f171a2b91c0604a288575a91fcdf3d258c]
#
# patch "packages/images/opie-image.bb"
# from [eab510fa58a1cbe34c8c15ea7cacb18bf5bd9d92]
# to [a1c62875ee2fbe52f0ba014c4931559c768b671c]
#
# patch "packages/libsdl/libsdl-mixer_1.2.6.bb"
# from [cfee648682c7559cf233d5a7d0ae67430f94a636]
# to [8866166728bbf910308433bf453a286adc1fa2ec]
#
# patch "packages/linux/linux/simpad/defconfig"
# from [9b2a926304e0d3f59c4cc79fc6222c11947ed80f]
# to [ac1e360a7cdda71682cd334f3c0a28dc02b59533]
#
# patch "packages/linux/linux-openmoko/gta02-sound.patch"
# from [dc9eb450c1546c84d1510d4b606a7ae621abedeb]
# to [1a85c8c783ad6d9988742415b3ac93ea2fb1e9d2]
#
# patch "packages/linux/linux-openmoko.inc"
# from [26ac1c3cd91125014bb4e3b9e4f80b93fc877ccb]
# to [6f24382b0e0681456daf075975f293e1e06b0fb2]
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
# from [10ba1238090620db23914c0dccd22badc39f2ce4]
# to [48a109b0b7e850da45a142398cd214191154e96e]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-collie"
# from [1d0a3e54d0540b9d7fb266e65df279c450fcc317]
# to [f8c89cefc2aacd273421cdd6abb162f6197a7640]
#
# patch "packages/linux/linux-rp.inc"
# from [fae5978f66ce47eb9bd8319f1cd9e61ed9288f26]
# to [8510326c44fc879b7ce77ca7c20f62ab901eae48]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [ea3e4abd8395bae51a2fa300c1079ee0a5041860]
# to [446a2c08dfcbb88e02f958f8e29adc438c0e9c2d]
#
# patch "packages/linux/linux_2.6.22.6.bb"
# from [33440b039d1b3f79c8cee378f99b407bc4ea9b53]
# to [7d7b7a022c79819fa6c66941604363b05407cb5a]
#
# patch "packages/meta/slugos-packages.bb"
# from [58d718f42f82fb421411dd42902041d9826d43d7]
# to [1a2ceb929514b8bcf127cdcde0a9622c8ac4a28a]
#
# patch "packages/navit/navit.inc"
# from [dc36e11d9155034cfe2c407959f0b757b5a483de]
# to [4e36ed086e689535bed08a5953f1f330300dc53f]
#
# patch "packages/navit/navit_0.0.3.bb"
# from [1127602c440a00440088e7587bf88d3c760f05c4]
# to [15b167521e9d10044612c9a9841fd32e13f97363]
#
# patch "packages/navit/navit_cvs.bb"
# from [d22f4f689826ebf7d008a0bc66a88d56cc149e05]
# to [08dc55cf2a02719d9345a11b1fac91807d8b2e86]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [353b94c02b2addae02ffac3246925056d10b3b71]
# to [222e6f2ebafb935c27a644f71de53f3e6604a0c9]
#
# patch "packages/python/python-ecore_cvs.bb"
# from [bfa8e271f3daff2c2b60e8e4c9cbf7aedbe9a699]
# to [295246b44c66e0eec08f9eaa1d8d53026cfaaf09]
#
# patch "packages/python/python-edje_cvs.bb"
# from [4b7900f727ff503609272277e678a3a40f185bc1]
# to [18a2503cde02ed33e4f15943318b8dfc8cfcfca3]
#
# patch "packages/python/python-efl.bb"
# from [38e140ae1f0addeb5ff6e307653bfd5032f4df82]
# to [77937768e6ded1252b9e4626217e70dd277666f7]
#
# patch "packages/python/python-efl.inc"
# from [52c210d09e0ffddb7db102b3f81f7759c1f7991d]
# to [c89446d67552d9bb92644bcef06879c238785740]
#
# patch "packages/python/python-emotion_cvs.bb"
# from [030fd4a928e8e5fbe149bc2dce2976c52fe7ff85]
# to [45709d87daaee3ee043e8c8536f35bb73b68f5ca]
#
# patch "packages/python/python-epsilon_cvs.bb"
# from [7bd65f186128ab558629d1d56830b76733712059]
# to [3aa59441db25ec4ff0a8fae0e15f87935ad266f7]
#
# patch "packages/python/python-evas_cvs.bb"
# from [38264868dc3fb93df627bbdca124ddae4143423a]
# to [8d47b306dcfe4ce206dd3e6188ebc30c94c155b7]
#
# patch "packages/python/python_2.5.1.bb"
# from [4f55ad9de694427456743f3c4623090c63ef08a5]
# to [0198b3e00fbd71eb80cb5d69bb7d4cba293f89cb]
#
# patch "packages/qpf-fonts/qpf-unismall_1.0.0.bb"
# from [741c55eb9c92ef7b6cdcbb362c71275e527da262]
# to [a0687b8d3aa7109652db6607c32dd8d9f959e12f]
#
# patch "packages/roadmap/roadmap-gtk2.inc"
# from [fc58e3e70037346d52758067318eda8023e6b2be]
# to [2aa378d801945ff02bc3c939ba674715a280b763]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [bf65c63e6c550a015ebf7d3afe59f77c139cc5f3]
# to [28151fbdab1200d9c37c380e25f9bca4cbc1bbaf]
#
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
# from [2790f799a13355e4ee5e15d33a9b0c737fde2269]
# to [597e6c998d97edcfd8de17534c455b1476978cfa]
#
# patch "packages/roadmap/roadmap.inc"
# from [e3d443eff17119798c0c6deda17bf6ff8785c257]
# to [46055702ecd5e97c7f30231e54b7f3d929ea0fad]
#
# patch "packages/roadmap/zroadmap.inc"
# from [6f4897b3cbc5a817995412a0c649a7fffc71554b]
# to [5c038214b7769f0dee175ca4e846ccd293788c0e]
#
# patch "packages/roadmap/zroadmap_1.1.0.bb"
# from [deaa33e33e25e1c9b13a64473c53715a50f05d59]
# to [b82c031b85848b13832c100afaa5d30d59685dd4]
#
# patch "packages/roadmap/zroadmap_cvs.bb"
# from [910020856a214de2ce5b21692e857806378508b4]
# to [092c0da8140aa7558085ce631475d46da52b946f]
#
# patch "packages/screen/screen_4.0.2.bb"
# from [76988964798c087b4ffa5d74a69d3a434763254c]
# to [21d38aa1d5e0bd6ed228e4441f0855e5755ba3e8]
#
# patch "packages/supertux/supertux_0.1.2.bb"
# from [12d13fa1dc913ca88c429f0d90490f3735b10534]
# to [1cd0b4d5a1abca0a1dcb49ed472396347e0c7529]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [f61aabaafd0d0b2ab728612f541ce6b90b4d5682]
# to [ae8c99389ab3bc3c8f94dfedf504e3829a6cd608]
#
# patch "packages/tasks/task-python-everything.bb"
# from [67974c31da8be9bcedbda9f7dfa5963f89e262a2]
# to [f5a91e04a875fab4ab65964647105b0303fd6575]
#
# patch "packages/tea/tea_17.3.5.bb"
# from [659e70bcc2fcc43692a31aca58af3daa0607db53]
# to [2c12d2003ebdd187f9684fc6d6395660ab825f46]
#
# patch "packages/ttf-fonts/ttf.inc"
# from [fb8c05c470eee88f979bd7425e143a351654635a]
# to [2a846550f80db27429faf862405989761d2e4243]
#
# patch "packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb"
# from [0c0171c90503926242288f89cf359ffc1a9f7b2c]
# to [64f842298e8ea505bac76d4278cd6ec3ab3bba9c]
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [728dd133bb54e3b77f041e6046fba6405c2a6b2e]
# to [cc49be056ab89c25407b8dbef14a32c86fca227f]
#
# set "packages/supertux%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -re4f83871a267ab0720e73ef096ce3ab5fc40a303 -rba76f4856806d81e983ec7db3a011d59a30abf15
#
#
#
# patch "packages/midpath/midpath.inc"
# from [e9d8c24f154d72d1d4847d255e9e58c8dc1bb7d1]
# to [5390ede5a215319620bb1df840e3383b3308e5be]
#
============================================================
--- packages/midpath/midpath.inc e9d8c24f154d72d1d4847d255e9e58c8dc1bb7d1
+++ packages/midpath/midpath.inc 5390ede5a215319620bb1df840e3383b3308e5be
@@ -9,9 +9,9 @@ S = "${WORKDIR}/midpath-${PV}"
S = "${WORKDIR}/midpath-${PV}"
-DEPENDS = "ecj-native fastjar-native classpath-minimal"
+DEPENDS = "virtual/javac-native fastjar-native classpath-minimal"
-JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/ecj"
+JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/javac"
FASTJAR_CMD = "${STAGING_BINDIR_NATIVE}/fastjar"
More information about the Openembedded-commits
mailing list