Merge branch 'shared/file-pr-revert' into org.openembedded.dev

Conflicts:

	packages/busybox/busybox_1.11.3.bb
	packages/dsplink/codec-engine_2.10.bb
	packages/gdb/gdb_6.3.bb
	packages/gdb/gdb_6.4.bb
	packages/gdb/gdb_6.6.bb
	packages/gdb/gdb_6.8.bb
	packages/glibc/glibc_2.2.5.bb
	packages/glibc/glibc_2.3.2+cvs20040726.bb
	packages/glibc/glibc_2.3.2.bb
	packages/glibc/glibc_2.3.3+cvs20041128.bb
	packages/glibc/glibc_2.3.3+cvs20050221.bb
	packages/glibc/glibc_2.3.3+cvs20050420.bb
	packages/glibc/glibc_2.3.3.bb
	packages/glibc/glibc_2.3.5+cvs20050627.bb
	packages/glibc/glibc_2.3.6.bb
	packages/glibc/glibc_2.4.bb
	packages/glibc/glibc_2.5.bb
	packages/glibc/glibc_2.6.1.bb
	packages/glibc/glibc_2.7.bb
	packages/kexecboot/linux-kexecboot_2.6.26.bb
	packages/libsdl/libsdl-x11_1.2.11.bb
	packages/linux/linux-rp_2.6.26.bb
	packages/mozilla/fennec_hg.bb
	packages/python/python_2.5.2.bb
	packages/tasks/task-xfce-base.bb
	packages/xorg-driver/xf86-video-omapfb_git.bb
	packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb

diff --cc classes/package.bbclass
Simple merge

diff --cc conf/bitbake.conf
Simple merge

diff --cc packages/busybox/busybox_1.11.3.bb
index ce2b51a24b8cfc2c9a9f088cc7d75e86c45298e9,4d488218e266f75ef1824edadbbdb9d2d6cdb119..790bf518ccecfded358107167f13c6bae835aac4
--- 1/packages/busybox/busybox_1.11.3.bb
--- 2/packages/busybox/busybox_1.11.1.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@@ -1,5 -1,5 +1,5 @@@
  require busybox.inc
- FILE_PR = "r0"
 -PR = "r3"
++PR = "r0"
  
  SRC_URI = "\
    http://www.busybox.net/downloads/busybox-${PV}.tar.gz \

diff --cc packages/ccid/ccid_1.3.8.bb
index 033af6c3d570b49f88b8ae5c5ecbc16101b31e4c,0000000000000000000000000000000000000000..c2ade3119ae9771c360410f7db65937ea788f6d3
mode 100644,000000..100644
--- 1/packages/ccid/ccid_1.3.8.bb
--- /dev/null
+++ b/packages/ccid/ccid_1.3.8.bb
@@@ -1,21 -1,0 +1,21 @@@
- FILE_PR = "r0"
 +DESCRIPTION = "Generic USB CCID smart card reader driver"
 +HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html"
 +LICENSE = "GPL"
++PR = "r0"
 +
 +DEPENDS = "libusb pcsc-lite"
 +RDEPENDS = "pcsc-lite"
 +
 +SRC_URI = "http://alioth.debian.org/download.php/2482/ccid-${PV}.tar.bz2"
 +
 +inherit autotools
 +
 +EXTRA_OECONF = "--enable-udev"
 +
 +do_install_append () {
 +      install -d "${D}/etc/udev/rules.d"
 +      install -m 644 "${S}/src/pcscd_ccid.rules" "${D}/etc/udev/rules.d/85-pcscd_ccid.rules"
 +}
 +
 +FILES_${PN} += "${libdir}/pcsc/"
 +FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug"

diff --cc packages/dmidecode/dmidecode_2.9.bb
index bb13500effeb6b9aa962c195f48e28118014f26a,0000000000000000000000000000000000000000..21861204988f9c79fd9a5ebae1d025c0e054649c
mode 100644,000000..100644
--- 1/packages/dmidecode/dmidecode_2.9.bb
--- /dev/null
+++ b/packages/dmidecode/dmidecode_2.9.bb
@@@ -1,19 -1,0 +1,19 @@@
- FILE_PR = "r0"
 +DESCRIPTION = "DMI (Desktop Management Interface) table related utilities"
 +HOMEPAGE = "http://www.nongnu.org/dmidecode/"
 +LICENSE = "GPLv2"
++PR = "r0"
 +
 +SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2"
 +
 +COMPATIBLE_HOST = "i.86.*-linux"
 +
 +do_unpack_extra() {
 +      sed -i \
 +          -e '/^prefix/s:/usr/local:/usr:' \
 +          Makefile
 +}
 +addtask unpack_extra after do_unpack before do_patch
 +
 +do_install() {
 +      oe_runmake DESTDIR="${D}" install
 +}

diff --cc packages/dsplink/dsplink_1.51.00.08.bb
Simple merge

diff --cc packages/gdb/gdb_6.3.bb
index 5513d348d092fa2d20dda28d110d5da972d585e0,a558775ff419982057247178ce52eb36e9f4422b..988cfb4c44e0dc58cf04369a6307311ed85c04f4
--- 1/packages/gdb/gdb_6.3.bb
--- 2/packages/gdb/gdb_6.3.bb
+++ b/packages/gdb/gdb_6.3.bb
@@@ -1,3 -1,3 +1,3 @@@
  require gdb.inc
  
- FILE_PR = "r4"
 -PR = "r3"
++PR = "r4"

diff --cc packages/gdb/gdb_6.4.bb
index 134c38426d1ed23186190d97a9e03c60b965d47e,de6bcf34bae694e0a63c7966164a30368450ecc4..be40f3f12be9d4ddfb03a541b150a9577ecb3e94
--- 1/packages/gdb/gdb_6.4.bb
--- 2/packages/gdb/gdb_6.4.bb
+++ b/packages/gdb/gdb_6.4.bb
@@@ -1,3 -1,3 +1,3 @@@
  require gdb.inc
  
- FILE_PR = "r2"
 -PR = "r1"
++PR = "r2"

diff --cc packages/gdb/gdb_6.6.bb
index db1a89b7069fd2129be7de9d0544c2053e243a35,c507a48aa826c16c04aea28acff7574f36f21d1e..e4502a648e818b4fc150b58a3badb30ab2b20870
--- 1/packages/gdb/gdb_6.6.bb
--- 2/packages/gdb/gdb_6.6.bb
+++ b/packages/gdb/gdb_6.6.bb
@@@ -1,5 -1,5 +1,5 @@@
  require gdb.inc
  
- FILE_PR = "r5"
 -PR = "r4"
++PR = "r5"
  
  SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"

diff --cc packages/gdb/gdb_6.7.1.bb
index 167c415dde9e4c406e67345cdcc32fa20ead4d4e,a411974b154c19cab1bb205984c28535055c91a4..fedf2bf1f1bf4972d9cf818cbe5c9e0f3f032627
--- 1/packages/gdb/gdb_6.7.1.bb
--- 2/packages/gdb/gdb_6.7.1.bb
+++ b/packages/gdb/gdb_6.7.1.bb
@@@ -1,7 -1,5 +1,7 @@@
  require gdb.inc
  
- FILE_PR = "r1"
++PR = "r1"
 +
  DEFAULT_PREFERENCE_avr32 = "99"
  SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2"
  S_avr32 = "${WORKDIR}/gdb-6.7.1.atmel.1.0.3"

diff --cc packages/gdb/gdb_6.8.bb
index 134c38426d1ed23186190d97a9e03c60b965d47e,5b8f3769bd8679d36afc28efd77a9f9313de5415..be40f3f12be9d4ddfb03a541b150a9577ecb3e94
--- 1/packages/gdb/gdb_6.8.bb
--- 2/packages/gdb/gdb_6.8.bb
+++ b/packages/gdb/gdb_6.8.bb
@@@ -1,3 -1,3 +1,3 @@@
  require gdb.inc
  
- FILE_PR = "r2"
 -PR = "r1"
++PR = "r2"

diff --cc packages/glibc/glibc_2.2.5.bb
index e870f89abbc52e96d888a9b3c7da15451c029816,3e57d857ae74394cab722e17f123f13cea014adb..c7d308b6a2649f2a5af20aacbf1c13088fcfb9cd
--- 1/packages/glibc/glibc_2.2.5.bb
--- 2/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@@ -1,7 -1,7 +1,7 @@@
  require glibc.inc
  
  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
- FILE_PR = "r19"
 -PR = "r18"
++PR = "r19"
  
  DEFAULT_PREFERENCE_sh3 = "-99"
  

diff --cc packages/glibc/glibc_2.3.2+cvs20040726.bb
index 774333f1e722db1ef8539cc6a4f90dfacd4ef19b,c53c2dd62000c1367c7a7379b760cd25da866711..f0521d41abb8c0be2a190ec496b8ff4ba8b5869d
--- 1/packages/glibc/glibc_2.3.2+cvs20040726.bb
--- 2/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@@ -3,7 -3,7 +3,7 @@@ require glibc.in
  DEFAULT_PREFERENCE_sh3 = "-99"
  
  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
- FILE_PR = "r30"
 -PR = "r29"
++PR = "r30"
  
  GLIBC_ADDONS ?= "linuxthreads"
  

diff --cc packages/glibc/glibc_2.3.2.bb
index 66301619007088f10239e3870af06ea22178231c,05b46ba2e944ce9c14b19c83d932a3d7771dec11..891d9da388e2c5502c63e477571c85bd645e8564
--- 1/packages/glibc/glibc_2.3.2.bb
--- 2/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@@ -1,6 -1,6 +1,6 @@@
  require glibc.inc
  
- FILE_PR = "r19"
 -PR = "r18"
++PR = "r19"
  
  DEFAULT_PREFERENCE_sh3 = "-99"
  

diff --cc packages/glibc/glibc_2.3.3+cvs20041128.bb
index e5feae651497505f8984ae2436871df2bdd23723,a2492f68019ef7520c1e30fa2cecd94792625d81..560347d7701ee4783df2e1eb6b19918bde1e0c10
--- 1/packages/glibc/glibc_2.3.3+cvs20041128.bb
--- 2/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@@ -3,7 -3,7 +3,7 @@@ require glibc.in
  DEFAULT_PREFERENCE_sh3 = "-99"
  
  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
- FILE_PR = "r15"
 -PR = "r14"
++PR = "r15"
  
  GLIBC_ADDONS ?= "linuxthreads"
  

diff --cc packages/glibc/glibc_2.3.3+cvs20050221.bb
index fee5e5ab44ba656f5007b8c12d9648117173fb9d,16525029dab76f8ad70237c308066dd43756d6d4..e0becb8c3f8e842ae841af1da170233048e73530
--- 1/packages/glibc/glibc_2.3.3+cvs20050221.bb
--- 2/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@@ -3,7 -3,7 +3,7 @@@ require glibc.in
  DEFAULT_PREFERENCE_sh3 = "-99"
  
  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
- FILE_PR = "r15"
 -PR = "r14"
++PR = "r15"
  
  GLIBC_ADDONS ?= "linuxthreads"
  

diff --cc packages/glibc/glibc_2.3.3+cvs20050420.bb
index 137e8f47564b1379ad5b771bdc387c312f416058,bd394921b9a026bc18fbb8efb531f3732fd5cb84..1ae351889ce0898501cbb43a17ce7611abaa2eb1
--- 1/packages/glibc/glibc_2.3.3+cvs20050420.bb
--- 2/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@@ -5,7 -5,7 +5,7 @@@ DEFAULT_PREFERENCE_i586 = "0
  DEFAULT_PREFERENCE_sh3 = "-99"
  
  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
- FILE_PR = "r13"
 -PR = "r12"
++PR = "r13"
  
  GLIBC_ADDONS ?= "linuxthreads"
  

diff --cc packages/glibc/glibc_2.3.3.bb
index 9c97477ed8f6acdebdbd354606e76ca9945ecd09,2908baf4cba397a8965a55f8b895dad44805f8f6..03711f7ae333e58f8d167fccc2dfd50ac16762c2
--- 1/packages/glibc/glibc_2.3.3.bb
--- 2/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@@ -1,6 -1,6 +1,6 @@@
  require glibc.inc
  
- FILE_PR = "r16"
 -PR = "r15"
++PR = "r16"
  
  DEFAULT_PREFERENCE_sh3 = "-99"
  

diff --cc packages/glibc/glibc_2.3.5+cvs20050627.bb
index 3f767537b60bf406412ec02e3a4370bdc782e949,54a1654404a3b2e585f994f9eace9e3540c42f56..c9d0b66daf045e68f4c6eec198cd3c869be49608
--- 1/packages/glibc/glibc_2.3.5+cvs20050627.bb
--- 2/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@@ -2,7 -2,7 +2,7 @@@ require glibc.in
  
  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
  SRCDATE = "20050627"
- FILE_PR = "r22"
 -PR = "r21"
++PR = "r22"
  
  #Doesnt build for sh3
  DEFAULT_PREFERENCE_sh3="-1"

diff --cc packages/glibc/glibc_2.3.6.bb
index c55216c04f18f2ccbee315f16d5bdae6f31a92d6,edf15cab61af857afb3d17dda30473caddf18ee5..8442a15e697e604a4c7f14175811000b6c5f4111
--- 1/packages/glibc/glibc_2.3.6.bb
--- 2/packages/glibc/glibc_2.3.6.bb
+++ b/packages/glibc/glibc_2.3.6.bb
@@@ -1,6 -1,6 +1,6 @@@
  require glibc.inc
  
- FILE_PR = "r4"
 -PR = "r3"
++PR = "r4"
  
  #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
  

diff --cc packages/glibc/glibc_2.4.bb
index 3f32f0cb88e4c32400d0b7f1ab23d3552e138e89,17cebf8921dd4eac2f812902f09dae1d447e7a47..8ee10003dfe8ee417691047f067fd206a1a4fe2d
--- 1/packages/glibc/glibc_2.4.bb
--- 2/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@@ -1,6 -1,6 +1,6 @@@
  require glibc.inc
  
- FILE_PR = "r20"
 -PR = "r19"
++PR = "r20"
  
  #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
  COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'

diff --cc packages/glibc/glibc_2.5.bb
index d769bd7dee28056dde2c3ec2f4bad87f4cad8828,a5908762ef4cde458fd299a47294e05e4cab3be5..6e2295904b0e9ab635b3eb5f6f5f78b5e089f88d
--- 1/packages/glibc/glibc_2.5.bb
--- 2/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@@ -1,5 -1,5 +1,5 @@@
  require glibc.inc
- FILE_PR = "r18"
 -PR = "r17"
++PR = "r18"
  
  ARM_INSTRUCTION_SET = "arm"
  

diff --cc packages/glibc/glibc_2.6.1.bb
index 025481156482844d73d2303c121c4a3ff964ff2e,5cd1d5b3e7f2e3098f7802df115daafe0d438456..c563a1f3899e9debcce9161ae322b5ae6f44466d
--- 1/packages/glibc/glibc_2.6.1.bb
--- 2/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@@ -1,5 -1,5 +1,5 @@@
  require glibc.inc
- FILE_PR = "r13"
 -PR = "r12"
++PR = "r13"
  
  PACKAGES_DYNAMIC = "libc6*"
  RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"

diff --cc packages/glibc/glibc_2.7.bb
index c2e97af7645431f2327e139dc8e8c1b2fe42f792,b6c329091ceda46fd028ab01196e3eeb8a200369..3349ce5eefec5f39a3deced6c3b1a71da2eb230d
--- 1/packages/glibc/glibc_2.7.bb
--- 2/packages/glibc/glibc_2.7.bb
+++ b/packages/glibc/glibc_2.7.bb
@@@ -5,7 -5,7 +5,7 @@@ ARM_INSTRUCTION_SET = "arm
  PACKAGES_DYNAMIC = "libc6*"
  RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
  
- FILE_PR = "r8"
 -PR = "r7"
++PR = "r8"
  
  # the -isystem in bitbake.conf screws up glibc do_stage
  BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"

diff --cc packages/kexecboot/linux-kexecboot_2.6.26.bb
index 26af506132337b4f1b1a44a3e0c49d2967a837c7,2db6575a7286251b27fcd6031d5ddcd3249c4155..a0d00ab120fcb129c88474c9460352d58f012506
--- 1/packages/kexecboot/linux-kexecboot_2.6.26.bb
--- 2/packages/kexecboot/linux-kexecboot_2.6.26.bb
+++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb
@@@ -1,6 -1,6 +1,6 @@@
  require linux-kexecboot.inc
  
- FILE_PR = "r6"
 -PR = "r5"
++PR = "r6"
  DEFAULT_PREFERENCE = "-1"
  DEFAULT_PREFERENCE_qemuarm = "-1"
  DEFAULT_PREFERENCE_qemux86 = "-1"

diff --cc packages/libsdl/libsdl-image_1.2.6.bb
index b458e19dbaf4b65866355609b82ab529a2d5eac7,27b5aa7d1a98284725b582d774bd95f2b9ccc4fe..99fd98f508b54460a54d01777eddc9904321450f
--- 1/packages/libsdl/libsdl-image_1.2.6.bb
--- 2/packages/libsdl/libsdl-image_1.2.6.bb
+++ b/packages/libsdl/libsdl-image_1.2.6.bb
@@@ -1,7 -1,4 +1,7 @@@
  require libsdl-image.inc
- FILE_PR= "r1"
++PR = "r1"
 +
 +DEPENDS += "tiff"
  
  do_unpackpost() {
        # Removing this file fixes a libtool version mismatch.

diff --cc packages/libsdl/libsdl-x11_1.2.11.bb
index e9628d9e07b3b42a419652d82498c23e460403c3,3f9120edb432a6db059c64726631c2dad11b486c..ab349d6306437ea5a16d7169b84a09f9b59c2ea4
--- 1/packages/libsdl/libsdl-x11_1.2.11.bb
--- 2/packages/libsdl/libsdl-x11_1.2.11.bb
+++ b/packages/libsdl/libsdl-x11_1.2.11.bb
@@@ -3,7 -3,7 +3,7 @@@ require libsdl.in
  # extra-keys.patch is missing
  DEFAULT_PREFERENCE = "-1" 
  
- FILE_PR = "r7"
 -PR = "r6"
++PR = "r7"
  
  SRC_URI = "\
    http://www.libsdl.org/release/SDL-${PV}.tar.gz \

diff --cc packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
Simple merge

diff --cc packages/linux/linux-rp_2.6.26.bb
index 47932fdf0df5b1bcb0deb04e0131b31ce7ca688e,00e39a77a3ae19fdb830e874b2ad2a16c3ebceb7..dd126285ea0d9acf1ae0f0da7aa3a2108ee8d1f9
--- 1/packages/linux/linux-rp_2.6.26.bb
--- 2/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@@ -1,6 -1,6 +1,6 @@@
  require linux-rp.inc
  
- FILE_PR = "r5"
 -PR = "r4"
++PR = "r5"
  
  DEFAULT_PREFERENCE = "-1"
  DEFAULT_PREFERENCE_qemuarm = "-1"

diff --cc packages/meta/slugos-packages.bb
Simple merge

diff --cc packages/mozilla/fennec_hg.bb
index b3cf0fd32643ee3c28c54a7c906700edc6f9f94d,0760768e09c5069b32705357ddf41fd96222d343..8c6f326f7375eeae0020c1fd9e9a60cdcabbd4dc
--- 1/packages/mozilla/fennec_hg.bb
--- 2/packages/mozilla/fennec_hg.bb
+++ b/packages/mozilla/fennec_hg.bb
@@@ -1,13 -1,13 +1,13 @@@
  DESCRIPTION = "Mozilla Mobile browser"
  DEPENDS += "cairo alsa-lib "
  
 -PV = "0.8+0.9pre"
 -MOZPV = "0.9pre"
 -PR = "r10"
 +PV = "0.9+1.0a1"
 +MOZPV = "1.0a1"
- FILE_PR = "r0"
++PR = "r0"
  PE = "1"
  
 -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=3a9a64e5bedc \
 -           hg://hg.mozilla.org/;module=mobile-browser;rev=53d19b4b249a \
 +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=6c2f8bd79cbc \
 +           hg://hg.mozilla.org/;module=mobile-browser;rev=8f96b58057ad \
             file://jsautocfg.h \
             file://jsautocfg-dontoverwrite.patch;patch=1 \
  "

diff --cc packages/nfs-utils/nfs-utils_1.1.2.bb
index b777f201eb05d82be2e82dc6a259b2b438477bab,bcdabd59e5d7647307e769ed72344f78a1aab90b..872a9bf8ff58ec8f285c83b916f3124b29ba79c5
--- 1/packages/nfs-utils/nfs-utils_1.1.2.bb
--- 2/packages/nfs-utils/nfs-utils_1.1.2.bb
+++ b/packages/nfs-utils/nfs-utils_1.1.2.bb
@@@ -3,9 -3,9 +3,9 @@@ PRIORITY = "optional
  SECTION = "console/network"
  LICENSE = "GPL"
  
- FILE_PR = "2"
+ PR = "2"
  
 -DEPENDS = "tcp-wrappers libevent"
 +DEPENDS = "e2fsprogs tcp-wrappers libevent"
  
  SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
        file://nfsserver \

diff --cc packages/pcsc-lite/pcsc-lite_1.4.102.bb
index 6d5bb4411329f82fef2def285bc544bdfcbef383,0000000000000000000000000000000000000000..0455ae47a8fd916617d644cf01aeb797f7df3ce8
mode 100644,000000..100644
--- 1/packages/pcsc-lite/pcsc-lite_1.4.102.bb
--- /dev/null
+++ b/packages/pcsc-lite/pcsc-lite_1.4.102.bb
@@@ -1,35 -1,0 +1,35 @@@
- FILE_PR = "r0"
 +DESCRIPTION = "PC/SC Lite smart card framework and applications"
 +HOMEPAGE = "http://pcsclite.alioth.debian.org/"
 +LICENSE = "BSD"
++PR = "r0"
 +
 +DEPENDS = "hal"
 +RDEPENDS_${PN} = "hal"
 +
 +SRC_URI = "http://alioth.debian.org/download.php/2479/pcsc-lite-${PV}.tar.bz2 \
 +           file://pcscd.init "
 +
 +inherit autotools update-rc.d
 +
 +INITSCRIPT_NAME = "pcscd"
 +INITSCRIPT_PARAMS = "defaults"
 +
 +EXTRA_OECONF = " \
 +      --enable-libhal \
 +      --disable-libusb \
 +      --enable-usbdropdir=${libdir}/pcsc/drivers \
 +      "
 +
 +do_stage() {
 +      autotools_stage_all
 +}
 +
 +do_install() {
 +      oe_runmake DESTDIR="${D}" install
 +      install -d "${D}/etc/init.d"
 +      install -m 755 "${WORKDIR}/pcscd.init" "${D}/etc/init.d/pcscd"
 +}
 +
 +PACKAGES =+ "libpcsclite"
 +
 +FILES_libpcsclite = "${libdir}/libpcsclite.so.*"

diff --cc packages/perl/perl-native_5.8.8.bb
Simple merge

diff --cc packages/python/python_2.5.2.bb
index d6e8bb3ab0e5a1df20d078823a5d757e43a46ada,3ba35544a8a407b69a47c8544856e0ec867cefc1..35bcf858e60849483da1eea7863e4076c228898b
--- 1/packages/python/python_2.5.2.bb
--- 2/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@@ -6,7 -6,7 +6,7 @@@ PRIORITY = "optional
  DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
  DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
  # bump this on every change in contrib/python/generate-manifest-2.5.py
- FILE_PR = "ml13"
 -PR = "ml11"
++PR = "ml13"
  
  PYTHON_MAJMIN = "2.5"
  

diff --cc packages/tasks/task-xfce-base.bb
index b734341c54ce18d459e2db8db3e76340e67e86af,c846b22de5d81a5f137266ae3a4d2ccd2cc9068c..239725feaa5086c5c59ce007bfb9e314c3fb12fb
--- 1/packages/tasks/task-xfce-base.bb
--- 2/packages/tasks/task-xfce-base.bb
+++ b/packages/tasks/task-xfce-base.bb
@@@ -4,7 -4,7 +4,7 @@@
  
  DESCRIPTION = "All packages required for an base XFCE installation"
  LICENSE = "MIT"
- FILE_PR = "r4"
 -PR = "r3"
++PR = "r4"
  
  inherit task
  

diff --cc packages/xorg-driver/xf86-video-omapfb_git.bb
index 34ce3de4ff342a7fb670b1d8a37fd9736b532dbf,d14c1fd3960d644ab9af5fc45c02594850e48071..9be61695ae1338730bed5f8fd6952f96a016a108
--- 1/packages/xorg-driver/xf86-video-omapfb_git.bb
--- 2/packages/xorg-driver/xf86-video-omapfb_git.bb
+++ b/packages/xorg-driver/xf86-video-omapfb_git.bb
@@@ -2,9 -2,9 +2,9 @@@ require xorg-driver-video.in
  
  DESCRIPTION = "X.Org X server -- OMAP display driver"
  
- FILE_PR ="r10"
 -PR ="r8"
++PR ="r10"
  
 -SRCREV = "9a4fe691d60ac29e510dfa5180bd799ead86d1d5"
 +SRCREV = "7bf64be8e809d00c10c6bdae6933bdc71c642ea4"
  PV = "0.0.1+${PR}+git${SRCREV}"
  
  SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http"

diff --cc packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index 963b11221b4d399078a05aafaecebe6d5c6d7088,922d8f58f33d1a7b6f55f1ce3bc2fab73bde43d8..48ff0ea6fa2121e0e5d5bf90aedda0f8960ea53e
--- 1/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
--- 2/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@@ -3,7 -3,7 +3,7 @@@ require xserver-kdrive-common.in
  DEPENDS += "hal libxkbfile libxcalibrate pixman"
  
  PE = "1"
- FILE_PR = "r3"
 -PR = "r2"
++PR = "r3"
  
  SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \