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/openmoko-base | |
| 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/openmoko-base')
8 files changed, 8 insertions, 8 deletions
diff --git a/packages/openmoko-base/openmoko-common_svn.bb b/packages/openmoko-base/openmoko-common_svn.bb index acbe600350..dc5d24abe1 100644 --- a/packages/openmoko-base/openmoko-common_svn.bb +++ b/packages/openmoko-base/openmoko-common_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Common files for the Openmoko distribution" SECTION = "openmoko/base" PV = "0.0+svnr${SRCREV}" -FILE_PR = "r1" +PR = "r1" inherit openmoko-base diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb index ced703a2cc..0961d74162 100644 --- a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko distribution" SECTION = "openmoko/base" PV = "0.1+svnr${SRCREV}" -FILE_PR = "r1" +PR = "r1" inherit openmoko-base autotools diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index ff8f3e3e53..20b05efb0b 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -3,7 +3,7 @@ SECTION = "openmoko/libs" LICENSE = "LGPL" DEPENDS += "gtk+ eds-dbus libgsmd libxosd" PV = "0.4+svnr${SRCREV}" -FILE_PR = "r0" +PR = "r0" inherit openmoko diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index cf25a2bb8f..1baa1d68b0 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for Openmoko" SECTION = "openmoko/base" RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf" PV = "0.1+svnr${SRCREV}" -FILE_PR = "r0" +PR = "r0" inherit openmoko-base diff --git a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb index 9abb5be547..67fe16c858 100644 --- a/packages/openmoko-base/openmoko-sound-system_0.1.0.bb +++ b/packages/openmoko-base/openmoko-sound-system_0.1.0.bb @@ -10,7 +10,7 @@ RDEPENDS = "\ pulseaudio-module-native-protocol-unix \ pulseaudio-module-cli-protocol-unix \ " -FILE_PR = "r6" +PR = "r6" inherit openmoko-base update-rc.d diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb index 742bcdcb28..bb500dbeb5 100644 --- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard sound theme for the Openmoko distribution" SECTION = "openmoko/base" PV = "0.1+svnr${SRCREV}" -FILE_PR = "r2" +PR = "r2" inherit openmoko-base autotools diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb index 8b39ad3855..5cb7042c92 100644 --- a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution, qvga version" SECTION = "openmoko/base" PV = "0.0+svnr${SRCREV}" -FILE_PR = "r0" +PR = "r0" inherit openmoko-base diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb index ffcbf43cb7..e5e54934dc 100644 --- a/packages/openmoko-base/openmoko-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution" SECTION = "openmoko/base" PV = "0.0+svnr${SRCREV}" -FILE_PR = "r5" +PR = "r5" inherit openmoko-base |