From 75adfed2b963ebf24a8ea7789b3a81c05e225fb3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 4 Nov 2010 08:36:47 +0100 Subject: xorg: upgrade libxi 1.3.2->1.4.0, xproto 7.0.18->7.0.19 Signed-off-by: Martin Jansa --- conf/distro/include/preferred-xorg-versions-live.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'conf/distro') diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index c38580e81e..54f7d4c602 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Mon Nov 1 07:54:05 CET 2010 +#Thu Nov 4 08:29:11 CET 2010 #app PREFERRED_VERSION_appres ?= "1.0.3" PREFERRED_VERSION_bdftopcf ?= "1.0.3" @@ -264,7 +264,7 @@ PREFERRED_VERSION_libxfont ?= "1.4.3" PREFERRED_VERSION_libxfont-native ?= "1.4.3" PREFERRED_VERSION_libxfontcache ?= "1.0.5" PREFERRED_VERSION_libxft ?= "2.2.0" -PREFERRED_VERSION_libxi ?= "1.3.2" +PREFERRED_VERSION_libxi ?= "1.4.0" PREFERRED_VERSION_libxinerama ?= "1.1.1" PREFERRED_VERSION_libxmu ?= "1.1.0" PREFERRED_VERSION_libxp ?= "1.0.0" @@ -340,8 +340,8 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" PREFERRED_VERSION_xineramaproto ?= "1.2" -PREFERRED_VERSION_xproto ?= "7.0.18" -PREFERRED_VERSION_xproto-native ?= "7.0.18" +PREFERRED_VERSION_xproto ?= "7.0.19" +PREFERRED_VERSION_xproto-native ?= "7.0.19" PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" #util PREFERRED_VERSION_gccmakedep ?= "1.0.2" -- cgit 1.2.3-korg From 96ca3fe593ec56b3e06b5ea36c0ee5fb8a6386d7 Mon Sep 17 00:00:00 2001 From: Alex Ferguson Date: Thu, 4 Nov 2010 19:25:09 +0200 Subject: jlime-2010.1.conf: Remove parted from DISTRO_EXTRA_RDEPENDS. parted is obsolete and takes up space, so we remove it. Signed-off-by: Alex Ferguson Signed-off-by: Kristoffer Ericson --- conf/distro/jlime-2010.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/distro') diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index 39b1a95335..9741026b98 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -24,7 +24,7 @@ OVERRIDES .= ":jlime" # What we want on the bootstrap image (extra) # DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \ - console-tools tslib-tests parted dialog" + console-tools tslib-tests dialog" # # Our Image files should look abit better. -- cgit 1.2.3-korg From 13a0c4a2f19a68436f9fa9a493968c4c4a72621d Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 10 Nov 2010 15:04:03 -0500 Subject: preferred-xorg-versions: use git release of xf86-input-mutouch The latest source release, 1.2.1, fails to build with X11R7.5. Signed-off-by: Michael Smith --- conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc | 2 +- conf/distro/include/preferred-xorg-versions-live.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf/distro') diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc index 634265e893..39cd4e6f58 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc @@ -78,7 +78,7 @@ PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0" PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0" PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0" -PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1+gitr%" PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0" PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 54f7d4c602..06662e371c 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -130,7 +130,7 @@ PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0" PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0" PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0" -PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1+gitr%" PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" PREFERRED_VERSION_xf86-input-penmount ?= "1.4.1" PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" -- cgit 1.2.3-korg