[oe-commits] org.oe.dev merge of '4f1c373d43a7c1b912b21780d67df8ccec796116'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Feb 19 16:25:39 UTC 2008
merge of '4f1c373d43a7c1b912b21780d67df8ccec796116'
and 'd684223b6fbdf20a18d598446664827707b7dd91'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 96cde176098aad6ac5bbe96aa5d939a61de53f6d
ViewMTN: http://monotone.openembedded.org/revision/info/96cde176098aad6ac5bbe96aa5d939a61de53f6d
Files:
1
classes/packaged-staging.bbclass
packages/acpid/acpid-1.0.3
packages/acpid/acpid-1.0.3/gcc40.patch
packages/initrdscripts/initramfs-image-ipk_1.0.bb
packages/initrdscripts/kernel-initramfs_1.0.bb
packages/libpng/libpng-native_1.2.19.bb
packages/libpng/libpng_1.2.19.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/wxbase
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
classes/packaged-staging2.bbclass
packages/acpid/acpid-1.0.4
packages/acpid/acpid
packages/djvulibre/djvulibre_3.5.19.bb
packages/djvulibre/djvulibre_3.5.20.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/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/wxbase/wxbase_2.6.2.bb
packages/wxwidgets/wxbase_2.6.2.bb
packages/wxbase/wxbase_2.7+cvs.bb
packages/wxwidgets/wxbase_2.7+cvs.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/qclockchange/files
packages/amule/amule_2.1.3.bb
packages/amule/files/parser.patch
packages/at76c503a/at76c503a-modules_0.17.bb
packages/ipkg/files/enable_debversion.patch
packages/ipkg/files/update_version_comparision.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc831x-nand.patch
packages/qclockchange/files/qclockchange.desktop
packages/qclockchange/files/qclockchange.png
packages/wireshark/tshark_0.99.4.bb
classes/base.bbclass
classes/image.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/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/openmoko.conf
conf/machine/h5000.conf
conf/machine/include/zaurus-2.6.inc
conf/machine/nokia770.conf
conf/sanity.conf
packages/acpid/acpid/gcc40.patch
packages/anki/anki_0.4.3.bb
packages/busybox/busybox-1.9.1/adduser-longops.patch
packages/e17/e-wm_cvs.bb
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore_cvs.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.1/zecke-no-host-includes.patch
packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
packages/gcc/gcc-package.inc
packages/gcc/gcc_4.2.2.bb
packages/glibc/glibc-2.4/zecke-sane-readelf.patch
packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
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/gstreamer/gst-plugin-pulse_0.9.7.bb
packages/gtk-webcore/osb-nrcore.inc
packages/icewm/icewm_1.2.20.bb
packages/icewm/icewm_1.2.30.bb
packages/initrdscripts/devimage_0.1.bb
packages/initrdscripts/files/10-initfs.sh
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/files/85-blockboot.sh
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-module-block_1.0.bb
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-initfs_1.0.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/ipkg/ipkg-native_0.99.163.bb
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
packages/libmrss/files/better-parse-url-r0.patch
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/pxafb.patch
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/openmoko2/openmoko-sound-system2/session
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/psplash/files/logo-math.patch
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.9.bb
packages/tasks/task-base.bb
packages/tasks/task-opie-all.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/zten/files/zten.patch
packages/zten/zten_1.6.2.bb
mtn:manual_merge
true
packages/vnc/fbvncserver2_cvs.bb
Diffs:
#
# mt diff -r4f1c373d43a7c1b912b21780d67df8ccec796116 -r96cde176098aad6ac5bbe96aa5d939a61de53f6d
#
#
#
# delete "classes/packaged-staging.bbclass"
#
# delete "packages/acpid/acpid-1.0.3"
#
# delete "packages/acpid/acpid-1.0.3/gcc40.patch"
#
# delete "packages/initrdscripts/initramfs-image-ipk_1.0.bb"
#
# delete "packages/initrdscripts/kernel-initramfs_1.0.bb"
#
# delete "packages/libpng/libpng-native_1.2.19.bb"
#
# delete "packages/libpng/libpng_1.2.19.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/wxbase"
#
# 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"
#
# rename "classes/packaged-staging2.bbclass"
# to "classes/packaged-staging.bbclass"
#
# rename "packages/acpid/acpid-1.0.4"
# to "packages/acpid/acpid"
#
# rename "packages/djvulibre/djvulibre_3.5.19.bb"
# to "packages/djvulibre/djvulibre_3.5.20.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/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/wxbase/wxbase_2.6.2.bb"
# to "packages/wxwidgets/wxbase_2.6.2.bb"
#
# rename "packages/wxbase/wxbase_2.7+cvs.bb"
# to "packages/wxwidgets/wxbase_2.7+cvs.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/qclockchange/files"
#
# add_file "packages/amule/amule_2.1.3.bb"
# content [e94b17ff6a0526951854c033da5fe53b89be7198]
#
# add_file "packages/amule/files/parser.patch"
# content [aa35fa9621c341aaf36abdc4f0a42887e4e6e384]
#
# add_file "packages/at76c503a/at76c503a-modules_0.17.bb"
# content [684ad95a1c7f9fb930a8aea5710d5f65a2f4e887]
#
# 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/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/wireshark/tshark_0.99.4.bb"
# content [4b37a9286676af526c662a32c4c6ad0a42072b44]
#
# patch "classes/base.bbclass"
# from [1b34e4a362d34a52711b4639d6da382b6ddcf3c8]
# to [b9e3242f33b6557cb0a7ae902cf31b9a284c1db3]
#
# patch "classes/image.bbclass"
# from [73120c465f8175c72d4001b3985cab785ee72ced]
# to [3ee271e04e5f55aafbefcc98d3e2d4a69568301f]
#
# patch "classes/kernel.bbclass"
# from [6eb314eeb40f044c37be9df698f02b9c149aa6f8]
# 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/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 [06c680c836e1f326a6ad003d8e7198e317e64709]
# to [c50ac937f3aa1f2966905448c3afbb2e1bb0025f]
#
# patch "conf/distro/openmoko.conf"
# from [32e366a34046342c394581a28fe3f1af2a0a1a4c]
# to [4512da55b21499913ae1534988c81c3c26b99c64]
#
# patch "conf/machine/h5000.conf"
# from [b0fe52891e392a5d43162145964546c7517d27e4]
# to [3ea37b416dd8fc0749b3f3ea3c6e59cf6fe06138]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [39d33e732bf59736015329814890e175fef292aa]
# to [28f9350146ad28dc16ffd19ca0f09a93374826cb]
#
# patch "conf/machine/nokia770.conf"
# from [b58eed429663f0f6aabcf2e4b041d266fdc463f3]
# to [166593848b21599e1958aa05bef25162b9e867e4]
#
# patch "conf/sanity.conf"
# from [9ad5f1d9953217df59e03a3c6727b8246f383334]
# to [8074d545842c568a6a98bad4358a6da7c037e6c6]
#
# patch "packages/acpid/acpid/gcc40.patch"
# from [cf30b18ca31b7673bb4d0ab17cbc878a85931824]
# to [35d3c4c5e9be1ba04272e75faafb2e8f72c1ade0]
#
# patch "packages/anki/anki_0.4.3.bb"
# from [9835acc146314e91072d7098eeda6a3a4f40d543]
# to [31ac492693b17db388f5871371697d2f5bc0b838]
#
# patch "packages/busybox/busybox-1.9.1/adduser-longops.patch"
# from [661b2538eda36e581314cde361bb3efe6411959b]
# to [3737526f742ab3a8325c20ac9e35f2f74f1b10bf]
#
# 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/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 [3df45360067c99ecdec52e388d544e6bd01f5efd]
#
# patch "packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch"
# from [6e9d8445c31e423d84214b7b5560ebd144b1fb51]
# to [0078a4cb532f5bbf3ac56c8b4ccd752667e2ebb7]
#
# patch "packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch"
# from [6148ea439041ba0af321d2298fea9a6d602f585e]
# to [3df45360067c99ecdec52e388d544e6bd01f5efd]
#
# patch "packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch"
# from [6148ea439041ba0af321d2298fea9a6d602f585e]
# to [3df45360067c99ecdec52e388d544e6bd01f5efd]
#
# patch "packages/gcc/gcc-package.inc"
# from [760299e5f8168507c53a5d73b89438f7a75d5c7c]
# to [29d6e860f56905f8f155890e57612975fabd4f9b]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [b649640ada6aa7b3be9155792213ea7689d6e6ac]
# to [e3cc18f11ea8954870f79c7a095814c2a298871d]
#
# patch "packages/glibc/glibc-2.4/zecke-sane-readelf.patch"
# from [1bf40ba5b96f9f1b55bfc59a01c270ca3d3ba229]
# to [1aedabaa230e8af859575e07484944f4b135b283]
#
# patch "packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch"
# from [83b1a8059735512cca0723c69deefedefe53ae34]
# to [dddc4f563edeb427c1e1fa4846f3f4a6fc4d954f]
#
# patch "packages/gnome/gnome-desktop.inc"
# from [ef92f7acaa754891bf23e36646e9c3faa46a8a6c]
# to [ae7d1f621863cadbef05eb1f7f7f0ff5238b949f]
#
# patch "packages/gnome/gnome-desktop_2.10.2.bb"
# from [9d8ed2560882aa4b8ce7f82115ed70e10d71a9b8]
# to [ea2004e40d21245dbc62c44f4224bc622966d11d]
#
# patch "packages/gnome/gnome-desktop_2.16.1.bb"
# from [565cba914027dd074428c1510c94057850e452ca]
# to [26b93ff26ce2ebe90d9da2d9e73875c725298e3f]
#
# patch "packages/gnome/gnome-desktop_2.7.90.bb"
# from [672cf3775b27ea7c0ca4479a528992bf28309f93]
# to [306e90595f3048833eace7255a0575e0ff9bd465]
#
# patch "packages/gnome/gnome-doc-utils.inc"
# from [20041d84ef0cc9aeae12802d43820966a313b667]
# to [c8e230031563a67eea32291c7e49e7e13ea71bb7]
#
# patch "packages/gnome/gnome-doc-utils_0.10.3.bb"
# from [769f90e66d1d2edcc7554bb98f763f4c6fcc1a1d]
# to [5e65c0d1c85e79f4a5aee77aeaa4e5434b746c83]
#
# patch "packages/gnome/gnome-doc-utils_0.7.1.bb"
# from [95ce2c16e2b48e5150f7697d34e97d40b964dad9]
# to [a19715799f019c23ef02f4de5acf3c726bec8650]
#
# patch "packages/gstreamer/gst-plugin-pulse_0.9.7.bb"
# from [5554f865191f1f521ae855a40f67b2d8b13bc4ac]
# to [c8b0b0e80f6d09a6542f2e0f6bbcfc2bee77c1c4]
#
# patch "packages/gtk-webcore/osb-nrcore.inc"
# from [fcbcebe1996ba7e345c0c82426a17e5ae37ba241]
# to [a81dab6970cf3f620379e415339da87027c19963]
#
# patch "packages/icewm/icewm_1.2.20.bb"
# from [0a027303c29416712c81e2ca8184eca58c4b12bb]
# to [12b5608a153a95d3d909b54fd317f078ed8eca48]
#
# patch "packages/icewm/icewm_1.2.30.bb"
# from [f7b7e77c36d0b7c8aeb429d0d3612d4d700b6be6]
# to [1afb403a34441aa9e4586f80e8bd2a29028cf9a4]
#
# patch "packages/initrdscripts/devimage_0.1.bb"
# from [955c0d0e038ef20daa3fd5247047bf341c3f5116]
# to [88d34c65381db0061c854a2000edef77b08e3a06]
#
# patch "packages/initrdscripts/files/10-initfs.sh"
# from [31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9]
# to [5f0d6f2403263afd21f7a7a0b34c979666f7a4ef]
#
# patch "packages/initrdscripts/files/30-bootmenu.sh"
# from [fa8ea4dd925ccbd5bbc48f509c2c02ba47bc73e8]
# to [b378e73bcd2daa97bd9e9134000a2ade7fe2538f]
#
# patch "packages/initrdscripts/files/85-blockboot.sh"
# from [e1e0ab71a19561305b6a02ff169c7e789c5359ae]
# to [e0ae45c3c5c308f37255fd249ea75bdacb3d5f67]
#
# patch "packages/initrdscripts/files/init.sh"
# from [d6057201f9ee2a9e2d44ed71124d43142bc1a05f]
# to [96fb4bc0a57019aa64a5b8316e5868a507195f87]
#
# patch "packages/initrdscripts/initramfs-module-block_1.0.bb"
# from [1d63081f1074144e693737bd6ca954bd64c1b1a2]
# to [7ce2aaa3caaaea18e4f89c97ac9fda1e79b2f1a4]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [f13252f06b1023c948e8295f3ee95c0eda773899]
# to [ed86798f2ad4cb2713e525c7939d02a161e7465a]
#
# patch "packages/initrdscripts/initramfs-module-initfs_1.0.bb"
# from [e8b2ca5b6f8808155c08371d32e7b42f94caa7bb]
# to [71d1fee98407e78577c2537c60488436d5a31c88]
#
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# from [716f3127ca0421f8c9920adbb82ec03ace9a4717]
# to [614ab72976521dc2833ecb9383e5556d18c05fa6]
#
# patch "packages/ipkg/ipkg-native_0.99.163.bb"
# from [f62a84dc0cdc3962fb9564cd48a0fd07dd475723]
# to [0d7e87a2e2f66d624a7e034690d53d974ae9e57e]
#
# patch "packages/ipkg/ipkg.inc"
# from [fc113df6d214da7a33273c7512dac5215da76f90]
# to [332bfe0f61d6c8443783d20a9719146515a88286]
#
# patch "packages/ipkg/ipkg_0.99.163.bb"
# from [3a58f561fcf234def5a100e624f4c721f86946%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd684223b6fbdf20a18d598446664827707b7dd91 -r96cde176098aad6ac5bbe96aa5d939a61de53f6d
#
#
#
# add_file "packages/vnc/fbvncserver2_cvs.bb"
# content [affb7e2986079e80ae14eba4279210b477c36c1b]
#
============================================================
--- packages/vnc/fbvncserver2_cvs.bb affb7e2986079e80ae14eba4279210b477c36c1b
+++ packages/vnc/fbvncserver2_cvs.bb affb7e2986079e80ae14eba4279210b477c36c1b
@@ -0,0 +1,21 @@
+DESCRIPTION = "A Framebuffer VNC Server for PDA"
+AUTHOR = "Patrik Gfeller <gfellerpatrik at gmx.net>"
+HOMEPAGE = "http://fbvncserver.sourceforge.net/"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "libvncserver jpeg zlib gmp tslib"
+RRECOMMENDS = "kernel-modules-uinput kernel-module-keybdev"
+RCONFLICTS = "fbvncserver, fbvncserver-kmodule"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@fbvncserver.cvs.sourceforge.net/cvsroot/fbvncserver;method=pserver;module=ipkg"
+S = "${WORKDIR}/ipkg/src/"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-debug"
+
+FILES_${PN} += "${datadir}"
+
More information about the Openembedded-commits
mailing list