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.

9 files changed, 9 insertions, 9 deletions

diff --git a/packages/xserver-common/xserver-common_1.12.bb b/packages/xserver-common/xserver-common_1.12.bb
index 06def250bf..dc91d7da68 100644
--- a/packages/xserver-common/xserver-common_1.12.bb
+++ b/packages/xserver-common/xserver-common_1.12.bb
@@ -1,6 +1,6 @@
 require xserver-common.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI_append = " file://setDPI.sh \
 	           file://rxvt-less-pink.diff;patch=1"
diff --git a/packages/xserver-common/xserver-common_1.13.bb b/packages/xserver-common/xserver-common_1.13.bb
index e477c91cfc..599af1d6f7 100644
--- a/packages/xserver-common/xserver-common_1.13.bb
+++ b/packages/xserver-common/xserver-common_1.13.bb
@@ -1,6 +1,6 @@
 require xserver-common.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI_append = " file://setDPI.sh \
                    file://xserver-imageon.patch;patch=1 \
diff --git a/packages/xserver-common/xserver-common_1.14.bb b/packages/xserver-common/xserver-common_1.14.bb
index c6fc6db402..48320ba006 100644
--- a/packages/xserver-common/xserver-common_1.14.bb
+++ b/packages/xserver-common/xserver-common_1.14.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.15.bb b/packages/xserver-common/xserver-common_1.15.bb
index c6fc6db402..48320ba006 100644
--- a/packages/xserver-common/xserver-common_1.15.bb
+++ b/packages/xserver-common/xserver-common_1.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.16.bb b/packages/xserver-common/xserver-common_1.16.bb
index 21e8643c11..fcf1dcfd78 100644
--- a/packages/xserver-common/xserver-common_1.16.bb
+++ b/packages/xserver-common/xserver-common_1.16.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r7"
+PR = "r7"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb
index 914da15ad0..6e3e2dd1ed 100644
--- a/packages/xserver-common/xserver-common_1.18.bb
+++ b/packages/xserver-common/xserver-common_1.18.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r1"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.21.bb b/packages/xserver-common/xserver-common_1.21.bb
index ce98679e52..a30a37c893 100644
--- a/packages/xserver-common/xserver-common_1.21.bb
+++ b/packages/xserver-common/xserver-common_1.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r0"
+PR = "r0"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb
index f85664bc45..6dcbc6862d 100644
--- a/packages/xserver-common/xserver-common_1.22.bb
+++ b/packages/xserver-common/xserver-common_1.22.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-FILE_PR = "r7"
+PR = "r7"
 
 PACKAGE_ARCH = "all"
 
diff --git a/packages/xserver-common/xserver-common_svn.bb b/packages/xserver-common/xserver-common_svn.bb
index c9d66d4d93..546481d48f 100644
--- a/packages/xserver-common/xserver-common_svn.bb
+++ b/packages/xserver-common/xserver-common_svn.bb
@@ -6,7 +6,7 @@ DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
 PV = "1.12+svn${SRCDATE}"
 S = "${WORKDIR}/xserver-common"
 
-FILE_PR = "r2"
+PR = "r2"
 
 SRC_URI = "${GPE_SVN} \
             file://Makefile.translation \