diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
| commit | c326ad5a1960df22c5efd71bd815b9b12688556e (patch) | |
| tree | 09bd868c4446f3510a070ed601e7b67c6b791cde /recipes/xorg-lib | |
| parent | dd0fdfe9ed922189f4251c688b7a16faa76cd904 (diff) | |
| parent | 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/tgt/tgt_1.0.5.bb
Diffstat (limited to 'recipes/xorg-lib')
| -rw-r--r-- | recipes/xorg-lib/libx11_git.bb | 4 | ||||
| -rw-r--r-- | recipes/xorg-lib/libxscrnsaver_1.1.2.bb | 4 | ||||
| -rw-r--r-- | recipes/xorg-lib/libxscrnsaver_1.1.3.bb | 4 | ||||
| -rw-r--r-- | recipes/xorg-lib/libxscrnsaver_1.2.0.bb | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb index 05fc3e7795..9cd227b0bb 100644 --- a/recipes/xorg-lib/libx11_git.bb +++ b/recipes/xorg-lib/libx11_git.bb @@ -5,10 +5,10 @@ SECTION = "x11/libs" LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" PROVIDES = "virtual/libx11" -RPROVIDES = "virtual-libx11" +RPROVIDES_${PN} = "virtual-libx11" SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d" PV = "1.3.3+git" -PR = "r3" +PR = "r4" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb index 0b97380ab7..41c40339aa 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb @@ -4,8 +4,8 @@ DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" -RREPLACES = "libxss" -PR = "r1" +RREPLACES_${PN} = "libxss" +PR = "r2" PE = "1" XORG_PN = "libXScrnSaver" diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb index 442bb74334..f6f28925f7 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb @@ -4,8 +4,8 @@ DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" -RREPLACES = "libxss" -PR = "r1" +RREPLACES_${PN} = "libxss" +PR = "r2" PE = "1" XORG_PN = "libXScrnSaver" diff --git a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb index 47759c20ea..53fec81fd2 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb @@ -4,8 +4,8 @@ DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" -RREPLACES = "libxss" -PR = "r1" +RREPLACES_${PN} = "libxss" +PR = "r2" PE = "1" XORG_PN = "libXScrnSaver" |