patch from pb_: remove extraneous "-cvs" specifiers from X packages

BKrev: 406ed1faFAUb0SoayvcaZbT-dd1tVQ

diff --git a/compositeext/compositeext-cvs.oe b/compositeext/compositeext-cvs.oe
index f55abf5..cf7a3cc 100644 (file)
--- a/compositeext/compositeext-cvs.oe
+++ b/compositeext/compositeext-cvs.oe
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xextensions-cvs fixesext"
+DEPENDS = "xextensions fixesext"
 PROVIDES = "compositeext"
 DESCRIPTION = "X Composite extension headers and specification"
 

diff --git a/damageext/damageext-cvs.oe b/damageext/damageext-cvs.oe
index 9c58341..4212d24 100644 (file)
--- a/damageext/damageext-cvs.oe
+++ b/damageext/damageext-cvs.oe
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xextensions-cvs fixesext-cvs"
+DEPENDS = "xextensions fixesext"
 PROVIDES = "damageext"
 DESCRIPTION = "X Damage extension headers and specification"
 

diff --git a/fixesext/fixesext-cvs.oe b/fixesext/fixesext-cvs.oe
index 1c5e47f..b96f9b8 100644 (file)
--- a/fixesext/fixesext-cvs.oe
+++ b/fixesext/fixesext-cvs.oe
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xextensions-cvs"
+DEPENDS = "xextensions"
 PROVIDES = "fixesext"
 DESCRIPTION = "X Fixes extension headers and specification."
 

diff --git a/resourceext/resourceext-cvs.oe b/resourceext/resourceext-cvs.oe
index ac6c423..78cb70e 100644 (file)
--- a/resourceext/resourceext-cvs.oe
+++ b/resourceext/resourceext-cvs.oe
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xextensions-cvs"
+DEPENDS = "xextensions"
 PROVIDES = "resourceext"
 DESCRIPTION = "X Resource usage extension headers"
 

diff --git a/xcomposite/xcomposite-cvs.oe b/xcomposite/xcomposite-cvs.oe
index 21b7358..f533dcc 100644 (file)
--- a/xcomposite/xcomposite-cvs.oe
+++ b/xcomposite/xcomposite-cvs.oe
@@ -1,6 +1,6 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
-DEPENDS = "virtual/libc x11-cvs compositeext-cvs xextensions-cvs fixesext-cvs xfixes-cvs"
+DEPENDS = "virtual/libc x11 compositeext xextensions fixesext xfixes"
 PROVIDES = "xcomposite"
 DESCRIPTION = "X Composite extension library."
 

diff --git a/xdamage/xdamage-cvs.oe b/xdamage/xdamage-cvs.oe
index 83ef740..6ecce41 100644 (file)
--- a/xdamage/xdamage-cvs.oe
+++ b/xdamage/xdamage-cvs.oe
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 #DEPENDS=virtual/libc x11-cvs damageext-cvs xextensions-cvs fixesext-cvs xfixes-cvs
-DEPENDS = "virtual/libc x11-cvs damageext-cvs xfixes-cvs xproto-cvs"
+DEPENDS = "virtual/libc x11 damageext xfixes xproto"
 PROVIDES = "xdamage"
 DESCRIPTION = "X Damage extension library."
 

diff --git a/xdmcp/xdmcp-cvs.oe b/xdmcp/xdmcp-cvs.oe
index 5798bf4..18b6d57 100644 (file)
--- a/xdmcp/xdmcp-cvs.oe
+++ b/xdmcp/xdmcp-cvs.oe
@@ -2,7 +2,7 @@ PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "virtual/libc xproto-cvs"
+DEPENDS = "virtual/libc xproto"
 PROVIDES = "xdmcp"
 DESCRIPTION = "X Display Manager Control Protocol library."
 

diff --git a/xfixes/xfixes-cvs.oe b/xfixes/xfixes-cvs.oe
index 4f7821a..d4e32d9 100644 (file)
--- a/xfixes/xfixes-cvs.oe
+++ b/xfixes/xfixes-cvs.oe
@@ -1,6 +1,6 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
-DEPENDS = "virtual/libc x11-cvs fixesext-cvs"
+DEPENDS = "virtual/libc x11 fixesext"
 PROVIDES = "xfixes"
 DESCRIPTION = "X Fixes extension library."
 

diff --git a/xfont/xfont-cvs.oe b/xfont/xfont-cvs.oe
index 63421d8..151dfe1 100644 (file)
--- a/xfont/xfont-cvs.oe
+++ b/xfont/xfont-cvs.oe
@@ -2,7 +2,7 @@ PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "virtual/libc xproto-cvs xtrans-cvs zlib"
+DEPENDS = "virtual/libc xproto xtrans zlib"
 PROVIDES = "xfont"
 DESCRIPTION = "X font libary (used by the X server)."
 

diff --git a/xft/xft-cvs.oe b/xft/xft-cvs.oe
index b7d5882..2c7e450 100644 (file)
--- a/xft/xft-cvs.oe
+++ b/xft/xft-cvs.oe
@@ -1,6 +1,6 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
-DEPENDS = "virtual/libc x11-cvs xproto-cvs xrender-cvs freetype fontconfig"
+DEPENDS = "virtual/libc x11 xproto xrender freetype fontconfig"
 PROVIDES = "xft"
 DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
 

diff --git a/xi/xi-cvs.oe b/xi/xi-cvs.oe
index 206c623..e9da6fc 100644 (file)
--- a/xi/xi-cvs.oe
+++ b/xi/xi-cvs.oe
@@ -1,6 +1,6 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
-DEPENDS = "virtual/libc x11-cvs xextensions-cvs"
+DEPENDS = "virtual/libc x11 xextensions"
 PROVIDES = "xi"
 DESCRIPTION = "X Input extension library."
 

diff --git a/xpm/xpm-cvs.oe b/xpm/xpm-cvs.oe
index f4eeab4..047cd6e 100644 (file)
--- a/xpm/xpm-cvs.oe
+++ b/xpm/xpm-cvs.oe
@@ -2,7 +2,7 @@ PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "virtual/libc xproto-cvs x11-cvs"
+DEPENDS = "virtual/libc xproto x11"
 PROVIDES = "xpm"
 DESCRIPTION = "X Pixmap library."
 

diff --git a/xres/xres-cvs.oe b/xres/xres-cvs.oe
index b1591ce..dbab097 100644 (file)
--- a/xres/xres-cvs.oe
+++ b/xres/xres-cvs.oe
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "virtual/libc x11-cvs xextensions-cvs xext-cvs resourceext-cvs"
+DEPENDS = "virtual/libc x11 xextensions xext resourceext"
 PROVIDES = "xres"
 DESCRIPTION = "X Resource usage library."