Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/26 14:58:58+01:00 (none)!koen
preferred-gpe-versions.inc:
  use gpe-bluetooth 0.38

2005/02/26 13:42:15+00:00 (none)!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mebius.(none):/home/pb/oe/oe

2005/02/26 13:41:44+00:00 (none)!pb
update PV for x11_cvs, and remove redundant autofoo.patch

BKrev: 4221dab8p8a45qoaqMGSyniHb4QaSw

diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 9c31e13..dbcf9d5 100644 (file)
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -39,7 +39,7 @@ PREFERRED_VERSION_gpe-contacts = "0.35"
 PREFERRED_VERSION_gpe-today = "0.08"
 PREFERRED_VERSION_matchbox-panel-manager = "0.1"
 PREFERRED_VERSION_dbus = "0.23"
-#PREFERRED_VERSION_gpe-bluetooth = "0.37"
+PREFERRED_VERSION_gpe-bluetooth = "0.38"
 PREFERRED_VERSION_gpe-su = "0.18"
 PREFERRED_VERSION_gpe-conf = "0.1.22"
 PREFERRED_VERSION_gpe-clock = "0.20"

diff --git a/packages/x11/files/autofoo.patch b/packages/x11/files/autofoo.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb
index 90e0ed3..de62076 100644 (file)
--- a/packages/x11/x11_cvs.bb
+++ b/packages/x11/x11_cvs.bb
@@ -1,4 +1,4 @@
-PV = "0.0cvs${CVSDATE}"
+PV = "6.2.1+cvs${CVSDATE}"
 LICENSE = "XFree86"
 PR = "r2"
 SECTION = "x11/libs"
@@ -10,8 +10,7 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
 PROVIDES = "x11"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11 \
-          file://autofoo.patch;patch=1"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11"
 S = "${WORKDIR}/X11"
 
 inherit autotools pkgconfig