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

7 files changed, 7 insertions, 7 deletions

diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb
index 199945e4bc..2da8fce1b6 100644
--- a/packages/libsdl/libsdl-image_1.2.3.bb
+++ b/packages/libsdl/libsdl-image_1.2.3.bb
@@ -1,6 +1,6 @@
 require libsdl-image.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "\
   file://autotools.patch;patch=1 \
diff --git a/packages/libsdl/libsdl-image_1.2.6.bb b/packages/libsdl/libsdl-image_1.2.6.bb
index b458e19dba..99fd98f508 100644
--- a/packages/libsdl/libsdl-image_1.2.6.bb
+++ b/packages/libsdl/libsdl-image_1.2.6.bb
@@ -1,5 +1,5 @@
 require libsdl-image.inc
-FILE_PR= "r1"
+PR = "r1"
 
 DEPENDS += "tiff"
 
diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb
index c1ebbbc974..84841d9741 100644
--- a/packages/libsdl/libsdl-mixer_1.2.6.bb
+++ b/packages/libsdl/libsdl-mixer_1.2.6.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl libmikmod"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_mixer-${PV}"
diff --git a/packages/libsdl/libsdl-native_1.2.11.bb b/packages/libsdl/libsdl-native_1.2.11.bb
index 144adf68c2..fb8e12a4c9 100644
--- a/packages/libsdl/libsdl-native_1.2.11.bb
+++ b/packages/libsdl/libsdl-native_1.2.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple DirectMedia Layer - native Edition"
 HOMEPAGE = "http://www.libsdl.org"
 SECTION = "libs"
 LICENSE = "LGPL"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
 	   file://acinclude.m4 \
diff --git a/packages/libsdl/libsdl-net_1.2.7.bb b/packages/libsdl/libsdl-net_1.2.7.bb
index 1346b5695a..8cbea5bd01 100644
--- a/packages/libsdl/libsdl-net_1.2.7.bb
+++ b/packages/libsdl/libsdl-net_1.2.7.bb
@@ -3,7 +3,7 @@ SECTION = "libs/network"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl"
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \
 	   file://libtool2.patch;patch=1 \
diff --git a/packages/libsdl/libsdl-ttf_2.0.3.bb b/packages/libsdl/libsdl-ttf_2.0.3.bb
index 658444ec22..250fb698ce 100644
--- a/packages/libsdl/libsdl-ttf_2.0.3.bb
+++ b/packages/libsdl/libsdl-ttf_2.0.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl freetype"
 LICENSE = "LGPL"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
            file://new-freetype-includes.patch;patch=1"
diff --git a/packages/libsdl/libsdl-x11_1.2.11.bb b/packages/libsdl/libsdl-x11_1.2.11.bb
index e9628d9e07..ab349d6306 100644
--- a/packages/libsdl/libsdl-x11_1.2.11.bb
+++ b/packages/libsdl/libsdl-x11_1.2.11.bb
@@ -3,7 +3,7 @@ require libsdl.inc
 # extra-keys.patch is missing
 DEFAULT_PREFERENCE = "-1" 
 
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \