Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=c3e401376b4d5e7a2e297b098bbbb58feef51237
commit c3e401376b4d5e7a2e297b098bbbb58feef51237 Merge: c999137 71655c6 Author: bouleetbil <[email protected]> Date: Fri Nov 4 18:13:49 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/x11/pixman/FrugalBuild source/x11/xf86-input-synaptics/FrugalBuild source/x11/xorg-server/FrugalBuild diff --cc source/x11/xf86-input-synaptics/FrugalBuild index 31b164c,d66ef0b..441e402 --- a/source/x11/xf86-input-synaptics/FrugalBuild +++ b/source/x11/xf86-input-synaptics/FrugalBuild @@@ -4,15 -4,14 +4,15 @@@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=xf86-input-synaptics -pkgver=1.4.1 +pkgver=1.5.0 Fuse $USE_DEVEL && pkgver=1.1.99.31.gc9527bdc Finclude xorg - pkgrel=1 ++pkgrel=2 replaces=('synaptics') _F_cd_path="$pkgname-$pkgver" - source=($source README.Frugalware) - sha1sums=('7373c1e3f02bf7e18f71b65762a982d907b4a053' \ - 'fcc70fb810074bfdc9a89cc1211fc8d75c1c964b') + source=($source 20-synaptics.conf) -sha1sums=('e41201476f4bc8658291808d2d6ef2e0535179ae' \ ++sha1sums=('7373c1e3f02bf7e18f71b65762a982d907b4a053' + '6ef139705d61c570172873ac3cfe35c90485d554') if Fuse $USE_DEVEL; then unset source sha1sums _F_scm_type="git" diff --cc source/x11/xorg-server/FrugalBuild index 6f45874,87d9abe..ca9275a --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@@ -8,8 -8,8 +8,8 @@@ USE_UDEV=${USE_UDEV:-"y" USE_SERVERDMX=${USE_SERVERDMX:-"y"} pkgname=xorg-server -pkgver=1.10.4 +pkgver=1.11.1 - pkgrel=1 + pkgrel=3 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') archs=('i686' 'x86_64' 'ppc' 'arm') @@@ -31,11 -31,10 +31,10 @@@ provides=('xorg-server-smi' 'xorg-serve replaces=('xorg-server-smi' 'xorg-server-vesa' 'xorg-server-via' 'lbxproxy' 'proxymngr' \ 'liblbxutil' 'xgl' 'xorg-server-sdl') - backup=('etc/sysconfig/desktop' 'etc/X11/xorg.conf.d/10-evdev.conf' \ - 'etc/X11/xorg.conf.d/20-synaptics.conf') + backup=('etc/sysconfig/desktop' 'etc/X11/xorg.conf.d/10-evdev.conf') _F_archive_grepv="99" Finclude xorg -sha1sums=('857d6377025c77851a3cc5f8ec2ce84164a2fdc6') +sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd') if Fuse $USE_DEVEL; then pkgver=1.6.3.901.151.g120286a _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
