From 719de6735f6d14ad05f231df900795bbb19a2810 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Jun 2010 15:58:51 +0200 Subject: recipes: conform to OE packaging guidelines with RSUGGESTS/RPROVIDES/RCONFLICTS/RREPLACES * even worse than last RDEPENDS/RRECOMMENDS change, because now ie: opkg info coreutils-doc Provides: textutils, shellutils, fileutils Replaces: textutils, shellutils, fileutils Signed-off-by: Martin Jansa Acked-by: Khem Raj Acked-by: Roman I Khimov --- recipes/xorg-lib/libx11_git.bb | 2 +- recipes/xorg-lib/libxscrnsaver_1.1.2.bb | 2 +- recipes/xorg-lib/libxscrnsaver_1.1.3.bb | 2 +- recipes/xorg-lib/libxscrnsaver_1.2.0.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes/xorg-lib') diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb index 05fc3e7795..240ec7edde 100644 --- a/recipes/xorg-lib/libx11_git.bb +++ b/recipes/xorg-lib/libx11_git.bb @@ -5,7 +5,7 @@ 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" diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb index 0b97380ab7..437105a235 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb @@ -4,7 +4,7 @@ DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" -RREPLACES = "libxss" +RREPLACES_${PN} = "libxss" PR = "r1" PE = "1" diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb index 442bb74334..e63c75e2cc 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb @@ -4,7 +4,7 @@ DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" -RREPLACES = "libxss" +RREPLACES_${PN} = "libxss" PR = "r1" PE = "1" diff --git a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb index 47759c20ea..11462e8cd5 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "X Screen Saver extension library" LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" -RREPLACES = "libxss" +RREPLACES_${PN} = "libxss" PR = "r1" PE = "1" -- cgit v1.2.3 From dce51c1b4ea37b62b953e1b719c8468e14d2f5ca Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Jun 2010 21:37:43 +0200 Subject: recipes: bump PR/INC_PR for packages changed in RDEPENDS/RRECOMMENDS/RSUGGESTS/RPROVIDES/RCONFLICTS/RREPLACES cleanup * only 769 from 1102 recipes were covered by automatic PR bump, list of remaining 333 recipes not using PR/INC_PR is available for manual PR add or INC_PR conversion - volunteers? http://build.shr-project.org/tests/jama/files.not.PR.bumped * just echo 'PR = "r1"' to recipes without any PR/INC_PR is not so good idea without manual check, because sometimes they rely on PR set in their .inc file and "r1" could make it go backwards Signed-off-by: Martin Jansa --- recipes/xorg-lib/libx11_git.bb | 2 +- recipes/xorg-lib/libxscrnsaver_1.1.2.bb | 2 +- recipes/xorg-lib/libxscrnsaver_1.1.3.bb | 2 +- recipes/xorg-lib/libxscrnsaver_1.2.0.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes/xorg-lib') diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb index 240ec7edde..9cd227b0bb 100644 --- a/recipes/xorg-lib/libx11_git.bb +++ b/recipes/xorg-lib/libx11_git.bb @@ -8,7 +8,7 @@ PROVIDES = "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 437105a235..41c40339aa 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" RREPLACES_${PN} = "libxss" -PR = "r1" +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 e63c75e2cc..f6f28925f7 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" RREPLACES_${PN} = "libxss" -PR = "r1" +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 11462e8cd5..53fec81fd2 100644 --- a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb +++ b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS += "libxext scrnsaverproto" PROVIDES = "libxss" RREPLACES_${PN} = "libxss" -PR = "r1" +PR = "r2" PE = "1" XORG_PN = "libXScrnSaver" -- cgit v1.2.3