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

14 files changed, 14 insertions, 14 deletions

diff --git a/packages/gtk+/gdk-pixbuf_2.10.14.bb b/packages/gtk+/gdk-pixbuf_2.10.14.bb
index 8b6f335af9..7d3e7dc92a 100644
--- a/packages/gtk+/gdk-pixbuf_2.10.14.bb
+++ b/packages/gtk+/gdk-pixbuf_2.10.14.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "libpng gettext glib-2.0"
-FILE_PR = "r1"
+PR = "r1"
 
 S = "${WORKDIR}/gtk+-${PV}"
 FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb
index aa9ba641d5..dfe0fbd979 100644
--- a/packages/gtk+/gtk+-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-1.2_1.2.10.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-1.2 jpeg libpng libxext"
-FILE_PR = "r3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
            file://timezone-fix.patch;patch=1 \
diff --git a/packages/gtk+/gtk+-fastscaling_2.10.14.bb b/packages/gtk+/gtk+-fastscaling_2.10.14.bb
index 0a743e6a63..cb79d66301 100644
--- a/packages/gtk+/gtk+-fastscaling_2.10.14.bb
+++ b/packages/gtk+/gtk+-fastscaling_2.10.14.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1"
 
 PROVIDES = "gtk+"
 RPROVIDES_${PN} = "gtk+"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
 
diff --git a/packages/gtk+/gtk+-native-1.2_1.2.10.bb b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
index e51fa52aa1..f5ad1a58ab 100644
--- a/packages/gtk+/gtk+-native-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-1.2 jpeg libpng libxext"
 
-FILE_PR = "r1"
+PR = "r1"
 
 FILESPATH =+ "${FILE_DIRNAME}/gtk+-1.2-1.2.10:"
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb
index ace0019d4e..c9b98a1897 100644
--- a/packages/gtk+/gtk+_2.10.14.bb
+++ b/packages/gtk+/gtk+_2.10.14.bb
@@ -1,6 +1,6 @@
 require gtk-2.10.inc
 
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
diff --git a/packages/gtk+/gtk+_2.12.0.bb b/packages/gtk+/gtk+_2.12.0.bb
index 3d3b66b730..3d4dcde40f 100644
--- a/packages/gtk+/gtk+_2.12.0.bb
+++ b/packages/gtk+/gtk+_2.12.0.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS += "cairo"
 
diff --git a/packages/gtk+/gtk+_2.12.11.bb b/packages/gtk+/gtk+_2.12.11.bb
index e4716c04d7..d246eb8de9 100644
--- a/packages/gtk+/gtk+_2.12.11.bb
+++ b/packages/gtk+/gtk+_2.12.11.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r4"
+PR = "r4"
 
 DEPENDS += "cairo"
 
diff --git a/packages/gtk+/gtk+_2.12.3.bb b/packages/gtk+/gtk+_2.12.3.bb
index 5b84c884b4..642154b207 100644
--- a/packages/gtk+/gtk+_2.12.3.bb
+++ b/packages/gtk+/gtk+_2.12.3.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r3"
+PR = "r3"
 
 DEPENDS += "cairo"
 
diff --git a/packages/gtk+/gtk+_2.14.1.bb b/packages/gtk+/gtk+_2.14.1.bb
index a1abbc196c..627a1750c0 100644
--- a/packages/gtk+/gtk+_2.14.1.bb
+++ b/packages/gtk+/gtk+_2.14.1.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS += "cairo jasper"
 
diff --git a/packages/gtk+/gtk+_2.14.2.bb b/packages/gtk+/gtk+_2.14.2.bb
index a8233a240a..b0002b8102 100644
--- a/packages/gtk+/gtk+_2.14.2.bb
+++ b/packages/gtk+/gtk+_2.14.2.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 DEPENDS += "cairo jasper"
 
diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb
index 6f8d383e79..cab18db85c 100644
--- a/packages/gtk+/gtk+_2.6.10.bb
+++ b/packages/gtk+/gtk+_2.6.10.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
-FILE_PR = "r11"
+PR = "r11"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://help.patch;patch=1 \
diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb
index 7bd2ca5784..fd25122d5c 100644
--- a/packages/gtk+/gtk+_2.8.16.bb
+++ b/packages/gtk+/gtk+_2.8.16.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-FILE_PR = "r5"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb
index 121bd62975..91b6b3dce9 100644
--- a/packages/gtk+/gtk+_2.8.9.bb
+++ b/packages/gtk+/gtk+_2.8.9.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-FILE_PR = "r7"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
diff --git a/packages/gtk+/pixops-test.bb b/packages/gtk+/pixops-test.bb
index 8b4b3ee80d..79bc33a04f 100644
--- a/packages/gtk+/pixops-test.bb
+++ b/packages/gtk+/pixops-test.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Productive gtk+ devel prodder"
 DEPENDS = "gtk+"
 
-FILE_PR = "r2"
+PR = "r2"
 
 inherit pkgconfig