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

97 files changed, 97 insertions, 97 deletions

diff --git a/packages/python/python-cheetah_1.0.bb b/packages/python/python-cheetah_1.0.bb
index 24fd4a53a2..20fe083d81 100644
--- a/packages/python/python-cheetah_1.0.bb
+++ b/packages/python/python-cheetah_1.0.bb
@@ -8,7 +8,7 @@ SRCNAME = "Cheetah"
 SRC_URI = "${SOURCEFORGE_MIRROR}/cheetahtemplate/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-FILE_PR = "r0"
+PR = "r0"
 
 inherit distutils
 
diff --git a/packages/python/python-connexion_svn.bb b/packages/python/python-connexion_svn.bb
index 10a82ee92d..ae546f5256 100644
--- a/packages/python/python-connexion_svn.bb
+++ b/packages/python/python-connexion_svn.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "GPL"
 BV = "0.4.6"
 PV = "${BV}+svnr${SRCREV}"
-FILE_PR = "ml1"
+PR = "ml1"
 
 inherit distutils
 
diff --git a/packages/python/python-constraint_1.1.bb b/packages/python/python-constraint_1.1.bb
index 0e7fc468d2..5218b368ac 100644
--- a/packages/python/python-constraint_1.1.bb
+++ b/packages/python/python-constraint_1.1.bb
@@ -5,7 +5,7 @@ provided to work with finite domains only."
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://labix.org/download/python-constraint/python-constraint-${PV}.tar.bz2"
 
diff --git a/packages/python/python-cython_0.9.8.bb b/packages/python/python-cython_0.9.8.bb
index fb5a3de125..69d73fe969 100644
--- a/packages/python/python-cython_0.9.8.bb
+++ b/packages/python/python-cython_0.9.8.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 SRCNAME = "Cython"
-FILE_PR = "ml1"
+PR = "ml1"
 
 SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-dbus_0.83.0.bb b/packages/python/python-dbus_0.83.0.bb
index 328d3296e1..4ccecc0aa1 100644
--- a/packages/python/python-dbus_0.83.0.bb
+++ b/packages/python/python-dbus_0.83.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
 DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
 RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
diff --git a/packages/python/python-dialog_2.7.bb b/packages/python/python-dialog_2.7.bb
index b666230157..fa54a5a7f3 100644
--- a/packages/python/python-dialog_2.7.bb
+++ b/packages/python/python-dialog_2.7.bb
@@ -3,7 +3,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 SRCNAME = "pythondialog"
-FILE_PR = "ml0"
+PR = "ml0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.bz2"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-ecore_svn.bb b/packages/python/python-ecore_svn.bb
index 11aca1bd4d..1b02bf77df 100644
--- a/packages/python/python-ecore_svn.bb
+++ b/packages/python/python-ecore_svn.bb
@@ -2,7 +2,7 @@ require python-efl.inc
 DEPENDS += "python-evas ecore"
 RDEPENDS += "python-evas"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 do_stage() {
     distutils_stage_all
diff --git a/packages/python/python-edbus_svn.bb b/packages/python/python-edbus_svn.bb
index d317133de0..3299cfee88 100644
--- a/packages/python/python-edbus_svn.bb
+++ b/packages/python/python-edbus_svn.bb
@@ -2,7 +2,7 @@ require python-efl.inc
 DEPENDS += "edbus python-dbus"
 RDEPENDS += "python-dbus"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=python-e_dbus;proto=http"
 S = "${WORKDIR}/python-e_dbus"
diff --git a/packages/python/python-edje_svn.bb b/packages/python/python-edje_svn.bb
index 4f4fce46ed..4e33847dae 100644
--- a/packages/python/python-edje_svn.bb
+++ b/packages/python/python-edje_svn.bb
@@ -2,6 +2,6 @@ require python-efl.inc
 DEPENDS += "edje python-evas"
 RDEPENDS += "python-evas"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI += "file://0001-fix-unicode-conversion.patch;patch=1"
diff --git a/packages/python/python-egenix-mx-base_3.0.0.bb b/packages/python/python-egenix-mx-base_3.0.0.bb
index cec7d9133d..8452ca6e7f 100644
--- a/packages/python/python-egenix-mx-base_3.0.0.bb
+++ b/packages/python/python-egenix-mx-base_3.0.0.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "EGENIX"
 SRCNAME = "egenix-mx-base"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://downloads.egenix.com/python/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-emotion_svn.bb b/packages/python/python-emotion_svn.bb
index df726531d7..ceb60870eb 100644
--- a/packages/python/python-emotion_svn.bb
+++ b/packages/python/python-emotion_svn.bb
@@ -2,4 +2,4 @@ require python-efl.inc
 DEPENDS += "emotion python-evas"
 RDEPENDS += "python-ecore"
 PV = "0.3.0+svnr${SRCREV}"
-FILE_PR = "r0"
+PR = "r0"
diff --git a/packages/python/python-epsilon_svn.bb b/packages/python/python-epsilon_svn.bb
index 700ba1b14a..00fbcf5ce6 100644
--- a/packages/python/python-epsilon_svn.bb