summaryrefslogtreecommitdiff
path: root/packages/abiword
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-10-15 10:56:42 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-10-18 18:02:07 +0200
commitc0b6dd9b41279ff00c5a90e49108945a0fee9cdd (patch)
treecfeff92229e10bf27533dc5309e42213e5bdee8f /packages/abiword
parente769c7fbe16294b2c5306edfafa1ec821b7b138c (diff)
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.
Diffstat (limited to 'packages/abiword')
-rw-r--r--packages/abiword/abiword-plugins_2.4.6.bb2
-rw-r--r--packages/abiword/abiword-plugins_2.5.1.bb2
-rw-r--r--packages/abiword/abiword-plugins_2.5.2.bb2
-rw-r--r--packages/abiword/abiword.inc2
-rw-r--r--packages/abiword/abiword_2.5.1.bb2
-rw-r--r--packages/abiword/abiword_2.5.2.bb2
-rw-r--r--packages/abiword/abiword_2.6.3.bb2
-rw-r--r--packages/abiword/abiword_2.6.4.bb2
8 files changed, 8 insertions, 8 deletions
diff --git a/packages/abiword/abiword-plugins_2.4.6.bb b/packages/abiword/abiword-plugins_2.4.6.bb
index 672a807544..41652828bf 100644
--- a/packages/abiword/abiword-plugins_2.4.6.bb
+++ b/packages/abiword/abiword-plugins_2.4.6.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
DEPENDS = "libwpd librsvg goffice poppler"
RDEPENDS = "abiword"
-FILE_PR = "r1"
+PR = "r1"
SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb
index b47577bb21..eb626aba91 100644
--- a/packages/abiword/abiword-plugins_2.5.1.bb
+++ b/packages/abiword/abiword-plugins_2.5.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
DEPENDS = "libwpd librsvg goffice poppler libglade"
RDEPENDS = "abiword"
-FILE_PR = "r1"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb
index 2ff5db167d..89a0527401 100644
--- a/packages/abiword/abiword-plugins_2.5.2.bb
+++ b/packages/abiword/abiword-plugins_2.5.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
RDEPENDS = "abiword"
-FILE_PR = "r1"
+PR = "r1"
DEFAULT_PREFERENCE = "1"
diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc
index 1edd9a6e63..58f712aca9 100644
--- a/packages/abiword/abiword.inc
+++ b/packages/abiword/abiword.inc
@@ -6,7 +6,7 @@ DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfrib
RDEPENDS = "enchant "
RDEPENDS_linux += "glibc-gconv-ibm850 glibc-gconv-cp1252 \
glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-FILE_PR = "r2"
+PR = "r2"
SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
S = "${WORKDIR}/abiword-${PV}/abi"
diff --git a/packages/abiword/abiword_2.5.1.bb b/packages/abiword/abiword_2.5.1.bb
index ad5109618b..9741ad6413 100644
--- a/packages/abiword/abiword_2.5.1.bb
+++ b/packages/abiword/abiword_2.5.1.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r2"
+PR = "r2"
RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/abiword_2.5.2.bb b/packages/abiword/abiword_2.5.2.bb
index 70b6c93432..5fcc1dd1a2 100644
--- a/packages/abiword/abiword_2.5.2.bb
+++ b/packages/abiword/abiword_2.5.2.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
DEFAULT_PREFERENCE = "-1"
-FILE_PR = "r1"
+PR = "r1"
RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/abiword_2.6.3.bb b/packages/abiword/abiword_2.6.3.bb
index bb0c80c31e..fe6399226f 100644
--- a/packages/abiword/abiword_2.6.3.bb
+++ b/packages/abiword/abiword_2.6.3.bb
@@ -1,6 +1,6 @@
require abiword-2.5.inc
-FILE_PR = "r1"
+PR = "r1"
RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/abiword_2.6.4.bb b/packages/abiword/abiword_2.6.4.bb
index c07256c33c..0dd2602571 100644
--- a/packages/abiword/abiword_2.6.4.bb
+++ b/packages/abiword/abiword_2.6.4.bb
@@ -1,6 +1,6 @@
require abiword-2.5.inc
-FILE_PR = "r2"
+PR = "r2"
RCONFLICTS = "abiword-embedded"