bb files: Revert the introduction of FILE_PR

    This is a partial revert of aa03004ace2fabb135a6208ef8c2d2b312aa7b0b. The
    approach that was taken leads to disagreement and the change was pushed
    too early. DISTRO_PR is going to say and will be used inside the package
    creation. There will be more disucssion on the list about where to continue
    from here.

22 files changed, 22 insertions, 22 deletions

diff --git a/packages/obsolete/dbus/dbus-native_0.50.bb b/packages/obsolete/dbus/dbus-native_0.50.bb
index 95a073abd4..39ea2ae0b7 100644
--- a/packages/obsolete/dbus/dbus-native_0.50.bb
+++ b/packages/obsolete/dbus/dbus-native_0.50.bb
@@ -8,7 +8,7 @@ S = "${WORKDIR}/dbus-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus"
 DEPENDS = "glib-2.0-native"
 
-FILE_PR = "r1"
+PR = "r1"
 
 do_stage() {
 	oe_runmake install
diff --git a/packages/obsolete/dbus/dbus_0.21.bb b/packages/obsolete/dbus/dbus_0.21.bb
index c6615b1c99..d7b164e8cc 100644
--- a/packages/obsolete/dbus/dbus_0.21.bb
+++ b/packages/obsolete/dbus/dbus_0.21.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r4"
+PR = "r4"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 DEPENDS = "expat glib-2.0 virtual/libintl"
diff --git a/packages/obsolete/dbus/dbus_0.22.bb b/packages/obsolete/dbus/dbus_0.22.bb
index 9e40e3d376..8eacbeca27 100644
--- a/packages/obsolete/dbus/dbus_0.22.bb
+++ b/packages/obsolete/dbus/dbus_0.22.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r6"
+PR = "r6"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.23.1-osso5.bb b/packages/obsolete/dbus/dbus_0.23.1-osso5.bb
index 36b6db4e5b..1cb72cb792 100644
--- a/packages/obsolete/dbus/dbus_0.23.1-osso5.bb
+++ b/packages/obsolete/dbus/dbus_0.23.1-osso5.bb
@@ -1,6 +1,6 @@
 DEFAULT_PREFERENCE = "-1"
 SECTION = "base"
-FILE_PR = "r1"
+PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.23.4.bb b/packages/obsolete/dbus/dbus_0.23.4.bb
index a4711c2c8d..6fd86ae1aa 100644
--- a/packages/obsolete/dbus/dbus_0.23.4.bb
+++ b/packages/obsolete/dbus/dbus_0.23.4.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r1"
+PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.23.bb b/packages/obsolete/dbus/dbus_0.23.bb
index 186cb50361..de224f307e 100644
--- a/packages/obsolete/dbus/dbus_0.23.bb
+++ b/packages/obsolete/dbus/dbus_0.23.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r2"
+PR = "r2"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.34.inc b/packages/obsolete/dbus/dbus_0.34.inc
index cac7139b3e..1c63c37fdf 100644
--- a/packages/obsolete/dbus/dbus_0.34.inc
+++ b/packages/obsolete/dbus/dbus_0.34.inc
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r0"
+PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/dbus/dbus_0.50.inc b/packages/obsolete/dbus/dbus_0.50.inc
index 6a1b06ab0a..094a9b68d6 100644
--- a/packages/obsolete/dbus/dbus_0.50.inc
+++ b/packages/obsolete/dbus/dbus_0.50.inc
@@ -1,5 +1,5 @@
 SECTION = "base"
-FILE_PR = "r0"
+PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/obsolete/gaim/gaim_1.0.3.bb b/packages/obsolete/gaim/gaim_1.0.3.bb
index d5d29a030f..f833ddde28 100644
--- a/packages/obsolete/gaim/gaim_1.0.3.bb
+++ b/packages/obsolete/gaim/gaim_1.0.3.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.1.0.bb b/packages/obsolete/gaim/gaim_1.1.0.bb
index d5d29a030f..f833ddde28 100644
--- a/packages/obsolete/gaim/gaim_1.1.0.bb
+++ b/packages/obsolete/gaim/gaim_1.1.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.1.1.bb b/packages/obsolete/gaim/gaim_1.1.1.bb
index d5d29a030f..f833ddde28 100644
--- a/packages/obsolete/gaim/gaim_1.1.1.bb
+++ b/packages/obsolete/gaim/gaim_1.1.1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.1.2.bb b/packages/obsolete/gaim/gaim_1.1.2.bb
index dbb8d0be34..3bf9aeb3a7 100644
--- a/packages/obsolete/gaim/gaim_1.1.2.bb
+++ b/packages/obsolete/gaim/gaim_1.1.2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.4.0.bb b/packages/obsolete/gaim/gaim_1.4.0.bb
index bcbd260adf..1585229b14 100644
--- a/packages/obsolete/gaim/gaim_1.4.0.bb
+++ b/packages/obsolete/gaim/gaim_1.4.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name_1.4.0.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_1.5.0.bb b/packages/obsolete/gaim/gaim_1.5.0.bb
index dbb8d0be34..3bf9aeb3a7 100644
--- a/packages/obsolete/gaim/gaim_1.5.0.bb
+++ b/packages/obsolete/gaim/gaim_1.5.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 	file://desktop-name.patch;patch=1"
diff --git a/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb b/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb
index 0f2d2df0e6..bf8591920c 100644
--- a/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb
+++ b/packages/obsolete/gaim/gaim_2.0.0-cvs-mco1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r3"
+PR = "r3"
 SRCDATE_${PN} = "20050904"
 #Change to x.y.z+cvs${SRCDATE}-mco1 when 2.0.0 changes
 PV = "2.0.0-cvs-mco1-${SRCDATE}"
diff --git a/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb
index 6e1e7f42ca..60c2a9d385 100644
--- a/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb
+++ b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb
@@ -6,7 +6,7 @@ PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
 
 # NOTE: make sure to keep PR in sync with libsdl-x11
-FILE_PR = "r9"
+PR = "r9"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
            file://agawa-piro-mickey.patch;patch=1 \
diff --git a/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
index 524c4dda90..e0f258decd 100644
--- a/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
+++ b/packages/obsolete/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Gnome Virtual File System - OSSO Version"
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-FILE_PR = "r4"
+PR = "r4"
 PROVIDES = "virtual/gnome-vfs"
 RPROVIDES = "gnome-vfs"
 
diff --git a/packages/obsolete/olsr/olsrd_0.4.10.bb b/packages/obsolete/olsr/olsrd_0.4.10.bb
index e3d0e686d2..9722ca7d8d 100644
--- a/packages/obsolete/olsr/olsrd_0.4.10.bb
+++ b/packages/obsolete/olsr/olsrd_0.4.10.bb
@@ -1,2 +1,2 @@
 require olsrd.inc
-FILE_PR = "r1"
+PR = "r1"
diff --git a/packages/obsolete/olsr/olsrd_0.4.9.bb b/packages/obsolete/olsr/olsrd_0.4.9.bb
index 59c00681b3..1f186f4bbb 100644
--- a/packages/obsolete/olsr/olsrd_0.4.9.bb
+++ b/packages/obsolete/olsr/olsrd_0.4.9.bb
@@ -1,5 +1,5 @@
 require olsrd.inc
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI += "file://0.4.9-httpinfo-makefile.diff;patch=1"
 
diff --git a/packages/obsolete/tasks/task-bootstrap-unionroot.bb b/packages/obsolete/tasks/task-bootstrap-unionroot.bb
index 5d6974c1f3..a4340eb4e8 100644
--- a/packages/obsolete/tasks/task-bootstrap-unionroot.bb
+++ b/packages/obsolete/tasks/task-bootstrap-unionroot.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Core packages required for a basic installation with unionroot"
 PROVIDES = "task-bootstrap"
 RPROVIDES = "task-bootstrap"
-FILE_PR = "r2"
+PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
diff --git a/packages/obsolete/tasks/task-bootstrap.bb b/packages/obsolete/tasks/task-bootstrap.bb
index 37ac88ec79..ebe78058b2 100644
--- a/packages/obsolete/tasks/task-bootstrap.bb
+++ b/packages/obsolete/tasks/task-bootstrap.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Core packages required for a basic installation"
-FILE_PR = "r25"
+PR = "r25"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
diff --git a/packages/obsolete/wesnoth_svn.bb b/packages/obsolete/wesnoth_svn.bb
index 411ff57fe5..430abe7d0f 100644
--- a/packages/obsolete/wesnoth_svn.bb
+++ b/packages/obsolete/wesnoth_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "fantasy turn-based strategy game"
 PV = "0.01+svnr${SRCREV}"
-FILE_PR = "r1"
+PR = "r1"
 SECTION = "games"
 LICENSE = "GPL"
 DEPENDS += "libsdl-image libsdl-mixer libsdl-net"