Merge branch '2.6' into 2.7

Conflicts:
	xorg-server/Pkgfile
This commit is contained in:
Tilman Sauerbeck 2010-07-07 19:27:34 +02:00
commit e4436cf7ef
4 changed files with 5 additions and 5 deletions

View File

@ -1 +1 @@
7c3b873692f4e93938261d774510e78d xorg-server-1.8.1.tar.bz2 c4156e3e71123a54413e629f4806fc71 xorg-server-1.8.2.tar.bz2

View File

@ -4,8 +4,8 @@
# Depends on: mesa3d, xorg-bdftopcf, xorg-mkfontdir, xorg-mkfontscale, xorg-xf86driproto, xorg-dri2proto, xorg-libxkbui, xorg-xcmiscproto, xorg-scrnsaverproto, xorg-bigreqsproto, xorg-libxtst, xorg-libdmx, xorg-libxxf86misc, xorg-libxaw, xorg-libxvmc, xorg-libxi, xorg-libxres, xorg-libxcomposite, xorg-libxinerama, xorg-libxrandr, xorg-libxft, xorg-libxcursor, xorg-libxxf86dga, xorg-libpixman, xorg-libpciaccess # Depends on: mesa3d, xorg-bdftopcf, xorg-mkfontdir, xorg-mkfontscale, xorg-xf86driproto, xorg-dri2proto, xorg-libxkbui, xorg-xcmiscproto, xorg-scrnsaverproto, xorg-bigreqsproto, xorg-libxtst, xorg-libdmx, xorg-libxxf86misc, xorg-libxaw, xorg-libxvmc, xorg-libxi, xorg-libxres, xorg-libxcomposite, xorg-libxinerama, xorg-libxrandr, xorg-libxft, xorg-libxcursor, xorg-libxxf86dga, xorg-libpixman, xorg-libpciaccess
name=xorg-server name=xorg-server
version=1.8.1 version=1.8.2
release=2 release=1
source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2) source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2)
build() { build() {

View File

@ -1 +1 @@
7b2642442091808002963920c7693aeb xf86-video-ati-6.13.0.tar.bz2 d65ae11cc66146c7006dbf5acebde413 xf86-video-ati-6.13.1.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: xorg-server # Depends on: xorg-server
name=xorg-xf86-video-ati name=xorg-xf86-video-ati
version=6.13.0 version=6.13.1
release=1 release=1
source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-$version.tar.bz2) source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-$version.tar.bz2)