[oe-commits] org.oe.dev merge of '9e9036263aa2cf4c53293c1bd44b54810ab8834f'

koen commit oe at amethyst.openembedded.net
Mon Sep 1 18:00:38 UTC 2008


merge of '9e9036263aa2cf4c53293c1bd44b54810ab8834f'
     and 'bfc7cf00ad3b7b17b8c438b23a1b5de36ceef986'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 3524f95973c4d649f6013153f08a02abd9310c20
ViewMTN: http://monotone.openembedded.org/revision/info/3524f95973c4d649f6013153f08a02abd9310c20
Files:
1
packages/freesmartphone/illume-theme-freesmartphone_git.bb
packages/gettext/gettext-native_0.14.1.bb
packages/gettext/gettext-native_0.17.bb
packages/gettext/gettext_0.14.1.bb
packages/gettext/gettext_0.17.bb
packages/gettext/gettext-0.17
packages/glib-2.0/glib-2.0-2.16.4
packages/gtk+/gtk+-2.12.11
packages/neuros-public/neuros-nwm
packages/numptyphysics/numptyphysics
packages/xorg-font/xorg-minimal-fonts
packages/xorg-font/xorg-minimal-fonts/misc
packages/alsa/alsa-lib_1.0.17.bb
packages/alsa/alsa-oss_1.0.17.bb
packages/alsa/alsa-plugins_1.0.17.bb
packages/alsa/alsa-utils_1.0.17.bb
packages/c-ares/c-ares_1.5.2.bb
packages/gettext/gettext-0.17/autotools.patch
packages/gettext/gettext-0.17/gettext-error_print_progname.patch
packages/gettext/gettext-0.17/wchar-uclibc.patch
packages/gimp/gimp_2.5.2.bb
packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch
packages/glib-2.0/glib-2.0_2.16.4.bb
packages/gtk+/gtk+-2.12.11/cellrenderer-cairo.patch
packages/gtk+/gtk+-2.12.11/combo-arrow-size.patch
packages/gtk+/gtk+-2.12.11/disable-print.patch
packages/gtk+/gtk+-2.12.11/entry-cairo.patch
packages/gtk+/gtk+-2.12.11/hardcoded_libtool.patch
packages/gtk+/gtk+-2.12.11/menu-deactivate.patch
packages/gtk+/gtk+-2.12.11/no-demos.patch
packages/gtk+/gtk+-2.12.11/pangoxft2.10.6.diff
packages/gtk+/gtk+-2.12.11/range-no-redraw.patch
packages/gtk+/gtk+-2.12.11/run-iconcache.patch
packages/gtk+/gtk+-2.12.11/scrolled-placement.patch
packages/gtk+/gtk+-2.12.11/toggle-font.diff
packages/gtk+/gtk+_2.12.11.bb
packages/neuros-public/neuros-nwm/init
packages/numptyphysics/numptyphysics/gcc43.diff
packages/oprofile/oprofile/0.9.4-armv7a.diff
packages/oprofile/oprofile/opjitconv-execvp-fix.diff
packages/oprofile/oprofile_0.9.4.bb
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias
packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir
packages/xorg-font/xorg-minimal-fonts.bb
classes/autotools.bbclass
classes/cpan.bbclass
conf/checksums.ini
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/beagleboard.conf
contrib/source-checker/oe-source-checker.py
packages/gnuradio/gnuradio_3.1.2.bb
packages/images/beagleboard-demo-image.bb
packages/linux/linux-kaiser_2.6.24+git.bb
packages/linux/linux-neuros/neuros-osd2/defconfig
packages/linux/linux-neuros_git.bb
packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
packages/mozilla/firefox_3.0.1.bb
packages/neuros-public/neuros-mainmenu_git.bb
packages/neuros-public/neuros-nwm_git.bb
packages/numptyphysics/numptyphysics_svn.bb
packages/oprofile/oprofile/armv7a.diff
packages/oprofile/oprofile_0.9.3.bb
packages/quake/quetoo_0.6.1.bb
packages/tasks/task-base.bb
packages/u-boot/u-boot_git.bb
packages/x-load/x-load_git.bb
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg/xorg.conf
packages/xorg-xserver/xserver-xorg_1.4.2.bb
packages/xorg-xserver/xserver-xorg_1.4.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -r9e9036263aa2cf4c53293c1bd44b54810ab8834f -r3524f95973c4d649f6013153f08a02abd9310c20
#
#
#
# patch "packages/freesmartphone/illume-theme-freesmartphone_git.bb"
#  from [74dd3d5b16c2639392c7ef886407ef20da006d74]
#    to [7d8251f9fa4e5a7357094ef5e02174512e643850]
#
============================================================
--- packages/freesmartphone/illume-theme-freesmartphone_git.bb	74dd3d5b16c2639392c7ef886407ef20da006d74
+++ packages/freesmartphone/illume-theme-freesmartphone_git.bb	7d8251f9fa4e5a7357094ef5e02174512e643850
@@ -2,11 +2,16 @@ PV = "0.0+gitr${SRCREV}"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
 PV = "0.0+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/illume"
 
+do_compile() {
+   cd illume && ./build.sh && cd ..
+   cd illume_init && ./build.sh && cd ..
+}
+
 do_install() {
     install -d ${D}${sysconfdir}/enlightenment
     install -d ${D}${datadir}/enlightenment/data/themes/
@@ -15,8 +20,8 @@ do_install() {
     # Make illume the default profile
     echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
 
-    install -m 0644 ${S}/illume.edj ${D}${datadir}/enlightenment/data/themes/
-    install -m 0644 ${S}/illume_init.edj ${D}${datadir}/enlightenment/data/init/
+    install -m 0644 ${S}/illume/illume.edj ${D}${datadir}/enlightenment/data/themes/
+    install -m 0644 ${S}/illume_init/illume_init.edj ${D}${datadir}/enlightenment/data/init/
 }
 
 RPROVIDES_${PN} = "illume-theme"


#
# mt diff -rbfc7cf00ad3b7b17b8c438b23a1b5de36ceef986 -r3524f95973c4d649f6013153f08a02abd9310c20
#
#
#
# rename "packages/gettext/gettext-native_0.14.1.bb"
#     to "packages/gettext/gettext-native_0.17.bb"
# 
# rename "packages/gettext/gettext_0.14.1.bb"
#     to "packages/gettext/gettext_0.17.bb"
# 
# add_dir "packages/gettext/gettext-0.17"
# 
# add_dir "packages/glib-2.0/glib-2.0-2.16.4"
# 
# add_dir "packages/gtk+/gtk+-2.12.11"
# 
# add_dir "packages/neuros-public/neuros-nwm"
# 
# add_dir "packages/numptyphysics/numptyphysics"
# 
# add_dir "packages/xorg-font/xorg-minimal-fonts"
# 
# add_dir "packages/xorg-font/xorg-minimal-fonts/misc"
# 
# add_file "packages/alsa/alsa-lib_1.0.17.bb"
#  content [9e11f02fb101b03a358b6a471d7420f82daac4bd]
# 
# add_file "packages/alsa/alsa-oss_1.0.17.bb"
#  content [4fa7f36a2c197c321f519368d1288b60ad07d66d]
# 
# add_file "packages/alsa/alsa-plugins_1.0.17.bb"
#  content [8f085bb2de8e8094c4500114a767eee8ce9b5612]
# 
# add_file "packages/alsa/alsa-utils_1.0.17.bb"
#  content [54364f933c80321c56eb6cac650adafa7ef0db63]
# 
# add_file "packages/c-ares/c-ares_1.5.2.bb"
#  content [505185c7a686a2a14c13e82721d6b88854813f7e]
# 
# add_file "packages/gettext/gettext-0.17/autotools.patch"
#  content [ec263abf653b43c91d83157df78087f3f1523c85]
# 
# add_file "packages/gettext/gettext-0.17/gettext-error_print_progname.patch"
#  content [64a9f6d5686b4ab0c6a01a26c5ab3dec32843732]
# 
# add_file "packages/gettext/gettext-0.17/wchar-uclibc.patch"
#  content [73e1d5a5c03f5d656a1e636325b0fbce9d3def8d]
# 
# add_file "packages/gettext/gettext-native_0.14.1.bb"
#  content [2e903067b552793b23bc96c5ec738ada09f03316]
# 
# add_file "packages/gettext/gettext_0.14.1.bb"
#  content [3a0fa051089a75ecb61149ba3b56405116c60bb2]
# 
# add_file "packages/gimp/gimp_2.5.2.bb"
#  content [9c89b8d8103081d0931b9b8ae5eda2e158992b98]
# 
# add_file "packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch"
#  content [3944dc9eb7d2637db0cf7bba8a08ce35a84ccdb9]
# 
# add_file "packages/glib-2.0/glib-2.0_2.16.4.bb"
#  content [5d9c30d63163e5b32ab11e915123af2ceb09d8fd]
# 
# add_file "packages/gtk+/gtk+-2.12.11/cellrenderer-cairo.patch"
#  content [f343e9c8fa9252834d1fc2d38498f7ca81027cf7]
# 
# add_file "packages/gtk+/gtk+-2.12.11/combo-arrow-size.patch"
#  content [86b154ddff681414b9ee93698f070af87eba8941]
# 
# add_file "packages/gtk+/gtk+-2.12.11/disable-print.patch"
#  content [15ba697401f4585005e6347d20498c7b1417f917]
# 
# add_file "packages/gtk+/gtk+-2.12.11/entry-cairo.patch"
#  content [7716bcd4fe95b61148fe31a6054081e08dfa616e]
# 
# add_file "packages/gtk+/gtk+-2.12.11/hardcoded_libtool.patch"
#  content [a40162e85381f42e96a15ef9f6b7a8293f07fd63]
# 
# add_file "packages/gtk+/gtk+-2.12.11/menu-deactivate.patch"
#  content [e0d8b253f81a5a01dbf5ffb9cfadda1799d7a3af]
# 
# add_file "packages/gtk+/gtk+-2.12.11/no-demos.patch"
#  content [765d8c563c164194e2b075eb32f57ef54bbba098]
# 
# add_file "packages/gtk+/gtk+-2.12.11/pangoxft2.10.6.diff"
#  content [c646b9f34fcf6fe7f0ddfef6d3ae66dfe24da0ab]
# 
# add_file "packages/gtk+/gtk+-2.12.11/range-no-redraw.patch"
#  content [2a456a9d163cedfca69de0662b26ad7060a41827]
# 
# add_file "packages/gtk+/gtk+-2.12.11/run-iconcache.patch"
#  content [2ab8f280d83e22b887247404cd6d7ac1afc3ed37]
# 
# add_file "packages/gtk+/gtk+-2.12.11/scrolled-placement.patch"
#  content [7258aed311d562ad735d04a51494b529cf66483b]
# 
# add_file "packages/gtk+/gtk+-2.12.11/toggle-font.diff"
#  content [892becbc52bd83e40c849d6d81f6f25f5d1d36ed]
# 
# add_file "packages/gtk+/gtk+_2.12.11.bb"
#  content [0ea862be3391e179125d0f3d9ef779ecc9dcf19c]
# 
# add_file "packages/neuros-public/neuros-nwm/init"
#  content [82ddbf50f685c08343d915dc96130a9851b515cb]
# 
# add_file "packages/numptyphysics/numptyphysics/gcc43.diff"
#  content [ba984fdfb4155882060212a6b0e3d0e833cbd012]
# 
# add_file "packages/oprofile/oprofile/0.9.4-armv7a.diff"
#  content [e889d7e1f5acd7cd2202f7a0f3cc7d9f74a5b4c3]
# 
# add_file "packages/oprofile/oprofile/opjitconv-execvp-fix.diff"
#  content [20bc469eb7886fb07c121b1cb461a00498da6cdb]
# 
# add_file "packages/oprofile/oprofile_0.9.4.bb"
#  content [9c6c31f398fa4db244e7eb4eee33857e607ada8d]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz"
#  content [429c6b61382bd539052d61e0e492ff06351d415c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz"
#  content [db8ecae135e0d092c20091c93dbd96a8e241ea8c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz"
#  content [05488b45cf91e6fc2583fb970317d3ff62b07e4e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz"
#  content [44a1121639c0366043e14b57614197e456cbdade]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz"
#  content [3beb6a9f8e524c1caeeef4b119a1fd932431be01]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz"
#  content [b68f5991e595ba87974d5b2a2a348e9a41f31ff6]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz"
#  content [5a8f30aa3a84090edd9d9970138f8518ad52ea42]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz"
#  content [f39689a63574d53673ce145236b793a8fb74eb86]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz"
#  content [ce0483714796cf32b129e2942ce43bd90616018c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz"
#  content [1c7c5ebaaec6677141f849f5645a159e9b5ae6c5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz"
#  content [b9a2401a4204bb8e3eb7eab6ceab34cfa84b0b78]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz"
#  content [aa16398f10c3db5d484643953c24712c8560292c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz"
#  content [d664e50af10cda6de4fe527c64ec4c1ee4d2681d]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz"
#  content [1b80980bf41f523d19329a8aeea8b34d5ffcbf0e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz"
#  content [903b975d18174204adc7edd8aefdeb450b11e5e2]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz"
#  content [31be221a15a70ae08c27b7f90d960b4134989b13]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz"
#  content [1770b1947e0b38dd824efd94a1822ee837a55a8d]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz"
#  content [34646b988ede3dd8b014b3c95a6b48797947f5ac]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz"
#  content [0f16a79b6100b05944a24e44dd6c30236993a7cb]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz"
#  content [8e3f20be3888b366abfa6969307ddcd5f8cbe979]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz"
#  content [2d5905c96babfa884e27d2c3a6cd242fbda13808]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz"
#  content [3e0f5a2204c8b6abb4438121599aa4e919ce3e98]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz"
#  content [8a01078bf324b72895e5382b2131cf4e2320dcd8]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz"
#  content [984c0734cf03f8cfcd639ca58e1853b30bc11c64]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz"
#  content [65e8f70706059874a7f3636de1309872121d51ef]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz"
#  content [e19a28316eb5d9f5ddea50bd251a6096cc9ed80c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz"
#  content [c99d4b1acc34525c5b3edc8934055f20993d8734]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz"
#  content [8171a73bd899c977a45be7911e3447ff359fd7ab]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz"
#  content [5ddf8d8f0687adee0cdf59d72197637bf8b3ffe4]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz"
#  content [49b9cd3f8ab1f85617d802849bb1a9659be523c5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz"
#  content [91c33f543dbdd6cd0f501c56f99442ca00350a4e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz"
#  content [2aa33281920e9cdbaf75be8ae349734790f405a4]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz"
#  content [d28f0501a4a2c34b5dbd6c280b0928ba0bb0eb4e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz"
#  content [7b4de156dfe17c3f8b85d4890b98236d616ab7a9]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz"
#  content [9bb679311df33d678ad0c7d90a3388c97dd07db6]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz"
#  content [8b71f81331c1732338fb00db4177df7b72f90d62]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz"
#  content [6b2fe6ae191a51600ebd3a3f990bb8d87e5874d5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz"
#  content [7442f1b4431b7d3608ae143117e241eec026b424]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz"
#  content [d917ba3a15f4d6cc6818e7b58af42e42ade5ab1b]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz"
#  content [a00b42e132501f6495fabaf610b97bb93d426de9]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz"
#  content [f8d0bd0a06ce0f3781a88f44caccb5ad12716b6e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz"
#  content [4ea48ceada126e28020ea6065119328c4d518aec]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz"
#  content [a0a2722378df5eceb96bd35710505b7b1adc6b7e]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz"
#  content [8b58c81f468ac66f1b69e2093abb140db026d499]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias"
#  content [1233785d59e32e65a1dc9fdab5ee10df3b1b8d5c]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir"
#  content [cce53ac2ae8af5bd5dde9078f46422a8160c00e5]
# 
# add_file "packages/xorg-font/xorg-minimal-fonts.bb"
#  content [ead866f55cd01c842a77f7f3b8bf058f7592737f]
# 
# patch "classes/autotools.bbclass"
#  from [3acb6dbe08d32ccda69ed2a8b6a695611888de97]
#    to [b231959ebff8805dedb065d1dec1aa37cc39528b]
# 
# patch "classes/cpan.bbclass"
#  from [37cd3844dffec6f7c9516f2353be95eda9f98c1a]
#    to [260c9e28c5f7b6f682e8bfc326558a3b825ce267]
# 
# patch "conf/checksums.ini"
#  from [333135eef838ab36d646041242da71b428e199bb]
#    to [220049577807c299e5636ee748e66a9f43cd5e48]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [7aa6dffcb238af83f531d71a1b5a77a5ac06df7a]
#    to [a2f25cec0771c37f01d2a8f3de528c43c4d462ce]
# 
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
#  from [345628e585c27582599200282307fe68ae1c1937]
#    to [a88b28843d763c56d5d21f55bb7da235f6f094d1]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [679c230eb147ac091e5d246a98381ec1ec18d7d5]
#    to [9e0f57874db1f0e2b3add955960a3e57eb754ea5]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [e7f1c0d7193f9a530c664aba1c14dd7ffd668f2b]
#    to [3d8a49e68abef9e573a055a5a83a91a513a91d72]
# 
# patch "conf/machine/beagleboard.conf"
#  from [d9ead88ad9a6d2f71fd898e1f6d3e15ccdda9ade]
#    to [0522763e9cc027487e7e483c9c17b62283d48ba8]
# 
# patch "contrib/source-checker/oe-source-checker.py"
#  from [1939cbdc301bfd4c929a2c51dd8f669ff73f6b98]
#    to [b7c082ab3bb15bd9c6e90d06e00b28f8e2e1cbeb]
# 
# patch "packages/gettext/gettext-native_0.17.bb"
#  from [2e903067b552793b23bc96c5ec738ada09f03316]
#    to [ad61300cb0a81b7353a8eebc4f25857676cd22b9]
# 
# patch "packages/gettext/gettext_0.17.bb"
#  from [3a0fa051089a75ecb61149ba3b56405116c60bb2]
#    to [d39e7c39ab4154e36e9937b5f173e7652e401999]
# 
# patch "packages/gnuradio/gnuradio_3.1.2.bb"
#  from [fd75941f6d93fc3807de7a7f120a45ef91afdcb5]
#    to [d0456867845db4d36b633caf53d3b206bb4df0e1]
# 
# patch "packages/images/beagleboard-demo-image.bb"
#  from [a331c7d784384394318bb658ab691ae57a70156d]
#    to [a3ba2267ca6a95d83ee68c01389ba2f50649981a]
# 
# patch "packages/linux/linux-kaiser_2.6.24+git.bb"
#  from [179f47a7546391b82d05471702ef85d5ff831bc9]
#    to [3846f7ed91c47398672be0e85d09c95c6a15e4ac]
# 
# patch "packages/linux/linux-neuros/neuros-osd2/defconfig"
#  from [5539a43b14905d9753ce995624377ab86d43fca7]
#    to [a9cfc6eccf84b142b79a01caa34f4e764d525e83]
# 
# patch "packages/linux/linux-neuros_git.bb"
#  from [c0d3d98cd5c172f91ccbb86f1a5b442cdfd710d6]
#    to [2e6509cd66f980cb31970e4ba080dbfdaa4d1029]
# 
# patch "packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc"
#  from [7d99efacb78551a1709a390b5a5b38d64a30a994]
#    to [00fda80068708f9a10656fd9777654f54435a66b]
# 
# patch "packages/mozilla/firefox_3.0.1.bb"
#  from [64ddbb96bcbf8c24fb73e9aaeb83eac4ff7ae95b]
#    to [5747a684fd3be549857c7c0f811a2ac8ccd81027]
# 
# patch "packages/neuros-public/neuros-mainmenu_git.bb"
#  from [556d6e6f57c68b97712cda2ea1ed2e9ada27b4fa]
#    to [046817a13e841d42388d0d9bd172bfe73599c66c]
# 
# patch "packages/neuros-public/neuros-nwm_git.bb"
#  from [69c49f36ea0a2a061449099bf15772969f100cf4]
#    to [deddfaec66698c59fd55591da381af714b90f7cb]
# 
# patch "packages/numptyphysics/numptyphysics_svn.bb"
#  from [ed831effd3c3ba20e55d8e3004b5808bb5076151]
#    to [137c37424d48bc5eb7b636299d6ee72e96ae3a09]
# 
# patch "packages/oprofile/oprofile/armv7a.diff"
#  from [287a599dc9191dd8fc275fafefb8d7b78910a678]
#    to [29ff99f766030c92d533baf75de05c5343f9fdaf]
# 
# patch "packages/oprofile/oprofile_0.9.3.bb"
#  from [47e36e539aec107088958b576f16f5d733b9c9bc]
#    to [71c19edfcb94600f5a8cae0992db9e4d58f28b62]
# 
# patch "packages/quake/quetoo_0.6.1.bb"
#  from [2744c0ee32602658716842b67e622d558b65bb7b]
#    to [e4f408fa9fd73a0ca1ba0ff90f91bdbde6216049]
# 
# patch "packages/tasks/task-base.bb"
#  from [dbf6b2fb6b546996379743d91f02f085e4be575f]
#    to [0a8a49cbcdc81b29d170d635b8c3eaca4b1a3ba5]
# 
# patch "packages/u-boot/u-boot_git.bb"
#  from [0e9012f6590523e507479e4b09fcdadbbecefc75]
#    to [410a19a56ded869256654871b16776e0fd4153ad]
# 
# patch "packages/x-load/x-load_git.bb"
#  from [a7b98123ead7e45b0fa48aaba9fe0a869f0ba0d8]
#    to [9c4b2a8d2c3e31ad73fbb2d02fc4242dc9112c87]
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [1cc605fc952cb675700394a0e68ce0f8c83f5d6f]
#    to [f246fbf0028822fd0a27404cfc02bb19da3ad7cb]
# 
# patch "packages/xorg-xserver/xserver-xorg/xorg.conf"
#  from [067fe1120fc0e93fa9c0e580a748ab38ad9a52c7]
#    to [bfcc63810ece1d786706fcb229fa67ac029b54d2]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.2.bb"
#  from [82f378de1913460628054471e7fd0daca8a411a1]
#    to [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  from [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
#    to [bfac91f5fae3ca879600e9617161fd20d17d8953]
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/xorg-font/xorg-mi%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list