[oe-commits] org.oe.dev merge of '2e6d644fadaae847990c7d7a30bff1ecfd9e4552'

[oe commit]

merge of '2e6d644fadaae847990c7d7a30bff1ecfd9e4552'
     and '476213006a461377315575c2cc2ff379fb8099f8'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: e522f57129d85a81fc9c728d6013973caeeffefc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e522f57129d85a81fc9c728d6013973caeeffefc
Files:
1
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb
packages/xorg-xserver/xserver-kdrive_1.1.0.bb
packages/xorg-xserver/xserver-kdrive_git.bb
packages/xorg-xserver/xserver-xorg_cvs.bb
packages/lighttpd/lighttpd_1.4.13.bb
packages/lighttpd/lighttpd_1.4.15.bb
packages/lighttpd/lighttpd_1.4.16.bb
Diffs:

#
# mt diff -r2e6d644fadaae847990c7d7a30bff1ecfd9e4552 -re522f57129d85a81fc9c728d6013973caeeffefc
#
# 
# 
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
#  from [9dccb60e157f1a3ff2540d6f5389735882719979]
#    to [6f46a29c5e12dd307e0dc9163fbbab191f87c59f]
# 
# patch "packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb"
#  from [241b9027f2a6f96e6a69654904f9c0a7d22e0f9c]
#    to [b63b5b5391f8da15b751eae497f5292846ae03e4]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.1.0.bb"
#  from [db186196fb8172f32d0a88226ae86df57177aa3e]
#    to [e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a]
# 
# patch "packages/xorg-xserver/xserver-kdrive_git.bb"
#  from [3d7bb560a68f622d8b4d89862f9c8e16a6ef9f54]
#    to [42b262dd40e9be4cfc18266789dfbcb89138c6e1]
# 
# patch "packages/xorg-xserver/xserver-xorg_cvs.bb"
#  from [af9ffc9b7af3ce03a695ee4eeb48ab88856bc5e1]
#    to [079dc4cc229cd16b1c45724bf99b6e23e440230a]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	9dccb60e157f1a3ff2540d6f5389735882719979
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb	6f46a29c5e12dd307e0dc9163fbbab191f87c59f
@@ -5,7 +5,6 @@ PROVIDES = "virtual/xserver"
 DEPENDS += "libxkbfile libxcalibrate"
 
 PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
 
 PE = "1"
 PR = "r0"
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb	241b9027f2a6f96e6a69654904f9c0a7d22e0f9c
+++ packages/xorg-xserver/xserver-kdrive-imageon_X11R7.1-1.1.0.bb	b63b5b5391f8da15b751eae497f5292846ae03e4
@@ -9,7 +9,6 @@ PROVIDES = "virtual/xserver"
 DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto"
 
 PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
 
 PR = "r3"
 
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.1.0.bb	db186196fb8172f32d0a88226ae86df57177aa3e
+++ packages/xorg-xserver/xserver-kdrive_1.1.0.bb	e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a
@@ -1,8 +1,7 @@ PROVIDES = "virtual/xserver"
 LICENSE = "MIT"
 DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto calibrateproto recordproto videoproto scrnsaverproto"
 
 PROVIDES = "virtual/xserver"
-# RPROVIDES = "virtual/xserver"
 PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr"
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
============================================================
--- packages/xorg-xserver/xserver-kdrive_git.bb	3d7bb560a68f622d8b4d89862f9c8e16a6ef9f54
+++ packages/xorg-xserver/xserver-kdrive_git.bb	42b262dd40e9be4cfc18266789dfbcb89138c6e1
@@ -5,7 +5,6 @@ PROVIDES = "virtual/xserver"
 DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto calibrateproto recordproto videoproto scrnsaverproto"
 
 PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
 PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
============================================================
--- packages/xorg-xserver/xserver-xorg_cvs.bb	af9ffc9b7af3ce03a695ee4eeb48ab88856bc5e1
+++ packages/xorg-xserver/xserver-xorg_cvs.bb	079dc4cc229cd16b1c45724bf99b6e23e440230a
@@ -1,6 +1,5 @@ LICENSE = "Xorg"
 SECTION = "x11/base"
 LICENSE = "Xorg"
-RPROVIDES = "virtual/xserver"
 PROVIDES = "virtual/xserver"
 PR = "r3"
 PV = "6.8.1+cvs${SRCDATE}"


#
# mt diff -r476213006a461377315575c2cc2ff379fb8099f8 -re522f57129d85a81fc9c728d6013973caeeffefc
#
# 
# 
# delete "packages/lighttpd/lighttpd_1.4.13.bb"
# 
# rename "packages/lighttpd/lighttpd_1.4.15.bb"
#     to "packages/lighttpd/lighttpd_1.4.16.bb"
# 
# patch "packages/lighttpd/lighttpd_1.4.16.bb"
#  from [80df13ced322353f2d1d271b79bba2e817effd2c]
#    to [430d84860a0bc15af2e58a72402d5c70f9277ee2]
# 
============================================================
--- packages/lighttpd/lighttpd_1.4.15.bb	80df13ced322353f2d1d271b79bba2e817effd2c
+++ packages/lighttpd/lighttpd_1.4.16.bb	430d84860a0bc15af2e58a72402d5c70f9277ee2
@@ -1,9 +1,9 @@ LICENSE = "BSD"
 DESCRIPTION = "Web server"
 SECTION = "net"
 LICENSE = "BSD"
-PR = "r1"
+DEPENDS = "libpcre"
 
-SRC_URI = "http://www.lighttpd.net/download/lighttpd-1.4.15.tar.gz \
+SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \
 	   file://configure.in.patch;patch=1 \
 	   file://src-server.c.patch;patch=1 \
 	   file://index.html \
@@ -14,7 +14,7 @@ EXTRA_OECONF="--without-bzip2 \
 		--without-ldap \
 		--without-lua \
 		--without-memcache \
-		--without-pcre \
+		--with-pcre \
 		--without-webdav-props \
 		--without-webdav-locks \
 		--without-openssl \