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

74 files changed, 74 insertions, 74 deletions

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 48584aa649..57a711577c 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-FILE_PR = "r73"
+PR = "r73"
 
 inherit task
 
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 08c062f74b..4c17eeaa04 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-FILE_PR = "r45"
+PR = "r45"
 
 inherit task
 
diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
index 25c3c2c1a1..f2d25e32ac 100644
--- a/packages/tasks/task-devimage.bb
+++ b/packages/tasks/task-devimage.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Image for development testing"
-FILE_PR = "r4"
+PR = "r4"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-dvb.bb b/packages/tasks/task-dvb.bb
index 7ed360405e..e93a66273f 100644
--- a/packages/tasks/task-dvb.bb
+++ b/packages/tasks/task-dvb.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Meta-package for DVB application"
-FILE_PR = "r6"
+PR = "r6"
 
 inherit task
 
diff --git a/packages/tasks/task-e-x11.bb b/packages/tasks/task-e-x11.bb
index 828f1a2b69..3663532527 100644
--- a/packages/tasks/task-e-x11.bb
+++ b/packages/tasks/task-e-x11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Tasks for Enlightenment/X11"
-FILE_PR = "r10"
+PR = "r10"
 
 inherit task
 
diff --git a/packages/tasks/task-efl.bb b/packages/tasks/task-efl.bb
index 8533009dc7..20c8954754 100644
--- a/packages/tasks/task-efl.bb
+++ b/packages/tasks/task-efl.bb
@@ -16,6 +16,6 @@ RDEPENDS = "\
   etk \
   epdf \
 "
-FILE_PR = "r0"
+PR = "r0"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-fonts-truetype.bb b/packages/tasks/task-fonts-truetype.bb
index 7cff6f9c98..cd8000316c 100644
--- a/packages/tasks/task-fonts-truetype.bb
+++ b/packages/tasks/task-fonts-truetype.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Install one of these tasks to get support for truetype fonts."
 SECTION = "fonts"
 LICENSE = "MIT"
 PV = "1.0"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit task
 
diff --git a/packages/tasks/task-fso-compliance.bb b/packages/tasks/task-fso-compliance.bb
index c331d7a8d0..a3dcfe9c8d 100644
--- a/packages/tasks/task-fso-compliance.bb
+++ b/packages/tasks/task-fso-compliance.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The freesmartphone.org framework -- install this task to make you
 SECTION = "fso/base"
 LICENSE = "MIT"
 PV = "1.0"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit task
 
diff --git a/packages/tasks/task-gmae.bb b/packages/tasks/task-gmae.bb
index 2aae904e66..73710f8ffa 100644
--- a/packages/tasks/task-gmae.bb
+++ b/packages/tasks/task-gmae.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "GNOME Mobile & Embedded Initiative"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit task
 
diff --git a/packages/tasks/task-gpe-apps.bb b/packages/tasks/task-gpe-apps.bb
index 8a6a360d07..058a3fd6b1 100644
--- a/packages/tasks/task-gpe-apps.bb
+++ b/packages/tasks/task-gpe-apps.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Application task package for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-base.bb b/packages/tasks/task-gpe-base.bb
index 11e88df4cf..66031ffce7 100644
--- a/packages/tasks/task-gpe-base.bb
+++ b/packages/tasks/task-gpe-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Base task package for GPE Palmtop Environment"
-FILE_PR = "r9"
+PR = "r9"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-connectivity.bb b/packages/tasks/task-gpe-connectivity.bb
index 1be974aec4..7babc03c56 100644
--- a/packages/tasks/task-gpe-connectivity.bb
+++ b/packages/tasks/task-gpe-connectivity.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Connectivity task packages for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-desktopapps.bb b/packages/tasks/task-gpe-desktopapps.bb
index 1dad036881..25c055f446 100644
--- a/packages/tasks/task-gpe-desktopapps.bb
+++ b/packages/tasks/task-gpe-desktopapps.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-games.bb b/packages/tasks/task-gpe-games.bb
index 62a99b2b3e..335f64031e 100644
--- a/packages/tasks/task-gpe-games.bb
+++ b/packages/tasks/task-gpe-games.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Games task package for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-pim.bb b/packages/tasks/task-gpe-pim.bb
index 02517325a2..c6e6c22e6c 100644
--- a/packages/tasks/task-gpe-pim.bb
+++ b/packages/tasks/task-gpe-pim.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "PIM task packages for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-settings.bb b/packages/tasks/task-gpe-settings.bb
index 1815a1bf91..84302fdf5a 100644
--- a/packages/tasks/task-gpe-settings.bb
+++ b/packages/tasks/task-gpe-settings.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Settings task package for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe-web.bb b/packages/tasks/task-gpe-web.bb
index 900767bd88..674dd86224 100644
--- a/packages/tasks/task-gpe-web.bb
+++ b/packages/tasks/task-gpe-web.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Additional web task packages for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb
index 6415494339..bc5105f6a8 100644
--- a/packages/tasks/task-gpe.bb
+++ b/packages/tasks/task-gpe.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index e3eba8f077..a77233bedc 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-FILE_PR = "r10"
+PR = "r10"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-java-gtk.bb b/packages/tasks/task-java-gtk.bb
index 9fd813dd5f..b4f75920f3 100644
--- a/packages/tasks/task-java-gtk.bb
+++ b/packages/tasks/task-java-gtk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task package for Java GTK applications"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-java.bb b/packages/tasks/task-java.bb
index ea6ac12cc6..be94662d40 100644
--- a/packages/tasks/task-java.bb
+++ b/packages/tasks/task-java.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Base task package for Java"
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "MIT"
 
 inherit task
diff --git a/packages/tasks/task-maemo.bb b/packages/tasks/task-maemo.bb
index 74715b83a8..a4f16ac3a4 100644
--- a/packages/tasks/task-maemo.bb
+++ b/packages/tasks/task-maemo.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Task package for maemo environment"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
-FILE_PR = "r0"
+PR = "r0"
 
 PACKAGES = "\
     maemo-task-base \
diff --git a/packages/tasks/task-mamona-base.bb b/packages/tasks/task-mamona-base.bb
index 4a90d7505a..76f84ccaac 100644
--- a/packages/tasks/task-mamona-base.bb
+++ b/packages/tasks/task-mamona-base.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "task mamona base"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-devel.bb b/packages/tasks/task-mamona-devel.bb
index fb943bc54b..a1d8d2398d 100644
--- a/packages/tasks/task-mamona-devel.bb
+++ b/packages/tasks/task-mamona-devel.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Necessary packages for development"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-e.bb b/packages/tasks/task-mamona-e.bb
index afaa78e21c..cc8af8b3f9 100644
--- a/packages/tasks/task-mamona-e.bb
+++ b/packages/tasks/task-mamona-e.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Necessary packages for Enlightenment on Mamona"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-extras.bb b/packages/tasks/task-mamona-extras.bb
index dd6b6c00f1..7a5e7a6a29 100644
--- a/packages/tasks/task-mamona-extras.bb
+++ b/packages/tasks/task-mamona-extras.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task mamona extras: Dummy package to build extra packages to mamona repository"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-noemu.bb b/packages/tasks/task-mamona-noemu.bb
index 9a3927ac4d..73659593dd 100644
--- a/packages/tasks/task-mamona-noemu.bb
+++ b/packages/tasks/task-mamona-noemu.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Noemu packages are i386 packages thar run inside ARM chroot environment"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mamona-nokia-it.bb b/packages/tasks/task-mamona-nokia-it.bb
index 8c6d20c12b..05bc7e773c 100644
--- a/packages/tasks/task-mamona-nokia-it.bb
+++ b/packages/tasks/task-mamona-nokia-it.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Necessary packages for Mamona run on Nokia Internet Tablets"
 LICENSE = "MIT"
-FILE_PR = "r0"
+PR = "r0"
 ALLOW_EMPTY = "1"
 
 RDEPENDS = "\
diff --git a/packages/tasks/task-mamona.bb b/packages/tasks/task-mamona.bb
index fb12bd8771..67c8ed524f 100644
--- a/packages/tasks/task-mamona.bb
+++ b/packages/tasks/task-mamona.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task mamona: Build and Install Mamona Platform"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index 6048b314bc..1575b41780 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution"
 LICENSE = "MIT"
 PROVIDES = "task-mokogateway-everything"
-FILE_PR = "r5"
+PR = "r5"
 
 inherit task
 
diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb
index 3efeb0de99..1a89d1b792 100644
--- a/packages/tasks/task-mythfront.bb
+++ b/packages/tasks/task-mythfront.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Meta-package for MythTV diskless frontend"
-FILE_PR = "r16"
+PR = "r16"
 
 inherit task
 
diff --git a/packages/tasks/task-nas-server.bb b/packages/tasks/task-nas-server.bb
index 5304a88207..6924ff5388 100644
--- a/packages/tasks/task-nas-server.bb
+++ b/packages/tasks/task-nas-server.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for a Network Attached Storage server"
 LICENSE = "MIT"
 PROVIDES = "task-nas-server-everything"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit task
 
diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb
index 32a9a2ae5e..61b6fc0279 100644
--- a/packages/tasks/task-native-sdk.bb
+++ b/packages/tasks/task-native-sdk.bb
@@ -5,7 +5,7 @@ RDEPENDS = "gcc-symlinks g++-symlinks cpp-symlinks binutils-symlinks \
 	    make virtual-libc-dev \
 	    flex flex-dev bison gawk sed grep autoconf automake make \
 	    patch patchutils diffstat diffutils libstdc++-dev"
-FILE_PR = "r3"
+PR = "r3"
 
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
index faf6961ebb..34739285ec 100644
--- a/packages/tasks/task-openmoko-base.bb
+++ b/packages/tasks/task-openmoko-base.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Base Task for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r73"
+PR = "r73"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb
index 0f645795d0..964b623dca 100644
--- a/packages/tasks/task-openmoko-debug.bb
+++ b/packages/tasks/task-openmoko-debug.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Debugging and Benchmarking Tools"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r59"
+PR = "r59"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-examples.bb b/packages/tasks/task-openmoko-examples.bb
index 55d2c87797..b8efd5e01e 100644
--- a/packages/tasks/task-openmoko-examples.bb
+++ b/packages/tasks/task-openmoko-examples.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Openmoko: Examples for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r71"
+PR = "r71"
 
 inherit task
\ No newline at end of file
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index c87ad47f91..40e97585ea 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r42"
+PR = "r42"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-games.bb b/packages/tasks/task-openmoko-games.bb
index df10fa8d85..c4aaa70779 100644
--- a/packages/tasks/task-openmoko-games.bb
+++ b/packages/tasks/task-openmoko-games.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Games for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r72"
+PR = "r72"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-linux.bb b/packages/tasks/task-openmoko-linux.bb
index b29a3d6d38..da787c62c0 100644
--- a/packages/tasks/task-openmoko-linux.bb
+++ b/packages/tasks/task-openmoko-linux.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Core system for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r71"
+PR = "r71"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-native-sdk.bb b/packages/tasks/task-openmoko-native-sdk.bb
index 507e18d30e..56f6824df4 100644
--- a/packages/tasks/task-openmoko-native-sdk.bb
+++ b/packages/tasks/task-openmoko-native-sdk.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Native SDK"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r58"
+PR = "r58"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-net.bb b/packages/tasks/task-openmoko-net.bb
index 1df4788116..d58b05aa62 100644
--- a/packages/tasks/task-openmoko-net.bb
+++ b/packages/tasks/task-openmoko-net.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Networking for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r71"
+PR = "r71"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb
index fc43c52545..306ff058dd 100644
--- a/packages/tasks/task-openmoko-phone.bb
+++ b/packages/tasks/task-openmoko-phone.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r73"
+PR = "r73"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb
index 09c50f1941..eb3195dffb 100644
--- a/packages/tasks/task-openmoko-pim.bb
+++ b/packages/tasks/task-openmoko-pim.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: PIM for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r72"
+PR = "r72"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-python-devel.bb b/packages/tasks/task-openmoko-python-devel.bb
index f09679ed74..a493183865 100644
--- a/packages/tasks/task-openmoko-python-devel.bb
+++ b/packages/tasks/task-openmoko-python-devel.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Python Development Tools"
 SECTION = "openmoko/devel"
 LICENSE = "MIT"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb
index 1fe996d999..d243481010 100644
--- a/packages/tasks/task-openmoko-toolchain-host.bb
+++ b/packages/tasks/task-openmoko-toolchain-host.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-FILE_PR = "r0"
+PR = "r0"
 
 PACKAGES = "${PN}"
 
diff --git a/packages/tasks/task-openmoko-toolchain-target.bb b/packages/tasks/task-openmoko-toolchain-target.bb
index fb24b2935c..142990602c 100644
--- a/packages/tasks/task-openmoko-toolchain-target.bb
+++ b/packages/tasks/task-openmoko-toolchain-target.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGES = "${PN}"
 
diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb
index b86d65de98..71020afef6 100644
--- a/packages/tasks/task-openmoko-ui.bb
+++ b/packages/tasks/task-openmoko-ui.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: GUI for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-FILE_PR = "r73"
+PR = "r73"
 
 inherit task
 
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index dfeb6a2d6b..6c195ba078 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-FILE_PR = "r71"
+PR = "r71"
 
 inherit task
 
diff --git a/packages/tasks/task-openprotium.bb b/packages/tasks/task-openprotium.bb
index 7f09cde157..4c5d762f8f 100644
--- a/packages/tasks/task-openprotium.bb
+++ b/packages/tasks/task-openprotium.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic image for openprotium"
 HOMEPAGE = "http://www.openprotium.org"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit task
 
diff --git a/packages/tasks/task-opie-16mb.bb b/packages/tasks/task-opie-16mb.bb
index 6d6a1d0711..859a0f5feb 100644
--- a/packages/tasks/task-opie-16mb.bb
+++ b/packages/tasks/task-opie-16mb.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for small OPIE image"
 SECTION = "opie/base"
 LICENSE = "MIT"
-FILE_PR = "r3"
+PR = "r3"
 
 inherit task
 
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 06c4ef68db..9f1403f050 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for OPIE stuff"

 SECTION = "opie/base"

 LICENSE = "MIT"

-FILE_PR = "r2"

+PR = "r2"

 

 inherit task

 

diff --git a/packages/tasks/task-opie-games.bb b/packages/tasks/task-opie-games.bb
index 0cad796022..4449c7aaae 100644
--- a/packages/tasks/task-opie-games.bb
+++ b/packages/tasks/task-opie-games.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for OPIE stuff"

 SECTION = "opie/base"

 LICENSE = "MIT"

-FILE_PR = "r1"

+PR = "r1"

 

 inherit task

 

diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 6e09ebf224..41dd92ac7a 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
 LICENSE = "MIT"
 
-FILE_PR = "r12"
+PR = "r12"
 
 inherit task
 
diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
index e890a2a55f..6e1cd5d895 100644
--- a/packages/tasks/task-proper-tools.bb
+++ b/packages/tasks/task-proper-tools.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Full versions of tools provided by busybox"
-FILE_PR = "r6"
+PR = "r6"
 
 inherit task
 
diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb
index 3fd803d78d..34efbeab6b 100644
--- a/packages/tasks/task-python-efl-examples.bb
+++ b/packages/tasks/task-python-efl-examples.bb
@@ -10,6 +10,6 @@ RDEPENDS = "\
   python-epsilon-examples \
   python-math python-textutils \
 "
-FILE_PR = "ml4"
+PR = "ml4"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-python-efl.bb b/packages/tasks/task-python-efl.bb
index 191c1bd3a0..d7b2d694dd 100644
--- a/packages/tasks/task-python-efl.bb
+++ b/packages/tasks/task-python-efl.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
 LICENSE = "MIT"
 SECTION = "devel/python"
 RDEPENDS = "python-evas python-ecore python-emotion python-edje python-etk python-epsilon python-edbus"
-FILE_PR = "ml3"
+PR = "ml3"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index b47d2a24fe..6c8e21ebd9 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-FILE_PR = "ml34"
+PR = "ml34"
 
 RDEPENDS = "\
 		python-ao 		\
diff --git a/packages/tasks/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb
index 3659d938bd..5dbd59d18a 100644
--- a/packages/tasks/task-python-sharprom_20060425.bb
+++ b/packages/tasks/task-python-sharprom_20060425.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Everything Python for SharpROM"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-FILE_PR = "ml6"
+PR = "ml6"
 
 NONWORKING = "\
 		python-codes		\
diff --git a/packages/tasks/task-qpe.bb b/packages/tasks/task-qpe.bb
index 1bac3442de..c13b5d48ef 100644
--- a/packages/tasks/task-qpe.bb
+++ b/packages/tasks/task-qpe.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for programs running on Qt/Embedded based Palmtop Environents like Opie and Qtopia."
 SECTION = "opie/base"
 LICENSE = "MIT"
-FILE_PR = "r10"
+PR = "r10"
 
 inherit task
 
diff --git a/packages/tasks/task-sdk-base.bb b/packages/tasks/task-sdk-base.bb
index 61505ad9c1..4041b27536 100644
--- a/packages/tasks/task-sdk-base.bb
+++ b/packages/tasks/task-sdk-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic SDK development packages"
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb
index 6f75985391..efb12c3cfb 100644
--- a/packages/tasks/task-sdk-extra.bb
+++ b/packages/tasks/task-sdk-extra.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-FILE_PR = "r8"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-gpephone.bb b/packages/tasks/task-sdk-gpephone.bb
index 3f3f9c4c61..56b398b04e 100644
--- a/packages/tasks/task-sdk-gpephone.bb
+++ b/packages/tasks/task-sdk-gpephone.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK task for GPE Phone Edition"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-host.bb b/packages/tasks/task-sdk-host.bb
index 2683bef79d..a8ac3706c4 100644
--- a/packages/tasks/task-sdk-host.bb
+++ b/packages/tasks/task-sdk-host.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
-FILE_PR = "r2"
+PR = "r2"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb
index 853e88b1f7..a38e58385f 100644
--- a/packages/tasks/task-sdk-opie.bb
+++ b/packages/tasks/task-sdk-opie.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages for Opie"
-FILE_PR = "r7"
+PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-sbox-gpe.bb b/packages/tasks/task-sdk-sbox-gpe.bb
index 2cb8892746..930de7cd2e 100644
--- a/packages/tasks/task-sdk-sbox-gpe.bb
+++ b/packages/tasks/task-sdk-sbox-gpe.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb
index 6df7e5bb96..2d73fe2716 100644
--- a/packages/tasks/task-sdk-sbox.bb
+++ b/packages/tasks/task-sdk-sbox.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits"
-FILE_PR = "r6"
+PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb
index 80cd071f79..79e9fefc2a 100644
--- a/packages/tasks/task-sdk.bb
+++ b/packages/tasks/task-sdk.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SDK packages"
-FILE_PR = "r8"
+PR = "r8"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-sdl.bb b/packages/tasks/task-sdl.bb
index 31e14275a6..3cda723e87 100644
--- a/packages/tasks/task-sdl.bb
+++ b/packages/tasks/task-sdl.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Tasks for SDL stuff"
 LICENSE = "MIT"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit task
 
diff --git a/packages/tasks/task-slugos-toolchain-host.bb b/packages/tasks/task-slugos-toolchain-host.bb
index fd358c7c7f..7550301bfd 100644
--- a/packages/tasks/task-slugos-toolchain-host.bb
+++ b/packages/tasks/task-slugos-toolchain-host.bb
@@ -1,5 +1,5 @@
 require task-sdk-host.bb
-FILE_PR = "r0"
+PR = "r0"
 DESCRIPTION = "Packages for a standalone SlugOS external toolchain"
 ALLOW_EMPTY = "1"
 
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 23ce32cba1..e1092b68d9 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-FILE_PR = "r21"
+PR = "r21"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 ALLOW_EMPTY = "1"
diff --git a/packages/tasks/task-x11-illume.bb b/packages/tasks/task-x11-illume.bb
index b84efec516..a477c6e8c5 100644
--- a/packages/tasks/task-x11-illume.bb
+++ b/packages/tasks/task-x11-illume.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Illume Windowing Environment -- install this task to get the
 SECTION = "x11/wm"
 LICENSE = "MIT"
 PV = "1.0"
-FILE_PR = "r0"
+PR = "r0"
 
 # WORK IN PROGRESS
 
diff --git a/packages/tasks/task-x11.bb b/packages/tasks/task-x11.bb
index ce1fa79bba..ad5ca3a412 100644
--- a/packages/tasks/task-x11.bb
+++ b/packages/tasks/task-x11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
 SECTION = "x11/server"
 LICENSE = "MIT"
 PV = "1.0"
-FILE_PR = "r0"
+PR = "r0"
 
 # WORK IN PROGRESS
 
diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb
index b734341c54..239725feaa 100644
--- a/packages/tasks/task-xfce-base.bb
+++ b/packages/tasks/task-xfce-base.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION = "All packages required for an base XFCE installation"
 LICENSE = "MIT"
-FILE_PR = "r4"
+PR = "r4"
 
 inherit task
 
diff --git a/packages/tasks/task-xterminal.bb b/packages/tasks/task-xterminal.bb
index 588ccc79a6..f2975132e9 100644
--- a/packages/tasks/task-xterminal.bb
+++ b/packages/tasks/task-xterminal.bb
@@ -1,6 +1,6 @@
 PACKAGES = "task-xterminal"
 DESCRIPTION = "Meta-package for diskless X terminal"
-FILE_PR = "r1"
+PR = "r1"
 
 inherit task