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/avahi | |
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/avahi')
-rw-r--r-- | packages/avahi/avahi-python_0.6.21.bb | 2 | ||||
-rw-r--r-- | packages/avahi/avahi-ui_0.6.21.bb | 2 | ||||
-rw-r--r-- | packages/avahi/avahi_0.6.19.bb | 2 | ||||
-rw-r--r-- | packages/avahi/avahi_0.6.20.bb | 2 | ||||
-rw-r--r-- | packages/avahi/avahi_0.6.21.bb | 2 | ||||
-rw-r--r-- | packages/avahi/avahi_0.6.22.bb | 2 | ||||
-rw-r--r-- | packages/avahi/mango-lassi_git.bb | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/packages/avahi/avahi-python_0.6.21.bb b/packages/avahi/avahi-python_0.6.21.bb index 3e55373264..25ca037c04 100644 --- a/packages/avahi/avahi-python_0.6.21.bb +++ b/packages/avahi/avahi-python_0.6.21.bb @@ -1,6 +1,6 @@ require avahi.inc -FILE_PR = "r7" +PR = "r7" # FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built FILES_avahi-discover = "" diff --git a/packages/avahi/avahi-ui_0.6.21.bb b/packages/avahi/avahi-ui_0.6.21.bb index 82f33b2ad8..28d4c07807 100644 --- a/packages/avahi/avahi-ui_0.6.21.bb +++ b/packages/avahi/avahi-ui_0.6.21.bb @@ -1,6 +1,6 @@ require avahi.inc -FILE_PR = "r7" +PR = "r7" DEPENDS += "avahi gtk+" diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb index f58923e862..6bc5a7055d 100644 --- a/packages/avahi/avahi_0.6.19.bb +++ b/packages/avahi/avahi_0.6.19.bb @@ -1,3 +1,3 @@ require avahi.inc -FILE_PR = "r9" +PR = "r9" diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb index f58923e862..6bc5a7055d 100644 --- a/packages/avahi/avahi_0.6.20.bb +++ b/packages/avahi/avahi_0.6.20.bb @@ -1,3 +1,3 @@ require avahi.inc -FILE_PR = "r9" +PR = "r9" diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb index 4c66a364bc..c6236ad6d1 100644 --- a/packages/avahi/avahi_0.6.21.bb +++ b/packages/avahi/avahi_0.6.21.bb @@ -1,6 +1,6 @@ require avahi.inc -FILE_PR = "r9" +PR = "r9" SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1" SRC_URI += "file://avr32-ipv6-fix.patch;patch=1" diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb index e70b8d4801..43c1b15843 100644 --- a/packages/avahi/avahi_0.6.22.bb +++ b/packages/avahi/avahi_0.6.22.bb @@ -1,6 +1,6 @@ require avahi.inc DEPENDS += "intltool-native" -FILE_PR = "r9" +PR = "r9" PACKAGES =+ "libavahi-gobject" diff --git a/packages/avahi/mango-lassi_git.bb b/packages/avahi/mango-lassi_git.bb index d55abe4ea7..c2250d8781 100644 --- a/packages/avahi/mango-lassi_git.bb +++ b/packages/avahi/mango-lassi_git.bb @@ -3,7 +3,7 @@ DEPENDS = "avahi-ui libglade libnotify" SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93" PV = "0.0+${PR}+gitr${SRCREV}" -FILE_PR = "r1" +PR = "r1" SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http" |