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.

25 files changed, 25 insertions, 25 deletions

diff --git a/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
index 8c82c3dec1..136f6ca42a 100644
--- a/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
+++ b/packages/nonworking/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
@@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \
 	file://fix-kernel-version-test-for-hh.patch;patch=1"
 S = "${WORKDIR}/atmelwlandriver"
 LICENSE = "GPL"
-FILE_PR = "r2"
+PR = "r2"
 
 inherit module
 SECTION = "base"
diff --git a/packages/nonworking/bogl/bogl-utils-native_0.1.9.bb b/packages/nonworking/bogl/bogl-utils-native_0.1.9.bb
index 3bf4153d03..94a1d4e00b 100644
--- a/packages/nonworking/bogl/bogl-utils-native_0.1.9.bb
+++ b/packages/nonworking/bogl/bogl-utils-native_0.1.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Utilities for Ben's Own Graphics Library"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "gd-native"
-FILE_PR = "2"
+PR = "2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/bogl/bogl_${PV}-${PR}.tar.gz"
 S = "${WORKDIR}/bogl"
diff --git a/packages/nonworking/bogl/libbogl_0.1.9.bb b/packages/nonworking/bogl/libbogl_0.1.9.bb
index 5cbb14f88f..db18ee3160 100644
--- a/packages/nonworking/bogl/libbogl_0.1.9.bb
+++ b/packages/nonworking/bogl/libbogl_0.1.9.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Ben's Own Graphics Library"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "bogl-utils-native"
-FILE_PR = "2"
+PR = "2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/bogl/bogl_${PV}-${PR}.tar.gz"
 S = "${WORKDIR}/bogl"
diff --git a/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
index c78cdf1de3..e7eeaf0de0 100644
--- a/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
+++ b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.40.bb
@@ -1,6 +1,6 @@
 require gpe-contacts.inc
 
-FILE_PR ="r2"
+PR ="r2"
 SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
 
 DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl"
diff --git a/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
index c78cdf1de3..e7eeaf0de0 100644
--- a/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
+++ b/packages/nonworking/gpe-contacts/gpe-contacts-hildon_0.42.bb
@@ -1,6 +1,6 @@
 require gpe-contacts.inc
 
-FILE_PR ="r2"
+PR ="r2"
 SRC_URI = "${GPE_MIRROR}/gpe-contacts-${PV}.tar.bz2"
 
 DEPENDS += "gtk+-2.6.4-1.osso7 libgpepimc-hildon libosso hildon-lgpl"
diff --git a/packages/nonworking/gtk+/gtk+-directfb_2.10.14.bb b/packages/nonworking/gtk+/gtk+-directfb_2.10.14.bb
index bcd3d9f227..6fcaf299dc 100644
--- a/packages/nonworking/gtk+/gtk+-directfb_2.10.14.bb
+++ b/packages/nonworking/gtk+/gtk+-directfb_2.10.14.bb
@@ -1,6 +1,6 @@
 require gtk-2.10.inc
 
-FILE_PR = "r2"
+PR = "r2"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/nonworking/icecast/icecast_2.2.0.bb b/packages/nonworking/icecast/icecast_2.2.0.bb
index 93f9fb06d9..c0f500ac4a 100644
--- a/packages/nonworking/icecast/icecast_2.2.0.bb
+++ b/packages/nonworking/icecast/icecast_2.2.0.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r4"
+PR = "r4"
 LICENSE = "GPLv2"
 
 DEPENDS = "libvorbis libogg libxslt"
diff --git a/packages/nonworking/libconfig++/libconfig++_0.7a.bb b/packages/nonworking/libconfig++/libconfig++_0.7a.bb
index 41acd78205..05e977d12b 100644
--- a/packages/nonworking/libconfig++/libconfig++_0.7a.bb
+++ b/packages/nonworking/libconfig++/libconfig++_0.7a.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "libConfig++ is a portable and flexible C++ library for \
 reading configuration files which were written in C style syntax."
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/config-plus/config-plus-${PV}.tar.gz"
 S = "${WORKDIR}/config-plus-${PV}"
diff --git a/packages/nonworking/linux/linux-mtx-1_2.4.24.bb b/packages/nonworking/linux/linux-mtx-1_2.4.24.bb
index be3137330b..81c51ce6a4 100644
--- a/packages/nonworking/linux/linux-mtx-1_2.4.24.bb
+++ b/packages/nonworking/linux/linux-mtx-1_2.4.24.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)"
 LICENSE = "GPL"
 KV = "${PV}"
 RDEPENDS = "mtd-utils"
-FILE_PR ="r2"
+PR ="r2"
 
 SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_24_pre2 \
 	file://01-mtd-2004-01-27.diff;patch=1 \
diff --git a/packages/nonworking/mISDN/misdn_cvs.bb b/packages/nonworking/mISDN/misdn_cvs.bb
index 6bfc1082da..865e41b2f9 100644
--- a/packages/nonworking/mISDN/misdn_cvs.bb
+++ b/packages/nonworking/mISDN/misdn_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "mISDN kernel packages"
 PRIORITY = "optional"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
-FILE_PR = "r0"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb b/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb
index 348d377e93..58d7f54a8b 100644
--- a/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb
+++ b/packages/nonworking/maemo/hildon-base-lib_0.8.6-2.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r0"
+PR = "r0"
 LICENSE = 	"LGPL"
 
 DEPENDS = "gtk+-2.6.4-1.osso7 outo"
diff --git a/packages/nonworking/maemo/sapwood_1.20-1.bb b/packages/nonworking/maemo/sapwood_1.20-1.bb
index e5864e1f2a..8cd52fa602 100644
--- a/packages/nonworking/maemo/sapwood_1.20-1.bb
+++ b/packages/nonworking/maemo/sapwood_1.20-1.bb
@@ -1,4 +1,4 @@
-FILE_PR = "r1"
+PR = "r1"
 LICENSE = "GPL"
 SECTION = "x11/base"
 DESCRIPTION = "GTK theme engine Sapwood"
diff --git a/packages/nonworking/meta/meta-gpephone.bb b/packages/nonworking/meta/meta-gpephone.bb
index 5d867e1002..9912ddbf30 100644
--- a/packages/nonworking/meta/meta-gpephone.bb
+++ b/packages/nonworking/meta/meta-gpephone.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages"
 LICENSE = "MIT"
-FILE_PR = "r1"
+PR = "r1"
 
 RDEPENDS = "\
     gpephone-task-base \
diff --git a/packages/nonworking/meta/meta-sectest-gpe.bb b/packages/nonworking/meta/meta-sectest-gpe.bb
index 32517c6c62..a73559ab1a 100644
--- a/packages/nonworking/meta/meta-sectest-gpe.bb
+++ b/packages/nonworking/meta/meta-sectest-gpe.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta-package for GPE Security Testing Image"
 LICENSE = "MIT"
-FILE_PR = "r6"
+PR = "r6"
 
 RDEPENDS = "\
     gpe-task-base \
diff --git a/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb b/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb
index 905f9d2cef..88c009d775 100644
--- a/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
diff --git a/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb b/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb
index dca3898551..e7774e33df 100644
--- a/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
diff --git a/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb b/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb
index dca3898551..e7774e33df 100644
--- a/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r0"
+PR = "r0"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
diff --git a/packages/nonworking/opie-dasher/opie-dasher_cvs.bb b/packages/nonworking/opie-dasher/opie-dasher_cvs.bb
index 1ff157331a..10cca07fd6 100644
--- a/packages/nonworking/opie-dasher/opie-dasher_cvs.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-FILE_PR = "r1"
+PR = "r1"
 
 PV = "${OPIE_CVS_PV}"
 
diff --git a/packages/nonworking/php/php-native_4.4.4.bb b/packages/nonworking/php/php-native_4.4.4.bb
index bd257e0cfc..84d1c667b5 100644
--- a/packages/nonworking/php/php-native_4.4.4.bb
+++ b/packages/nonworking/php/php-native_4.4.4.bb
@@ -3,6 +3,6 @@ require php_${PV}.bb
 inherit native
 FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
 DEPENDS = "zlib-native"
-FILE_PR = "r2"
+PR = "r2"
 
 S = "${WORKDIR}/php-${PV}"
diff --git a/packages/nonworking/php/php_4.4.4.bb b/packages/nonworking/php/php_4.4.4.bb
index 211a536840..3000ad1fb6 100644
--- a/packages/nonworking/php/php_4.4.4.bb
+++ b/packages/nonworking/php/php_4.4.4.bb
@@ -1,6 +1,6 @@
 require php.inc
 
-FILE_PR = "r1"
+PR = "r1"
 
 SRC_URI = "http://museum.php.net/php4/php-${PV}.tar.bz2 \
            file://${FILESDIR}/autotools.patch;patch=1 \
diff --git a/packages/nonworking/tetex/tetex-native_3.0.bb b/packages/nonworking/tetex/tetex-native_3.0.bb
index aa30f284ef..4d683ff3d1 100644
--- a/packages/nonworking/tetex/tetex-native_3.0.bb
+++ b/packages/nonworking/tetex/tetex-native_3.0.bb
@@ -1,7 +1,7 @@
 require tetex_${PV}.bb
 inherit native
 DEPENDS = ""
-FILE_PR = "r2"
+PR = "r2"
 
 PACKAGES=""
 RRECOMMENDS_${PN}=""
diff --git a/packages/nonworking/tetex/tetex-texmf_3.0.bb b/packages/nonworking/tetex/tetex-texmf_3.0.bb
index 35af440d31..80d6f779d8 100644
--- a/packages/nonworking/tetex/tetex-texmf_3.0.bb
+++ b/packages/nonworking/tetex/tetex-texmf_3.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "teTeX data"
 LICENSE = "GPL"
 SECTION = "console/utils"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-${PV}.tar.gz"
 S = "${WORKDIR}"
diff --git a/packages/nonworking/tetex/tetex_3.0.bb b/packages/nonworking/tetex/tetex_3.0.bb
index bebdb6b128..eedf8820b2 100644
--- a/packages/nonworking/tetex/tetex_3.0.bb
+++ b/packages/nonworking/tetex/tetex_3.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.tug.org/tetex"
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib"
-FILE_PR = "r6"
+PR = "r6"
 
 SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \
            file://configure.patch;patch=1"
diff --git a/packages/nonworking/zaurss/zaurss_0.4.2.bb b/packages/nonworking/zaurss/zaurss_0.4.2.bb
index f5b09aa389..7898eb437c 100644
--- a/packages/nonworking/zaurss/zaurss_0.4.2.bb
+++ b/packages/nonworking/zaurss/zaurss_0.4.2.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.daionet.gr.jp/~knok/software/zaurss/"
 APPNAME = "zaurss"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
-FILE_PR = "r0"
+PR = "r0"
 
 SRC_URI = "http://www.daionet.gr.jp/~knok/software/zaurss/zaurss-${PV}.tar.gz"
 
diff --git a/packages/nonworking/zethereal/zethereal_1.0.0.bb b/packages/nonworking/zethereal/zethereal_1.0.0.bb
index 6eacf7d7e4..74913c1b01 100644
--- a/packages/nonworking/zethereal/zethereal_1.0.0.bb
+++ b/packages/nonworking/zethereal/zethereal_1.0.0.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.cartel-info.fr/pbiondi/zaurus/"
 APPNAME = "zethereal"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
-FILE_PR = "r0"
+PR = "r0"
 
 inherit autotools qmake_base