[oe-commits] org.oe.dev merge of '1d187fa547c16ed9ca31c2975f54b8812e88b0f6'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Feb 21 11:09:44 UTC 2008
merge of '1d187fa547c16ed9ca31c2975f54b8812e88b0f6'
and '7cc9c98056838b4d2eb67baf00c13e220ae94a0a'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: b1eda41fd5a73d8e2f521e7ad1668a7736e90afd
ViewMTN: http://monotone.openembedded.org/revision/info/b1eda41fd5a73d8e2f521e7ad1668a7736e90afd
Files:
1
classes/packaged-staging.bbclass
packages/libpng/libpng-native_1.2.19.bb
packages/libpng/libpng_1.2.19.bb
packages/libsdl/libsdl-x11_1.2.7.bb
packages/python/python-dbus
packages/python/python-dbus/allow-older-autotools.patch
packages/python/python-dbus/python-path.patch
packages/sqlite/sqlite3-3.2.2/libtool.patch
packages/sqlite/sqlite3-3.2.5/libtool.patch
packages/sqlite/sqlite3-3.2.7/libtool.patch
packages/sqlite/sqlite3-3.3.12/cross-compile.patch
packages/sqlite/sqlite3-3.3.12/libtool.patch
packages/sqlite/sqlite3-3.3.13/cross-compile.patch
packages/sqlite/sqlite3-3.3.13/libtool.patch
packages/sqlite/sqlite3-3.3.17/libtool.patch
packages/sqlite/sqlite3-3.4.1/libtool.patch
packages/xorg-lib/diet-x11
packages/xorg-lib/diet-x11/autofoo.patch
packages/xorg-lib/diet-x11/makekeys.diff
packages/xorg-lib/files
packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
packages/xorg-lib/files/fix-utf8-wrong-define.patch
packages/xorg-lib/libice
packages/xorg-lib/libice/autofoo.patch
packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
packages/xorg-lib/libsm
packages/xorg-lib/libsm/autofoo.patch
packages/xorg-lib/libx11/autofoo.patch
packages/xorg-lib/libxau
packages/xorg-lib/libxau/autofoo.patch
packages/xorg-lib/libxaw
packages/xorg-lib/libxaw/auxdir.patch
packages/xorg-lib/libxcalibrate
packages/xorg-lib/libxcalibrate/coords.patch
packages/xorg-lib/libxcomposite-1.0.1
packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
packages/xorg-lib/libxcursor
packages/xorg-lib/libxcursor/autofoo.patch
packages/xorg-lib/libxcursor-1.1.2
packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
packages/xorg-lib/libxdamage
packages/xorg-lib/libxdamage/m4.patch
packages/xorg-lib/libxdamage-1.0.1
packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
packages/xorg-lib/libxdmcp
packages/xorg-lib/libxdmcp/autofoo.patch
packages/xorg-lib/libxext
packages/xorg-lib/libxext/autofoo.patch
packages/xorg-lib/libxfixes
packages/xorg-lib/libxfixes/autofoo.patch
packages/xorg-lib/libxfont/autofoo.patch
packages/xorg-lib/libxfont/scalable.patch
packages/xorg-lib/libxft
packages/xorg-lib/libxft/autofoo.patch
packages/xorg-lib/libxi
packages/xorg-lib/libxi/autofoo.patch
packages/xorg-lib/libxpm
packages/xorg-lib/libxpm/autofoo.patch
packages/xorg-lib/libxrandr
packages/xorg-lib/libxrandr/autofoo.patch
packages/xorg-lib/libxrandr-1.0.2
packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
packages/xorg-lib/libxrender
packages/xorg-lib/libxrender/autofoo.patch
packages/xorg-lib/libxt
packages/xorg-lib/libxt/autofoo.patch
packages/xorg-proto/calibrateproto
packages/xorg-proto/calibrateproto/coords.patch
packages/zaurusd/files/zaurusd-mixer-callback.patch
classes/packaged-staging2.bbclass
packages/djvulibre/djvulibre_3.5.19.bb
packages/djvulibre/djvulibre_3.5.20.bb
packages/gaim
packages/obsolete/gaim
packages/gaim/files/purple-OE-branding.patch
packages/pidgin/pidgin/purple-OE-branding.patch
packages/gaim/pidgin
packages/pidgin/pidgin
packages/gaim/pidgin.inc
packages/pidgin/pidgin.inc
packages/gaim/pidgin_2.0.2.bb
packages/pidgin/pidgin_2.0.2.bb
packages/gaim/pidgin_2.1.1.bb
packages/pidgin/pidgin_2.1.1.bb
packages/gaim/pidgin_2.2.1.bb
packages/pidgin/pidgin_2.2.1.bb
packages/gnome/gnome-desktop_2.18.3.bb
packages/gnome/gnome-desktop.inc
packages/gnome/gnome-doc-utils_0.12.0.bb
packages/gnome/gnome-doc-utils.inc
packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch
packages/libsdl/files/explicit-extern-C.patch
packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch
packages/libsdl/files/fixlibs-1.2.9.patch
packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch
packages/libsdl/files/kill-stdc++-1.2.9.patch
packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch
packages/libsdl/files/pygame-1.2.9.patch
packages/navit/navit_0.0.3.bb
packages/navit/navit_0.0.4.bb
packages/python/python-dbus_0.81.1.bb
packages/python/python-dbus_0.82.4.bb
packages/qclockchange/qclockchange_0.1a.bb
packages/qclockchange/qclockchange_0.1b.bb
packages/sqlite/sqlite3_3.5.2.bb
packages/sqlite/sqlite3_3.5.6.bb
packages/sylpheed/claws-mail_3.2.0.bb
packages/sylpheed/claws-mail_3.3.0.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.1.bb
packages/sylpheed/claws-plugin-rssyl_0.17.bb
packages/sylpheed/claws-plugin-rssyl_0.18.bb
packages/xorg-lib/diet-x11/X18NCMSstubs.diff
packages/xorg-lib/libx11/X18NCMSstubs.diff
packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
packages/xorg-lib/libx11/fix-disable-xlocale.diff
packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
packages/xorg-lib/libx11/fix-utf8-wrong-define.patch
packages/xorg-lib/diet-x11/xchar2b.patch
packages/xorg-lib/libx11/xchar2b.patch
packages/xorg-lib/diet-x11/xim.patch
packages/xorg-lib/libx11/xim.patch
packages/xorg-lib/files/ruutf8.patch
packages/xorg-lib/libx11/ruutf8.patch
packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch
packages/xorg-xserver/files/fix-picturestr-include-order.patch
packages/amule
packages/amule/files
packages/blackbox
packages/blackbox/files
packages/libjson
packages/pidgin
packages/qclockchange/files
packages/zziplib/files
packages/amule/amule_2.1.3.bb
packages/amule/files/parser.patch
packages/blackbox/blackbox_0.70.1.bb
packages/blackbox/files/remove-host-includes.patch
packages/busybox/busybox-1.9.1/sort-z-nul.patch
packages/bvi/bvi-1.3.1/no-strip.patch
packages/ipkg/files/enable_debversion.patch
packages/ipkg/files/update_version_comparision.patch
packages/libjson/libjson_0.6.bb
packages/libsdl/files/pagesize.patch
packages/libsdl/libsdl.inc
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch
packages/qclockchange/files/qclockchange.desktop
packages/qclockchange/files/qclockchange.png
packages/vnc/fbvncserver2_cvs.bb
packages/wireshark/tshark_0.99.4.bb
packages/zaurusd/files/01-check-toggle-landscape
packages/zaurusd/files/01-check-toggle-portait
packages/zziplib/files/zip_c.patch
packages/zziplib/files/zziplib-0.10-disable-test.patch
packages/zziplib/files/zziplib-autoconf.patch
packages/zziplib/zziplib-native_0.12.83.bb
packages/zziplib/zziplib-native_0.13.49.bb
packages/zziplib/zziplib.inc
packages/zziplib/zziplib_0.12.83.bb
packages/zziplib/zziplib_0.13.49.bb
classes/base.bbclass
classes/kernel.bbclass
classes/package.bbclass
classes/package_deb.bbclass
classes/package_ipk.bbclass
classes/package_rpm.bbclass
classes/package_tar.bbclass
conf/distro/colinuxoe.conf
conf/distro/generic-uclibc.conf
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/preferred-xorg-versions-X11R7.0.inc
conf/distro/include/preferred-xorg-versions-X11R7.1.inc
conf/distro/include/preferred-xorg-versions-X11R7.2.inc
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/distro/include/preferred-xorg-versions-X11R7.4.inc
conf/distro/include/preferred-xorg-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/nylon.conf
conf/distro/openmoko.conf
conf/distro/openwrt-sdk.conf
conf/machine/nokia770.conf
conf/sanity.conf
packages/alsa/alsa-state/akita/asound.state
packages/alsa/alsa-state/spitz/asound.state
packages/altboot/altboot.inc
packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
packages/altboot/altboot_1.0.8.bb
packages/altboot/altboot_1.1.1+wip-SVNR78.bb
packages/altboot/altboot_svn.bb
packages/busybox/busybox_1.9.1.bb
packages/bvi/bvi_1.3.1.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.1.4.bb
packages/e17/e-wm_cvs.bb
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore_cvs.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/gammu/gammu_1.17.0.bb
packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
packages/gcc/gcc-package.inc
packages/gcc/gcc_4.0.0.bb
packages/gcc/gcc_4.0.2.bb
packages/gcc/gcc_4.1.0.bb
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc_4.2.1.bb
packages/gcc/gcc_4.2.2.bb
packages/gnome/gnome-desktop_2.10.2.bb
packages/gnome/gnome-desktop_2.16.1.bb
packages/gnome/gnome-desktop_2.7.90.bb
packages/gnome/gnome-doc-utils_0.10.3.bb
packages/gnome/gnome-doc-utils_0.7.1.bb
packages/gtk-webcore/osb-nrcore.inc
packages/icewm/icewm_1.2.20.bb
packages/icewm/icewm_1.2.30.bb
packages/images/openmoko-python-devel-image.bb
packages/ipkg/ipkg-native_0.99.163.bb
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/joe/joe_3.1.bb
packages/libmrss/files/better-parse-url-r0.patch
packages/libsdl/libsdl-directfb_1.2.9.bb
packages/libsdl/libsdl-qpe_1.2.9.bb
packages/libsdl/libsdl-x11_1.2.9.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-rp-2.6.24/defconfig-qemux86
packages/linux/linux-rp_2.6.24.bb
packages/linux/linux_2.6.23.bb
packages/linux/linux_2.6.24.bb
packages/maemo4/hildon-thumbnail_0.14.bb
packages/maemo4/libhildonmime_1.10.0.bb
packages/maemo4/libosso.inc
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
packages/meta/package-index.bb
packages/navit/navit_cvs.bb
packages/psplash/files/logo-math.patch
packages/tasks/task-opie-all.bb
packages/tasks/task-python-efl-examples.bb
packages/xorg-lib/diet-x11_1.1.1.bb
packages/xorg-lib/diet-x11_1.1.2.bb
packages/xorg-lib/diet-x11_1.1.3.bb
packages/xorg-lib/libxcalibrate_git.bb
packages/xorg-proto/calibrateproto_git.bb
packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
packages/zaurusd/files/alsa-cxx00-default.state.patch
packages/zaurusd/files/zaurus-hinge.in
packages/zaurusd/zaurusd_svn.bb
packages/zziplib/zziplib_0.10.82.bb
mtn:manual_merge
true
packages/vim/gvim_7.0.bb
Diffs:
#
# mt diff -r1d187fa547c16ed9ca31c2975f54b8812e88b0f6 -rb1eda41fd5a73d8e2f521e7ad1668a7736e90afd
#
#
#
# delete "classes/packaged-staging.bbclass"
#
# delete "packages/libpng/libpng-native_1.2.19.bb"
#
# delete "packages/libpng/libpng_1.2.19.bb"
#
# delete "packages/libsdl/libsdl-x11_1.2.7.bb"
#
# delete "packages/python/python-dbus"
#
# delete "packages/python/python-dbus/allow-older-autotools.patch"
#
# delete "packages/python/python-dbus/python-path.patch"
#
# delete "packages/sqlite/sqlite3-3.2.2/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.2.5/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.2.7/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.3.12/cross-compile.patch"
#
# delete "packages/sqlite/sqlite3-3.3.12/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.3.13/cross-compile.patch"
#
# delete "packages/sqlite/sqlite3-3.3.13/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.3.17/libtool.patch"
#
# delete "packages/sqlite/sqlite3-3.4.1/libtool.patch"
#
# delete "packages/xorg-lib/diet-x11"
#
# delete "packages/xorg-lib/diet-x11/autofoo.patch"
#
# delete "packages/xorg-lib/diet-x11/makekeys.diff"
#
# delete "packages/xorg-lib/files"
#
# delete "packages/xorg-lib/files/errordb-keysymdb-path-fix.patch"
#
# delete "packages/xorg-lib/files/fix-utf8-wrong-define.patch"
#
# delete "packages/xorg-lib/libice"
#
# delete "packages/xorg-lib/libice/autofoo.patch"
#
# delete "packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch"
#
# delete "packages/xorg-lib/libsm"
#
# delete "packages/xorg-lib/libsm/autofoo.patch"
#
# delete "packages/xorg-lib/libx11/autofoo.patch"
#
# delete "packages/xorg-lib/libxau"
#
# delete "packages/xorg-lib/libxau/autofoo.patch"
#
# delete "packages/xorg-lib/libxaw"
#
# delete "packages/xorg-lib/libxaw/auxdir.patch"
#
# delete "packages/xorg-lib/libxcalibrate"
#
# delete "packages/xorg-lib/libxcalibrate/coords.patch"
#
# delete "packages/xorg-lib/libxcomposite-1.0.1"
#
# delete "packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch"
#
# delete "packages/xorg-lib/libxcursor"
#
# delete "packages/xorg-lib/libxcursor/autofoo.patch"
#
# delete "packages/xorg-lib/libxcursor-1.1.2"
#
# delete "packages/xorg-lib/libxcursor-1.1.2/autofoo.patch"
#
# delete "packages/xorg-lib/libxdamage"
#
# delete "packages/xorg-lib/libxdamage/m4.patch"
#
# delete "packages/xorg-lib/libxdamage-1.0.1"
#
# delete "packages/xorg-lib/libxdamage-1.0.1/autofoo.patch"
#
# delete "packages/xorg-lib/libxdmcp"
#
# delete "packages/xorg-lib/libxdmcp/autofoo.patch"
#
# delete "packages/xorg-lib/libxext"
#
# delete "packages/xorg-lib/libxext/autofoo.patch"
#
# delete "packages/xorg-lib/libxfixes"
#
# delete "packages/xorg-lib/libxfixes/autofoo.patch"
#
# delete "packages/xorg-lib/libxfont/autofoo.patch"
#
# delete "packages/xorg-lib/libxfont/scalable.patch"
#
# delete "packages/xorg-lib/libxft"
#
# delete "packages/xorg-lib/libxft/autofoo.patch"
#
# delete "packages/xorg-lib/libxi"
#
# delete "packages/xorg-lib/libxi/autofoo.patch"
#
# delete "packages/xorg-lib/libxpm"
#
# delete "packages/xorg-lib/libxpm/autofoo.patch"
#
# delete "packages/xorg-lib/libxrandr"
#
# delete "packages/xorg-lib/libxrandr/autofoo.patch"
#
# delete "packages/xorg-lib/libxrandr-1.0.2"
#
# delete "packages/xorg-lib/libxrandr-1.0.2/autofoo.patch"
#
# delete "packages/xorg-lib/libxrender"
#
# delete "packages/xorg-lib/libxrender/autofoo.patch"
#
# delete "packages/xorg-lib/libxt"
#
# delete "packages/xorg-lib/libxt/autofoo.patch"
#
# delete "packages/xorg-proto/calibrateproto"
#
# delete "packages/xorg-proto/calibrateproto/coords.patch"
#
# delete "packages/zaurusd/files/zaurusd-mixer-callback.patch"
#
# rename "classes/packaged-staging2.bbclass"
# to "classes/packaged-staging.bbclass"
#
# rename "packages/djvulibre/djvulibre_3.5.19.bb"
# to "packages/djvulibre/djvulibre_3.5.20.bb"
#
# rename "packages/gaim"
# to "packages/obsolete/gaim"
#
# rename "packages/gaim/files/purple-OE-branding.patch"
# to "packages/pidgin/pidgin/purple-OE-branding.patch"
#
# rename "packages/gaim/pidgin"
# to "packages/pidgin/pidgin"
#
# rename "packages/gaim/pidgin.inc"
# to "packages/pidgin/pidgin.inc"
#
# rename "packages/gaim/pidgin_2.0.2.bb"
# to "packages/pidgin/pidgin_2.0.2.bb"
#
# rename "packages/gaim/pidgin_2.1.1.bb"
# to "packages/pidgin/pidgin_2.1.1.bb"
#
# rename "packages/gaim/pidgin_2.2.1.bb"
# to "packages/pidgin/pidgin_2.2.1.bb"
#
# rename "packages/gnome/gnome-desktop_2.18.3.bb"
# to "packages/gnome/gnome-desktop.inc"
#
# rename "packages/gnome/gnome-doc-utils_0.12.0.bb"
# to "packages/gnome/gnome-doc-utils.inc"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch"
# to "packages/libsdl/files/explicit-extern-C.patch"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch"
# to "packages/libsdl/files/fixlibs-1.2.9.patch"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch"
# to "packages/libsdl/files/kill-stdc++-1.2.9.patch"
#
# rename "packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch"
# to "packages/libsdl/files/pygame-1.2.9.patch"
#
# rename "packages/navit/navit_0.0.3.bb"
# to "packages/navit/navit_0.0.4.bb"
#
# rename "packages/python/python-dbus_0.81.1.bb"
# to "packages/python/python-dbus_0.82.4.bb"
#
# rename "packages/qclockchange/qclockchange_0.1a.bb"
# to "packages/qclockchange/qclockchange_0.1b.bb"
#
# rename "packages/sqlite/sqlite3_3.5.2.bb"
# to "packages/sqlite/sqlite3_3.5.6.bb"
#
# rename "packages/sylpheed/claws-mail_3.2.0.bb"
# to "packages/sylpheed/claws-mail_3.3.0.bb"
#
# rename "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.bb"
# to "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.17.1.bb"
#
# rename "packages/sylpheed/claws-plugin-rssyl_0.17.bb"
# to "packages/sylpheed/claws-plugin-rssyl_0.18.bb"
#
# rename "packages/xorg-lib/diet-x11/X18NCMSstubs.diff"
# to "packages/xorg-lib/libx11/X18NCMSstubs.diff"
#
# rename "packages/xorg-lib/diet-x11/fix-disable-xlocale.diff"
# to "packages/xorg-lib/libx11/fix-disable-xlocale.diff"
#
# rename "packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch"
# to "packages/xorg-lib/libx11/fix-utf8-wrong-define.patch"
#
# rename "packages/xorg-lib/diet-x11/xchar2b.patch"
# to "packages/xorg-lib/libx11/xchar2b.patch"
#
# rename "packages/xorg-lib/diet-x11/xim.patch"
# to "packages/xorg-lib/libx11/xim.patch"
#
# rename "packages/xorg-lib/files/ruutf8.patch"
# to "packages/xorg-lib/libx11/ruutf8.patch"
#
# rename "packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch"
# to "packages/xorg-xserver/files/fix-picturestr-include-order.patch"
#
# add_dir "packages/amule"
#
# add_dir "packages/amule/files"
#
# add_dir "packages/blackbox"
#
# add_dir "packages/blackbox/files"
#
# add_dir "packages/libjson"
#
# add_dir "packages/pidgin"
#
# add_dir "packages/qclockchange/files"
#
# add_dir "packages/zziplib/files"
#
# add_file "packages/amule/amule_2.1.3.bb"
# content [e94b17ff6a0526951854c033da5fe53b89be7198]
#
# add_file "packages/amule/files/parser.patch"
# content [aa35fa9621c341aaf36abdc4f0a42887e4e6e384]
#
# add_file "packages/blackbox/blackbox_0.70.1.bb"
# content [c55a60fa665f71aec0f5d1cf15a02e2041beb430]
#
# add_file "packages/blackbox/files/remove-host-includes.patch"
# content [135a714bb06f37322d098287a3f9cfd80fbf3dc1]
#
# add_file "packages/busybox/busybox-1.9.1/sort-z-nul.patch"
# content [b88c15e782daa61e071866a288ff781d61417aea]
#
# add_file "packages/bvi/bvi-1.3.1/no-strip.patch"
# content [8aa06ec85a10a462d26acfa11783ee565de3e70c]
#
# add_file "packages/gnome/gnome-desktop_2.18.3.bb"
# content [6079856c781ba60fdff12f64b4d1588ca08852a5]
#
# add_file "packages/gnome/gnome-doc-utils_0.12.0.bb"
# content [a19715799f019c23ef02f4de5acf3c726bec8650]
#
# add_file "packages/ipkg/files/enable_debversion.patch"
# content [cfd1c8fd5cad184b93ed62423f5d2cc8d5cbbeb4]
#
# add_file "packages/ipkg/files/update_version_comparision.patch"
# content [b27a147719155ca75d7585e69ef2e15235abdcbc]
#
# add_file "packages/libjson/libjson_0.6.bb"
# content [57349c69fb7f4206bcae0906624bdedfd3f6a5b8]
#
# add_file "packages/libsdl/files/pagesize.patch"
# content [685e5e3d3f38aaf2558a01e5d26f04248d55e40f]
#
# add_file "packages/libsdl/libsdl.inc"
# content [50d941276aa6e48d473b59355b178be3c185f8c5]
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch"
# content [84ca7646072efff95ac1ba21996214de0887506e]
#
# add_file "packages/qclockchange/files/qclockchange.desktop"
# content [dd18cef1ed03f54eced000fbd7443d98bba85a15]
#
# add_file "packages/qclockchange/files/qclockchange.png"
# content [73367d739fe256beff7ab2dd31953eb14bdfdeab]
#
# add_file "packages/vnc/fbvncserver2_cvs.bb"
# content [affb7e2986079e80ae14eba4279210b477c36c1b]
#
# add_file "packages/wireshark/tshark_0.99.4.bb"
# content [4b37a9286676af526c662a32c4c6ad0a42072b44]
#
# add_file "packages/zaurusd/files/01-check-toggle-landscape"
# content [3d6f3e9114b1f3875520057e769b204608e3625b]
#
# add_file "packages/zaurusd/files/01-check-toggle-portait"
# content [4a37c39669043da2c5f372437f47d8cb8554b9bf]
#
# add_file "packages/zziplib/files/zip_c.patch"
# content [5a1b10b7bdfcd3ede45622e769e74a85c073322a]
#
# add_file "packages/zziplib/files/zziplib-0.10-disable-test.patch"
# content [10e988637c7b16ec0764d5e3807f35df8088692a]
#
# add_file "packages/zziplib/files/zziplib-autoconf.patch"
# content [dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5]
#
# add_file "packages/zziplib/zziplib-native_0.12.83.bb"
# content [ede5c99b34a71e21c2dc525151e4887d1deeedaf]
#
# add_file "packages/zziplib/zziplib-native_0.13.49.bb"
# content [ede5c99b34a71e21c2dc525151e4887d1deeedaf]
#
# add_file "packages/zziplib/zziplib.inc"
# content [9a67bcd8922c5b4d0c3f5af31e526679eec903fe]
#
# add_file "packages/zziplib/zziplib_0.12.83.bb"
# content [9cd2de2ced26f127393f3867ae22cc0735af0f98]
#
# add_file "packages/zziplib/zziplib_0.13.49.bb"
# content [7d6440e10cbf756b2998f5b398f3a20a81455672]
#
# patch "classes/base.bbclass"
# from [1b34e4a362d34a52711b4639d6da382b6ddcf3c8]
# to [b9e3242f33b6557cb0a7ae902cf31b9a284c1db3]
#
# patch "classes/kernel.bbclass"
# from [3aa638c9a8de8e90342e08b530a40c8c2f120497]
# to [f6edb57c93d376a79d6495683e17bddaa5e58f82]
#
# patch "classes/package.bbclass"
# from [31efdfccff0ea3fd6bdb3476c5dd2c61c54179f9]
# to [dc63605ba8dcffa74084780d9c48b0ca2578fd0e]
#
# patch "classes/package_deb.bbclass"
# from [a66d4de9c722f1036751451a493943d826067859]
# to [7d3c717409e185acf693d9654d2623edca784403]
#
# patch "classes/package_ipk.bbclass"
# from [026a54435a436ef29405fa6b02afea519cc76ce7]
# to [fdf9fdf2855198b24b017026dd3777995b2977d2]
#
# patch "classes/package_rpm.bbclass"
# from [544d06eecdf8053fd26fb5ad0149bf70d704de12]
# to [a1fb065dd1092df200d5baf08e48408748eea688]
#
# patch "classes/package_tar.bbclass"
# from [cb0aff337888acb90332c226a3b5ba7c508f5190]
# to [890d4262a3d5d0dcbe7a0ed77680af01177555e8]
#
# patch "conf/distro/colinuxoe.conf"
# from [ccdddecbd8f6e1e25357bbf924e495e75a035370]
# to [4f165f8548d04da3291cbc867c1706b00ee32f28]
#
# patch "conf/distro/generic-uclibc.conf"
# from [2280bf1003490f3615211613df40817df22352d3]
# to [4b6c77936994e0b78819a2d3d1f6a9e68262429f]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
# to [66432a75530815dc67cbefefa5709c66ca453cf9]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
# to [dd29a8bfa10a0d3f786220dee4b2c942deb59552]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.0.inc"
# from [e17d1ac473c7551aa878a4025a0c72d1299ddee1]
# to [0414701d17a1c2f342d391ce49ccd43dbdf2f92d]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.1.inc"
# from [22d02a23b97d863397deca71f6cf47ac842a3041]
# to [be10d29bb8807639b7ec4fff641a33f48a5d33fb]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.2.inc"
# from [e56e290af0c2177e02d83403e1a8719853127dba]
# to [554e0995c7ce93e7c76bf2affe531b1e77fd7e1d]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
# from [f0d0e9e8047b09eef4e513465a8e27652b9757d0]
# to [5f058c2bfda8331944c60e4241fb698a16acae65]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.4.inc"
# from [2bd8404a566895df3ee956c8fec2fb169386ffc9]
# to [1c80460587c91260a4733ef34bf4747aef7fc19b]
#
# patch "conf/distro/include/preferred-xorg-versions.inc"
# from [defa236a54b9b69361fb032b1fe6ec8b63cdc8e4]
# to [20bb18b5b3e0c5b530f74f5b0d3b9b050fcf972c]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [d864a60f9ae785c0ec3e27ce5ea71dacd656d7de]
# to [c50ac937f3aa1f2966905448c3afbb2e1bb0025f]
#
# patch "conf/distro/nylon.conf"
# from [8023e0c2edd176168e71abdd5abe8904105e6ba7]
# to [55b55fd58b093f18dc69ad389287e77c548403ae]
#
# patch "conf/distro/openmoko.conf"
# from [32e366a34046342c394581a28fe3f1af2a0a1a4c]
# to [4512da55b21499913ae1534988c81c3c26b99c64]
#
# patch "conf/distro/openwrt-sdk.conf"
# from [1107f0f69397f0e0bf38f74a1414c0ec52f30efe]
# to [ea179aceed5e9e4a66d8e68157c441bbb085122f]
#
# patch "conf/machine/nokia770.conf"
# from [b58eed429663f0f6aabcf2e4b041d266fdc463f3]
# to [166593848b21599e1958aa05bef25162b9e867e4]
#
# patch "conf/sanity.conf"
# from [9ad5f1d9953217df59e03a3c6727b8246f383334]
# to [8074d545842c568a6a98bad4358a6da7c037e6c6]
#
# patch "packages/alsa/alsa-state/akita/asound.state"
# from [799c8bd0c2ed692f4558b6e6803920404254941a]
# to [823acf9c49bf716030e7a5700a73704a897ebb5a]
#
# patch "packages/alsa/alsa-state/spitz/asound.state"
# from [cfae718855d1e5dfb6361f15edcb3f9b9a8356d0]
# to [823acf9c49bf716030e7a5700a73704a897ebb5a]
#
# patch "packages/altboot/altboot.inc"
# from [336e728d9129e883c155439bd6e2298237b4ef44]
# to [d3809c5f6c0e44f5d01721e72c66baab65ab1cc9]
#
# patch "packages/altboot/altboot_1.0.8+1.0.9_pre1.bb"
# from [afdeba748d44ac6c81823deabecdba5be4f4caf3]
# to [4a2609db809912e107eab9f34853b3748bbc8622]
#
# patch "packages/altboot/altboot_1.0.8.bb"
# from [a63e82e147eb3d71871ae1f06a484f9d14a39db6]
# to [64c42009c72bd11c7dbe56f787bbada179331c7b]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR78.bb"
# from [2ba799e0906a42e4430aa1f44ffae3a2066c1d43]
# to [23034faf0bf4b951b3987f4253824cfdc50c4459]
#
# patch "packages/altboot/altboot_svn.bb"
# from [ff3c96a2e2b55419fb0d7d72dd3d6df341f015e7]
# to [4d5fc6b4d7435abb435a0e72cc534fb6ee5c8d0e]
#
# patch "packages/busybox/busybox_1.9.1.bb"
# from [3a914925d1165b2233a86cff45de9256eb4eb9d3]
# to [49749d22f545c3b4e7a19e560079375738c0afdb]
#
# patch "packages/bvi/bvi_1.3.1.bb"
# from [1177f5638bb0269e077a6f31a022b9216b523c01]
# to [ffe4179f0cc74d71bed9ade8b379b6012dedf284]
#
# patch "packages/dbus/dbus.inc"
# from [d2ebf6fc194524deeab9e6da2a97e839999171a9]
# to [f59c7592c9d9fa4d19d5c3debfde3b58b9bfdf79]
#
# patch "packages/dbus/dbus_1.1.4.bb"
# from [a941688e3a8621769a37bb46e79d4f2d5764966a]
# to [4586c438a647255b3ee0c4705493aa5f104d5d63]
#
# patch "packages/djvulibre/djvulibre_3.5.20.bb"
# from [31780467586c24a7eb4054b32db0e117544ef4e0]
# to [827101405780029d53ee9eedf270321d2478d5ad]
#
# patch "packages/e17/e-wm_cvs.bb"
# from [1bdace24c8d78006d562086cae87603c61046c8a]
# to [a08de1bb584a6652174d86c1429131d56738c3e9]
#
# patch "packages/efl1/ecore-native_cvs.bb"
# from [5bd60a7af1398231f76c6398fe56302fd0365b70]
# to [c6e59d187a86e3879d6706eec131fcb2ef20df8f]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [cfa8c9faeecc70a284baf78119129a3ec85c1639]
# to [74d5840965d9e8477bcde441cc02899c2baf051b]
#
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
# from [167721af066a09e26ab279f696bf462251ed0cc9]
# to [ac7f8d6c162628225adcbcb477947c7dbf843fbe]
#
# patch "packages/gammu/gammu_1.17.0.bb"
# from [dbbfbd2cf47cb31eb603a90b621a074f7786c9f0]
# to [32f447033fd0c855eefaac567bda64e17b60b004]
#
# patch "packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch"
# from [6148ea439041ba0af321d2298fea9a6d602f585e]
# to [3df45360067c99ecdec52e388d544e6bd01f5efd]
#
# patch "packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch"
# from [6148ea439041ba0af321d2298fea9a6d602f585e]
# to [3df45360067c99ecdec52e388d544e6bd01%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r7cc9c98056838b4d2eb67baf00c13e220ae94a0a -rb1eda41fd5a73d8e2f521e7ad1668a7736e90afd
#
#
#
# patch "packages/vim/gvim_7.0.bb"
# from [aca392c46df5bcfb14ee82d2c98c15441e2f9e43]
# to [0a49cbbd6b912f9b8c9547ee29032ec0c986b41c]
#
============================================================
--- packages/vim/gvim_7.0.bb aca392c46df5bcfb14ee82d2c98c15441e2f9e43
+++ packages/vim/gvim_7.0.bb 0a49cbbd6b912f9b8c9547ee29032ec0c986b41c
@@ -1,8 +1,8 @@ require vim.inc
VIMVER = "70"
require vim.inc
-DEPENDS += "gtk+"
+DEPENDS += "gtk+ xt"
PR = "r1"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
More information about the Openembedded-commits
mailing list