[oe-commits] org.oe.dev merge of '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'

hrw commit openembedded-commits at lists.openembedded.org
Fri Sep 7 20:32:08 UTC 2007 

merge of '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
     and 'a12d2158881e274d028f6fb907b2bd832647e870'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 916fcf1a2fd907a27f947052ddfce9dffafb0059
ViewMTN: http://monotone.openembedded.org/revision/info/916fcf1a2fd907a27f947052ddfce9dffafb0059
Files:
1
packages/tcpdump/tcpdump_3.9.3.bb
packages/tcpdump/tcpdump_3.9.7.bb
packages/xorg-app/xdm_1.1.6.bb
packages/xorg-app/xmodmap_1.0.3.bb
packages/xorg-app/xprop_1.0.3.bb
packages/linux/linux-ezx-2.6.21/patches/defconfig-a1200
packages/linux/linux-ezx-2.6.21/a1200/defconfig
packages/linux/linux-ezx-2.6.21/patches/defconfig-a780
packages/linux/linux-ezx-2.6.21/a780/defconfig
packages/linux/linux-ezx-2.6.21/patches/defconfig-e2
packages/linux/linux-ezx-2.6.21/e2/defconfig
packages/linux/linux-ezx-2.6.21/patches/defconfig-e6
packages/linux/linux-ezx-2.6.21/e6/defconfig
packages/linux/linux-ezx-2.6.21/patches/defconfig-e680
packages/linux/linux-ezx-2.6.21/e680/defconfig
packages/ezx/ezxd
packages/linux/linux-2.6.20/at91sam9260ek
packages/linux/linux-2.6.20/at91sam9261ek
packages/linux/linux-ezx-2.6.21/a1200
packages/linux/linux-ezx-2.6.21/a780
packages/linux/linux-ezx-2.6.21/e2
packages/linux/linux-ezx-2.6.21/e6
packages/linux/linux-ezx-2.6.21/e680
packages/linux/linux-ezx-2.6.21/rokre2
packages/xorg-lib/pixman-0.9.5
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/machine/at91sam9260ek.conf
conf/machine/at91sam9261ek.conf
packages/ezx/ezxd/ezxd.init
packages/ezx/ezxd_svn.bb
packages/linux/linux-2.6.20/at91sam9260ek/defconfig
packages/linux/linux-2.6.20/at91sam9261ek/defconfig
packages/linux/linux-ezx-2.6.21/patches/a1200-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/a780-emu.patch
packages/linux/linux-ezx-2.6.21/patches/a780-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/e680-emu.patch
packages/linux/linux-ezx-2.6.21/patches/e680-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-asoc.patch
packages/linux/linux-ezx-2.6.21/patches/index.html
packages/xorg-app/bdftopcf_1.0.1.bb
packages/xorg-app/iceauth_1.0.2.bb
packages/xorg-app/ico_1.0.2.bb
packages/xorg-app/xbacklight_1.1.bb
packages/xorg-app/xinit_1.0.5.bb
packages/xorg-app/xset_1.0.3.bb
packages/xorg-driver/xf86-input-keyboard_1.2.2.bb
packages/xorg-lib/libxcursor_1.1.9.bb
packages/xorg-lib/libxfont_1.3.1.bb
packages/xorg-lib/libxi_1.1.3.bb
packages/xorg-lib/libxrandr_1.2.2.bb
packages/xorg-lib/libxrender_0.9.4.bb
packages/xorg-lib/libxxf86dga_1.0.2.bb
packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
packages/xorg-lib/pixman_0.9.5.bb
packages/xorg-proto/inputproto_1.4.2.1.bb
packages/xorg-proto/renderproto_0.9.3.bb
packages/xorg-proto/xf86dgaproto_2.0.3.bb
packages/xournal/xournal_0.4.0.1.bb
site/mips-linux
classes/siteinfo.bbclass
conf/distro/angstrom-2008.1.conf
conf/machine/include/motorola-ezx-base.inc
conf/machine/nokia770.conf
packages/dbus/dbus-1.0.2/dbus-1.init
packages/dbus/dbus_1.0.2.bb
packages/glibc/eglibc-initial_svn.bb
packages/glibc/eglibc-intermediate_svn.bb
packages/glibc/eglibc_svn.bb
packages/gnome/gnome-panel_2.18.1.bb
packages/gnome/libwnck_2.13.5.bb
packages/images/angstrom-minimal-image-with-mtd-utils.bb
packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch
packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch
packages/linux/linux-ezx-2.6.21/patches/a780-flip.patch
packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch
packages/linux/linux-ezx-2.6.21/patches/a780-leds.patch
packages/linux/linux-ezx-2.6.21/patches/a780-mci.patch
packages/linux/linux-ezx-2.6.21/patches/a780-ts.patch
packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch
packages/linux/linux-ezx-2.6.21/patches/e680-leds.patch
packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch
packages/linux/linux-ezx-2.6.21/patches/e680-mci.patch
packages/linux/linux-ezx-2.6.21/patches/e680-ts.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-backlight.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-bp.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-emu.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-pm.patch
packages/linux/linux-ezx-2.6.21/patches/series
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux.inc
packages/linux/linux_2.6.20.bb
packages/tasks/task-boot.bb
packages/tasks/task-openmoko-debug.bb
packages/tasks/task-openmoko-feed.bb
packages/webkit/webkit-gtk_svn.bb
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
Diffs:

#
# mt diff -r3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d -r916fcf1a2fd907a27f947052ddfce9dffafb0059
#
# 
# 
# rename "packages/tcpdump/tcpdump_3.9.3.bb"
#     to "packages/tcpdump/tcpdump_3.9.7.bb"
# 
# patch "packages/tcpdump/tcpdump_3.9.7.bb"
#  from [6155511c925cd01881357a3d5f6729dfd24254fd]
#    to [de2e8ad319450b0714e8ca594e5aad8768645f99]
# 
============================================================
--- packages/tcpdump/tcpdump_3.9.3.bb	6155511c925cd01881357a3d5f6729dfd24254fd
+++ packages/tcpdump/tcpdump_3.9.7.bb	de2e8ad319450b0714e8ca594e5aad8768645f99
@@ -1,10 +1,9 @@ PRIORITY = "optional"
 DESCRIPTION = "A sophisticated network protocol analyzer"
 HOMEPAGE = "http://www.tcpdump.org/"
 LICENSE = "BSD"
 SECTION = "console/network"
 PRIORITY = "optional"
-DEPENDS = "libpcap-0.9.3"
-PR = "r2"
+DEPENDS = "libpcap"
 
 SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
            file://tcpdump_configure_no_-O2.patch;patch=1"


#
# mt diff -ra12d2158881e274d028f6fb907b2bd832647e870 -r916fcf1a2fd907a27f947052ddfce9dffafb0059
#
# 
# 
# delete "packages/xorg-app/xdm_1.1.6.bb"
# 
# delete "packages/xorg-app/xmodmap_1.0.3.bb"
# 
# delete "packages/xorg-app/xprop_1.0.3.bb"
# 
# rename "packages/linux/linux-ezx-2.6.21/patches/defconfig-a1200"
#     to "packages/linux/linux-ezx-2.6.21/a1200/defconfig"
# 
# rename "packages/linux/linux-ezx-2.6.21/patches/defconfig-a780"
#     to "packages/linux/linux-ezx-2.6.21/a780/defconfig"
# 
# rename "packages/linux/linux-ezx-2.6.21/patches/defconfig-e2"
#     to "packages/linux/linux-ezx-2.6.21/e2/defconfig"
# 
# rename "packages/linux/linux-ezx-2.6.21/patches/defconfig-e6"
#     to "packages/linux/linux-ezx-2.6.21/e6/defconfig"
# 
# rename "packages/linux/linux-ezx-2.6.21/patches/defconfig-e680"
#     to "packages/linux/linux-ezx-2.6.21/e680/defconfig"
# 
# add_dir "packages/ezx/ezxd"
# 
# add_dir "packages/linux/linux-2.6.20/at91sam9260ek"
# 
# add_dir "packages/linux/linux-2.6.20/at91sam9261ek"
# 
# add_dir "packages/linux/linux-ezx-2.6.21/a1200"
# 
# add_dir "packages/linux/linux-ezx-2.6.21/a780"
# 
# add_dir "packages/linux/linux-ezx-2.6.21/e2"
# 
# add_dir "packages/linux/linux-ezx-2.6.21/e6"
# 
# add_dir "packages/linux/linux-ezx-2.6.21/e680"
# 
# add_dir "packages/linux/linux-ezx-2.6.21/rokre2"
# 
# add_dir "packages/xorg-lib/pixman-0.9.5"
# 
# add_file "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
#  content [c3f758c4ac01073bdc16ae41c4f2eca677ba091e]
# 
# add_file "conf/machine/at91sam9260ek.conf"
#  content [b2ddde0c3e0cef0cf1b8e532844b6ef3fe88dc8d]
# 
# add_file "conf/machine/at91sam9261ek.conf"
#  content [204547873976da00125a4cbc9c924be5401f0a02]
# 
# add_file "packages/ezx/ezxd/ezxd.init"
#  content [85c4d6682e30dff858fca9a1647058c683e5284d]
# 
# add_file "packages/ezx/ezxd_svn.bb"
#  content [0880c77dccd414d74dc2169f07a2b6e4b94e395c]
# 
# add_file "packages/linux/linux-2.6.20/at91sam9260ek/defconfig"
#  content [7ac14d3774bfd250781679f34bfe509164e5e480]
# 
# add_file "packages/linux/linux-2.6.20/at91sam9261ek/defconfig"
#  content [7241d49c400297a32edaa90ec877ad0580d7840d]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a1200-pcap.patch"
#  content [0f90a1491db64b28b6ce108c9f9cee0b7e41bfbc]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a780-emu.patch"
#  content [602876405e12900a39f64a98f3d5d0dba635fded]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a780-pcap.patch"
#  content [0054a06370574888fba742e1dbd258f902880e59]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e680-emu.patch"
#  content [dc16d82460218bbf8e0653913ab8e7504c348920]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e680-pcap.patch"
#  content [9d1d899a5c8081eab292a354118938026e691577]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/ezx-asoc.patch"
#  content [f6a1977a1ba4523b5c615222a4400044320bcefb]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/index.html"
#  content [ee7841873ec6f4e23154b8d4ea96d9158dcfb788]
# 
# add_file "packages/xorg-app/bdftopcf_1.0.1.bb"
#  content [d5b42c1ebef4be9e50db79b3202646602e3f8c40]
# 
# add_file "packages/xorg-app/iceauth_1.0.2.bb"
#  content [30e9496ca901d038ed27cc8b98793c66170b1714]
# 
# add_file "packages/xorg-app/ico_1.0.2.bb"
#  content [4d56057242d959c460b744b517d4a65b32bed16e]
# 
# add_file "packages/xorg-app/xbacklight_1.1.bb"
#  content [5f07084654e9017179b9de3b4cfb2cc03b3a1290]
# 
# add_file "packages/xorg-app/xdm_1.1.6.bb"
#  content [963fd1561d8720e9790879e9d961c976f1cc6e2b]
# 
# add_file "packages/xorg-app/xinit_1.0.5.bb"
#  content [11fa62b52d00712f372c7092ec265b4dae6c213a]
# 
# add_file "packages/xorg-app/xmodmap_1.0.3.bb"
#  content [3fab59376a8e08e17227a84ab1610760fca1276d]
# 
# add_file "packages/xorg-app/xset_1.0.3.bb"
#  content [613b01cfd6f7c90e7cacc546418ad33c62e6e876]
# 
# add_file "packages/xorg-driver/xf86-input-keyboard_1.2.2.bb"
#  content [beba8b8ea4126be51e05aba8df1eab2da8bfbdf4]
# 
# add_file "packages/xorg-lib/libxcursor_1.1.9.bb"
#  content [ee1bbaaa1225b226d9ccf4b1797b037f54b12a55]
# 
# add_file "packages/xorg-lib/libxfont_1.3.1.bb"
#  content [259fa54fbb6ab8d72e1cadfcfa7f733f7134babd]
# 
# add_file "packages/xorg-lib/libxi_1.1.3.bb"
#  content [eac74558102af836c22267f6cf10b36f2df5baef]
# 
# add_file "packages/xorg-lib/libxrandr_1.2.2.bb"
#  content [e866d094822c392f27d7b448f10abac60d362048]
# 
# add_file "packages/xorg-lib/libxrender_0.9.4.bb"
#  content [72d3c33a3229986b9f0e38f5e808fb946e586078]
# 
# add_file "packages/xorg-lib/libxxf86dga_1.0.2.bb"
#  content [d1e40cd9ec72ddc4c97f1aa9936c1e6eb2420149]
# 
# add_file "packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch"
#  content [f9ead67f673f8b94031c97dc5ddf241cfdc1f1f9]
# 
# add_file "packages/xorg-lib/pixman_0.9.5.bb"
#  content [a1d9ac4b531840f65e199d595e964afe0302e838]
# 
# add_file "packages/xorg-proto/inputproto_1.4.2.1.bb"
#  content [a2700c4f70667f3d8d5d1a838644f2a4bf6a2416]
# 
# add_file "packages/xorg-proto/renderproto_0.9.3.bb"
#  content [1bb8221a34173072ea7c764733f75f2a635ff066]
# 
# add_file "packages/xorg-proto/xf86dgaproto_2.0.3.bb"
#  content [22a671c09f7a0c7ed69b59eac28cded3b3f51ec2]
# 
# add_file "packages/xournal/xournal_0.4.0.1.bb"
#  content [bb264ca441e1eee49615587408d6caebdce1b0e0]
# 
# add_file "site/mips-linux"
#  content [6e62c6b2a9dbd94fcd404675ace77e8f072cca30]
# 
# patch "classes/siteinfo.bbclass"
#  from [036f68c0ea1d77a2539e566e20adbb9310abd475]
#    to [12a7c72c9a63a94e4f6bc81705c78b04597df2a7]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [07f73119ae13cbfa759edeaf36c895f08edaf726]
#    to [fafda2aee279a688df69144be5c39f4e3fa0a14e]
# 
# patch "conf/machine/include/motorola-ezx-base.inc"
#  from [8bbf6fcb6d743ec82eee5c17d5c1d5de771d769b]
#    to [bbd7b8e194e0918a04e49cb8ee02f02c74759272]
# 
# patch "conf/machine/nokia770.conf"
#  from [d820ea2e6ca4588ba05da8a560683ebe8717e5c7]
#    to [a2763946febc14b318477d62f3ed1eecfa6c3a6c]
# 
# patch "packages/dbus/dbus-1.0.2/dbus-1.init"
#  from [bc3a39440ac2899bf95874522964413b2f7b584a]
#    to [4dc37cbdcc8bbcdd8432d6104bddd92535f362d1]
# 
# patch "packages/dbus/dbus_1.0.2.bb"
#  from [3c61bea1f5b14d729a812b56d55a0a6be9b36a38]
#    to [a8ce6355ed3da04736b057936a57f1aeed630228]
# 
# patch "packages/glibc/eglibc-initial_svn.bb"
#  from [ace0a4db6c3ffdaa2eeec3e7c3fcb17db6dcbfe6]
#    to [9c710ce312d99de7910b87096145f2da2b1a4863]
# 
# patch "packages/glibc/eglibc-intermediate_svn.bb"
#  from [519b2d7a8e2971ddd964fb98f2cb9a44d7237d87]
#    to [21404b0d7ead89e15d711d84009c0873dddf6ade]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [3f9f9c78be70e93b6ad406c0c7452922a29cc4a8]
#    to [d271198997ba4fa58ec16de91362b22a79f8d84f]
# 
# patch "packages/gnome/gnome-panel_2.18.1.bb"
#  from [8f758fa8b2e8964d4583148f88ffe57da3fb063d]
#    to [477abd8629cb48414d615de1541819981d080656]
# 
# patch "packages/gnome/libwnck_2.13.5.bb"
#  from [dded17b49bf6ac38c86536a0a76e4d5e1b24b9de]
#    to [e27ae70e709683b3a8e98a233980cfbd9dce7543]
# 
# patch "packages/images/angstrom-minimal-image-with-mtd-utils.bb"
#  from [723d1b6c688e08393bf534cca33166bd1a05b210]
#    to [de2ca95fee1a9e1a0da365806638041673abed70]
# 
# patch "packages/linux/linux-ezx-2.6.21/a780/defconfig"
#  from [534ed07d7adf5375435eb1f38731092fc0dbbdb1]
#    to [c9d05f481541b78a034e8da06a789406b69f5499]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch"
#  from [6636c1cdc2eaaf0f6a0587d9c9965ff437e34fcf]
#    to [13a39e72f023eb78f0bac083c2620b4a5478c3d7]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch"
#  from [1ca575b3c635943719aa22662953f9d030297fc3]
#    to [5201373a1d7ad5ee6136bc4cb3e73812be57cc07]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-flip.patch"
#  from [69d4a3f5a75636cfdf89bd86e0db5cca103b51ae]
#    to [afbeec5b33c72c4b26287a2bd6a8225f05f1541a]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch"
#  from [ff4a674ab00e773d72997022c5155d9e820de982]
#    to [dd29021aadd74127d9ff587efd2969a0ebfa9efc]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-leds.patch"
#  from [31fed77fdd9a093bd42261f7abfd71bdaacbfa6d]
#    to [84ae3313be349468651a6400df771099808ad2e2]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-mci.patch"
#  from [cfeaeff44c4a3f4ad3cb29aed3cdc8b1c638d7c6]
#    to [42af411c050dcb390441653044e6ace32293ef1d]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-ts.patch"
#  from [893517c5ae33c6beebf296a6da1d5a2b8465b993]
#    to [dc8a4d515fdf17ea106e0617a01f1b1bc49fe563]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch"
#  from [1745111b7d811226eb0a93b1aef9368f3f02e51e]
#    to [58e64fd44cb11e55e73fa11e1a3390b0146b6b4d]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-leds.patch"
#  from [f7fa9260d0d60bb38b483f284f50a9f6ae952c95]
#    to [5b72f0d0db4b6593deb052f28e5eb976bfd9e38a]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch"
#  from [e1b3994b1e867bde0f0d64de50ee790479b83709]
#    to [bc12298c37c1469c69c6a83808b64b3fa7789469]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-mci.patch"
#  from [2350f8448c387384bd08c545a78cae3d06aa9e60]
#    to [45d9a695b9a4e437a2dff9e6cafdc32a830251a9]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-ts.patch"
#  from [565ef830d2db32d41e2d912171e2a65bbd2e0a32]
#    to [cd605df8c010fcd3047b4d198dc45b78ed10a9d3]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-backlight.patch"
#  from [edfc8a976a822dddd374a110bccee12a8adb96e6]
#    to [6fc7a23e79391f911fb05169bcc8d54aeb9edd68]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-bp.patch"
#  from [53522f1b412b05343650906bc8cfabc5bd1d2ed2]
#    to [bb9396f5b9a6da4233d597edc460d6a2b8d120f1]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch"
#  from [ee30f011b499bd8ffbdc806a5c10f94e16fbecb6]
#    to [385081750e254e3e68c9e42d96e0ea03ec1ae356]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-emu.patch"
#  from [887d933992e0330caf83c0029193f4f872485f44]
#    to [817e09bc6527cbc50e80a463f1b3840c8dc92fc2]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-pcap.patch"
#  from [6433c49fd54adb440702b8cc915c49d4b2587ba5]
#    to [60cd6cf7d9fca46f08e481a418a3947bcf0463c0]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-pm.patch"
#  from [41ff699ee46266e1b2e0ce0e40c47bebe13e3b98]
#    to [7032ffa72e6985ba4f8a0127460bf0a44993a522]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/series"
#  from [647eebbb34b774e046c5055d25f95b6ab1e09859]
#    to [5d4e5f0306d194f5628bbf152d8ab695698e62d5]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [e19ffdc863932f0ac59865e2041686c946dbd8de]
#    to [935dbd5faafe8b44a770899fe547001db05d19df]
# 
# patch "packages/linux/linux.inc"
#  from [acd09fd5582e642f6a65a35eceb99a809355eb33]
#    to [4f5f493a73db7cb33ae34f7b5501c9bb911df71f]
# 
# patch "packages/linux/linux_2.6.20.bb"
#  from [fb2419e782660a25634a9dc67f3e3e531da22326]
#    to [a44fd7ebbe1c782aa31e032459cfc089faa8824a]
# 
# patch "packages/tasks/task-boot.bb"
#  from [c23c7a613f0b88d6f60bc742ec8af93640b7ebc7]
#    to [7ac26e95d7aaffe0b5e60aab60f1ddc2ffba85e1]
# 
# patch "packages/tasks/task-openmoko-debug.bb"
#  from [194fcf90f766fbdbc057be3fec031b632534283d]
#    to [6f16b58858e9a8858a34530bccc7db757e1303ab]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [01ec7973326fd891a5d4f0027ab7b8e779582db2]
#    to [3e0c4deba5c39f74c4f4c2cfd0dc885a7958ef28]
# 
# patch "packages/webkit/webkit-gtk_svn.bb"
#  from [d607d56e5fd24af74f8bb3cfdb8e04d0768202de]
#    to [008e6c30c931818b5c30910b4b8ab87468bcfcd7]
# 
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
#  from [86e1b089b2f42f09683cf1ca12c13536f5e4392e]
#    to [69820edb24da782a8f84fb3676ee676aa0293a7a]
# 
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
#  from [e8a1f377f5a46ff991e1c83c538827b48f5f3229]
#    to [9942a34a0ec3c2a5eca955706e5a9bf22f0b22ee]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.2.0.bb"
#  from [6006f4a33e9017387993d00c8f97b256f0f29b1f]
#    to [5d4c1648cee1599f242309505ed0ccb3ea412b96]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
#  from [a073b2cf6fabe9e21d85dd47d1a5d7235eec93ac]
#    to [f1d269441b9c1ea3d35fa9d2311f41849ec9952e]
# 
============================================================
--- conf/distro/include/preferred-xorg-versions-X11R7.3.inc	c3f758c4ac01073bdc16ae41c4f2eca677ba091e
+++ conf/distro/include/preferred-xorg-versions-X11R7.3.inc	c3f758c4ac01073bdc16ae41c4f2eca677ba091e
@@ -0,0 +1,282 @@
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext ?= "libxext"
+PREFERRED_PROVIDER_xext ?= "libxext"
+PREFERRED_PROVIDER_libxi ?= "libxi"
+PREFERRED_PROVIDER_libxft ?= "libxft"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_libxpm ?= "libxpm"
+PREFERRED_PROVIDER_xpm ?= "libxpm"
+PREFERRED_PROVIDER_libxt ?= "libxt"
+PREFERRED_PROVIDER_libxaw ?= "libxaw"
+PREFERRED_PROVIDER_libice ?= "libice"
+PREFERRED_PROVIDER_libxrender ?= "libxrender"
+PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
+PREFERRED_PROVIDER_xextensions ?= "xextensions"
+PREFERRED_PROVIDER_xproto ?= "xproto"
+PREFERRED_PROVIDER_x11 ?= "libx11"
+PREFERRED_PROVIDER_libxv ?= "libxv"
+PREFERRED_PROVIDER_xft ?= "libxft"
+PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
+PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
+PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
+PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
+PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
+PREFERRED_PROVIDER_libxmu ?= "libxmu"
+PREFERRED_PROVIDER_libsm ?= "libsm"
+PREFERRED_PROVIDER_xrandr ?= "xrandr"
+PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg ?= "X11R7.3"
+
+# app
+PREFERRED_VERSION_appres ?= "1.0.1"
+PREFERRED_VERSION_bdftopcf ?= "1.0.1"
+PREFERRED_VERSION_beforelight ?= "1.0.2"
+PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_editres ?= "1.0.2"
+PREFERRED_VERSION_fontosfnt ?= "1.0.3"
+PREFERRED_VERSION_fslsfonts ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_iceauth ?= "1.0.2"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_lbxproxy ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_listres ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_luit ?= "1.0.2"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir ?= "1.0.3"
+PREFERRED_VERSION_mkfontscale ?= "1.0.3"
+PREFERRED_VERSION_oclock ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_proxymngr ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1"
+PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_scripts ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_viewres ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1"
+PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_xbacklight ?= "1.1"
+PREFERRED_VERSION_xbiff ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xclipboard ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xclock ?= "1.0.3"
+PREFERRED_VERSION_xcmsdb ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xconsole ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen ?= "1.0.2"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xditview ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdm ?= "1.1.6"
+PREFERRED_VERSION_xdpyinfo ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xdriinfo ?= "1.0.2"
+PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_xev ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xeyes ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xxf86dga ?= "1.0.2"
+PREFERRED_VERSION_xfd ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfontsel ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfs ?= "1.0.4"
+PREFERRED_VERSION_xfsinfo ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xfwp ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xgamma ?= "1.0.2"
+PREFERRED_VERSION_xgc ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xinit ?= "1.0.5"
+PREFERRED_VERSION_xkbcomp ?= "1.0.3"
+PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2"
+PREFERRED_VERSION_xkbprint ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkbutils ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xkill ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xload ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "X11R7.0-1.0.1"
+PREFERRED_VERSION_xlsatoms ?= "X11R7.0-1.0%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list