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

6 files changed, 6 insertions, 6 deletions

diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc
index 6198e47371..d81d38b285 100644
--- a/packages/matchbox-panel/matchbox-panel.inc
+++ b/packages/matchbox-panel/matchbox-panel.inc
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
 SECTION = "x11/wm"
 
-FILE_PR = "r3"
+PR = "r3"
 
 inherit autotools pkgconfig gettext
 
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
index 3aa2b0155f..f6600bdbcd 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
@@ -1,5 +1,5 @@
 SECTION = "x11/utils"
-FILE_PR = "r4"
+PR = "r4"
 DESCRIPTION = "Matchbox panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel"
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.3.bb b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
index 16cf3b0cdc..f15d16f39a 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.3.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel"
 SECTION = "x11/wm"
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
 	file://make-batteryapp-less-strict.patch;patch=1 \
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.1.bb b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
index 44f0e3a4dc..3a10e1938d 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel"
 SECTION = "x11/wm"
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
            file://allow-100-per-cent-battery.patch;patch=1 \
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
index 03aa4ccc88..42957a4fa8 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.2.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.2.bb
@@ -1,6 +1,6 @@
 require matchbox-panel.inc
 
-FILE_PR ="r12"
+PR ="r12"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
            file://add_hostap.patch;patch=1 \
            http://handhelds.org/~pb/mb-panel-0.9.2-polling.patch;patch=1 \
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb
index 2b1021f9a8..b7b12edc63 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.3.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb
@@ -1,4 +1,4 @@
 require matchbox-panel.inc
-FILE_PR ="r3"
+PR ="r3"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
 	   file://mb-applet-battery-repaint-093.patch;patch=1"