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/xorg-util | |
| 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/xorg-util')
| -rw-r--r-- | packages/xorg-util/gccmakedep_1.0.2.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-util/imake_1.0.2.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-util/lndir_1.0.1.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-util/makedepend-native_1.0.1.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-util/makedepend_1.0.1.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-util/util-macros-native_1.1.5.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-util/util-macros_1.1.5.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-util/xorg-cf-files_1.0.2.bb | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/packages/xorg-util/gccmakedep_1.0.2.bb b/packages/xorg-util/gccmakedep_1.0.2.bb index b7c1f80d29..3abfa037a2 100644 --- a/packages/xorg-util/gccmakedep_1.0.2.bb +++ b/packages/xorg-util/gccmakedep_1.0.2.bb @@ -3,5 +3,5 @@ require xorg-util-common.inc DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" RDEPENDS = "gcc" -FILE_PR = "r2" +PR = "r2" PE = "1" diff --git a/packages/xorg-util/imake_1.0.2.bb b/packages/xorg-util/imake_1.0.2.bb index a835887f28..deeb4477a1 100644 --- a/packages/xorg-util/imake_1.0.2.bb +++ b/packages/xorg-util/imake_1.0.2.bb @@ -3,5 +3,5 @@ require xorg-util-common.inc DESCRIPTION = "C preprocessor interface to the make utility" RDEPENDS = "perl xproto" -FILE_PR = "r1" +PR = "r1" PE = "1" diff --git a/packages/xorg-util/lndir_1.0.1.bb b/packages/xorg-util/lndir_1.0.1.bb index 1ef4b2fa96..34309a6487 100644 --- a/packages/xorg-util/lndir_1.0.1.bb +++ b/packages/xorg-util/lndir_1.0.1.bb @@ -1,5 +1,5 @@ require xorg-util-common.inc DESCRIPTION = "create a shadow directory of symbolic links to another directory tree" -FILE_PR = "r1" +PR = "r1" PE = "1" diff --git a/packages/xorg-util/makedepend-native_1.0.1.bb b/packages/xorg-util/makedepend-native_1.0.1.bb index 2c9cad5945..9facfc69fa 100644 --- a/packages/xorg-util/makedepend-native_1.0.1.bb +++ b/packages/xorg-util/makedepend-native_1.0.1.bb @@ -3,7 +3,7 @@ inherit native DESCRIPTION = "create dependencies in makefiles" DEPENDS = "xproto-native util-macros-native" -FILE_PR = "r2" +PR = "r2" PE = "1" XORG_PN = "makedepend" diff --git a/packages/xorg-util/makedepend_1.0.1.bb b/packages/xorg-util/makedepend_1.0.1.bb index edef6a0208..e998bba1b0 100644 --- a/packages/xorg-util/makedepend_1.0.1.bb +++ b/packages/xorg-util/makedepend_1.0.1.bb @@ -2,5 +2,5 @@ require xorg-util-common.inc DESCRIPTION = "create dependencies in makefiles" DEPENDS = "xproto util-macros" -FILE_PR = "r2" +PR = "r2" PE = "1" diff --git a/packages/xorg-util/util-macros-native_1.1.5.bb b/packages/xorg-util/util-macros-native_1.1.5.bb index 21ff91569e..c327f3f54e 100644 --- a/packages/xorg-util/util-macros-native_1.1.5.bb +++ b/packages/xorg-util/util-macros-native_1.1.5.bb @@ -2,7 +2,7 @@ require util-macros_${PV}.bb inherit native -FILE_PR = "r1" +PR = "r1" XORG_PN = "util-macros" diff --git a/packages/xorg-util/util-macros_1.1.5.bb b/packages/xorg-util/util-macros_1.1.5.bb index 65fedf3516..22634bffd2 100644 --- a/packages/xorg-util/util-macros_1.1.5.bb +++ b/packages/xorg-util/util-macros_1.1.5.bb @@ -1,7 +1,7 @@ require xorg-util-common.inc DESCRIPTION = "X autotools macros" -FILE_PR = "r1" +PR = "r1" PE = "1" SRC_URI += "file://unbreak_cross_compile.patch;patch=1" diff --git a/packages/xorg-util/xorg-cf-files_1.0.2.bb b/packages/xorg-util/xorg-cf-files_1.0.2.bb index 0cfcf61a8b..7c3fb8d7e9 100644 --- a/packages/xorg-util/xorg-cf-files_1.0.2.bb +++ b/packages/xorg-util/xorg-cf-files_1.0.2.bb @@ -2,7 +2,7 @@ require xorg-util-common.inc DESCRIPTION = "X Window System CF files" -FILE_PR = "r1" +PR = "r1" PE = "1" FILES_${PN} += " /usr/lib/X11/config" |