[oe-commits] Martin Jansa : xserver-xorg: move PE to xserver-xorg-common and bump it

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: c38cb00a359a0015bc485edf9632efe295c58533
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c38cb00a359a0015bc485edf9632efe295c58533

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Oct 13 10:54:42 2011 +0200

xserver-xorg: move PE to xserver-xorg-common and bump it

* to provide upgrade path for meta-oe users, where it had PE = 2 already

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xorg-xserver/xserver-xorg-common.inc           |    2 ++
 .../xorg-xserver/xserver-xorg_1.11.1.bb            |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index a8c7b0a..2559397 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -12,6 +12,8 @@ PROVIDES = "virtual/xserver-xf86"
 # Other packages tend to just care that there is *an* X server:
 PROVIDES += "virtual/xserver"
 
+PE = "2"
+
 XORG_PN = "xorg-server"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 SRC_URI += "file://macro_tweak.patch"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
index 8e97888..0f94fe2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
@@ -1,4 +1,2 @@
 require xserver-xorg.inc
 require xserver-xorg-${PV}.inc
-
-PE = "1"