diff options
author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-27 14:35:36 +0000 |
---|---|---|
committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-27 14:35:36 +0000 |
commit | 67a10d3732e0aae5f5b6cb91caa89248fc8a06cb (patch) | |
tree | d29eb7a1708919984d31d189b207c14c056eac87 | |
parent | c87fbf2c39f4a73a0b55c4586bd6b11f466a3107 (diff) |
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
-rw-r--r-- | conf/distro/preferred-gpe-versions.inc | 2 | ||||
-rw-r--r-- | packages/x11/files/autofoo.patch | 0 | ||||
-rw-r--r-- | packages/x11/x11_cvs.bb | 5 |
3 files changed, 3 insertions, 4 deletions
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc index 9c31e13994..dbcf9d5104 100644 --- 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 index e69de29bb2..0000000000 --- a/packages/x11/files/autofoo.patch +++ /dev/null diff --git a/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb index 90e0ed318a..de62076710 100644 --- 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 |