diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
commit | 3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch) | |
tree | 995f4a15764d4196a92ecd966150e38d910d57d1 /recipes/fbreader | |
parent | b5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff) | |
parent | e426517ed76c7532434f0687f88fca1295530000 (diff) | |
download | openembedded-3fd04f71ad25d5df59c636986f741b9a36ce6501.tar.gz |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'recipes/fbreader')
-rw-r--r-- | recipes/fbreader/fbreader_0.10.7.bb | 1 | ||||
-rw-r--r-- | recipes/fbreader/fbreader_0.12.1.bb | 1 | ||||
-rw-r--r-- | recipes/fbreader/fbreader_0.7.3d.bb | 2 | ||||
-rw-r--r-- | recipes/fbreader/fbreader_0.7.4q.bb | 2 | ||||
-rw-r--r-- | recipes/fbreader/fbreader_0.8.2a.bb | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/recipes/fbreader/fbreader_0.10.7.bb b/recipes/fbreader/fbreader_0.10.7.bb index 986f21fbca..e649f1cc6b 100644 --- a/recipes/fbreader/fbreader_0.10.7.bb +++ b/recipes/fbreader/fbreader_0.10.7.bb @@ -4,6 +4,7 @@ SECTION = "x11/utils" PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi" +PR = "r1" SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz file://help.patch;patch=1" diff --git a/recipes/fbreader/fbreader_0.12.1.bb b/recipes/fbreader/fbreader_0.12.1.bb index c1c3025a1a..0fd1c7c904 100644 --- a/recipes/fbreader/fbreader_0.12.1.bb +++ b/recipes/fbreader/fbreader_0.12.1.bb @@ -4,6 +4,7 @@ SECTION = "x11/utils" PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi" +PR = "r1" SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \ file://Makefile.patch;patch=1" diff --git a/recipes/fbreader/fbreader_0.7.3d.bb b/recipes/fbreader/fbreader_0.7.3d.bb index a326180997..7934b6aece 100644 --- a/recipes/fbreader/fbreader_0.7.3d.bb +++ b/recipes/fbreader/fbreader_0.7.3d.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://only.mawhrin.net/fbreader/" SECTION = "x11/utils" PRIORITY = "optional" DEPENDS = "gtk+ enca expat bzip2" -PR = "r1" +PR = "r2" SRC_URI = "http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-${PV}.tgz \ file://fbreader-0.7.3d_buildsys_oe.patch;patch=1" diff --git a/recipes/fbreader/fbreader_0.7.4q.bb b/recipes/fbreader/fbreader_0.7.4q.bb index de2bf358a4..0326905a1a 100644 --- a/recipes/fbreader/fbreader_0.7.4q.bb +++ b/recipes/fbreader/fbreader_0.7.4q.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://only.mawhrin.net/fbreader/" SECTION = "x11/utils" PRIORITY = "optional" DEPENDS = "gtk+ enca expat bzip2 libgpewidget" -PR = "r1" +PR = "r2" SRC_URI = "http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-${PV}.tgz \ file://fbreader-0.7.4q_buildsys_oe.patch;patch=1" diff --git a/recipes/fbreader/fbreader_0.8.2a.bb b/recipes/fbreader/fbreader_0.8.2a.bb index 7d6a2b044c..b970d230e2 100644 --- a/recipes/fbreader/fbreader_0.8.2a.bb +++ b/recipes/fbreader/fbreader_0.8.2a.bb @@ -4,7 +4,7 @@ SECTION = "x11/utils" PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv" -PR = "r5" +PR = "r7" # The RESOLUTION is defined at compile time which makes # this package MACHINE specific. |