diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:33:26 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:38:30 +0200 |
| commit | 53bfb2398c16d2065ffa2bc6cd34c83e15347014 (patch) | |
| tree | 3793fb7c6cb4799ec2c029b433636cb60fe7625b /packages/linphone | |
| parent | 576cfbfba8880ea4421369d35236c696188b144d (diff) | |
| parent | 245f7d129f3dba351b3c8ef284df69a86261904c (diff) | |
Merge branch 'shared/file-pr-revert' into org.openembedded.dev
Conflicts:
packages/busybox/busybox_1.11.3.bb
packages/dsplink/codec-engine_2.10.bb
packages/gdb/gdb_6.3.bb
packages/gdb/gdb_6.4.bb
packages/gdb/gdb_6.6.bb
packages/gdb/gdb_6.8.bb
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.3.6.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/kexecboot/linux-kexecboot_2.6.26.bb
packages/libsdl/libsdl-x11_1.2.11.bb
packages/linux/linux-rp_2.6.26.bb
packages/mozilla/fennec_hg.bb
packages/python/python_2.5.2.bb
packages/tasks/task-xfce-base.bb
packages/xorg-driver/xf86-video-omapfb_git.bb
packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
Diffstat (limited to 'packages/linphone')
| -rw-r--r-- | packages/linphone/linphone-hh_0.12.2.hh1.bb | 2 | ||||
| -rw-r--r-- | packages/linphone/linphone_0.12.2.bb | 2 | ||||
| -rw-r--r-- | packages/linphone/linphone_1.3.99.8.bb | 2 | ||||
| -rw-r--r-- | packages/linphone/linphone_1.6.0.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/linphone/linphone-hh_0.12.2.hh1.bb b/packages/linphone/linphone-hh_0.12.2.hh1.bb index 8666cac01a..54a79390a7 100644 --- a/packages/linphone/linphone-hh_0.12.2.hh1.bb +++ b/packages/linphone/linphone-hh_0.12.2.hh1.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/utils" -FILE_PR = "r4" +PR = "r4" DESCRIPTION = "SIP-based IP phone (GPE edition)" DEPENDS = "libosip gtk+ libogg alsa-lib" diff --git a/packages/linphone/linphone_0.12.2.bb b/packages/linphone/linphone_0.12.2.bb index 28f740958d..7a5e17a981 100644 --- a/packages/linphone/linphone_0.12.2.bb +++ b/packages/linphone/linphone_0.12.2.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/utils" -FILE_PR = "r2" +PR = "r2" DESCRIPTION = "SIP-based IP phone (GPE edition)" DEPENDS = "libosip gtk+ libogg libgnomeui" diff --git a/packages/linphone/linphone_1.3.99.8.bb b/packages/linphone/linphone_1.3.99.8.bb index 490e0ee7f6..f96bd66b82 100644 --- a/packages/linphone/linphone_1.3.99.8.bb +++ b/packages/linphone/linphone_1.3.99.8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "SIP-based IP phone (Console edition)" HOMEPAGE = "http://www.linphone.org/?lang=us" LICENSE = "GPL-2" DEPENDS = "libosip2 speex libogg alsa-lib readline" -FILE_PR = "r0" +PR = "r0" SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/unstable/source/linphone-${PV}.tar.gz \ file://conf.patch;patch=1" diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb index 40e2c86dcc..fe40b6a270 100644 --- a/packages/linphone/linphone_1.6.0.bb +++ b/packages/linphone/linphone_1.6.0.bb @@ -18,7 +18,7 @@ RDEPENDS_libmediastreamer = "speex libogg libasound libortp" PROVIDES += "linphone linphonec liblinphone" -FILE_PR = "r3" +PR = "r3" SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \ http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1" |