Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=deb1f23330da65a6db184451c981fbf860d7ee74

commit deb1f23330da65a6db184451c981fbf860d7ee74
Merge: d5c3657 a7b9e29
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sun Dec 13 22:39:50 2009 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (1051 
commits)
php-5.3.1-2-i686
include/util.sh: use sed -i file instead of sed file > file
db4o-mono-6.1-1-i686
moserial-2.28.0-1-i686
openbox-3.4.8-1-i686
eog-plugins-2.28.1-1-i686
postr-0.12.4-1-i686
openvpn-2.1.1-1-i686
ssmtp-2.64-1-i686
perl-date-manip-6.05-1-i686
perl-svn-simple-0.28-1-i686
iptables-1.4.6-1-i686
lsscsi-0.23-1-i686
vsftpd-2.2.2-1-i686
glibc-2.11-1-i686
* remove jercel ... bye bye all
libssh-0.4.0-1-i686
linuxwacom-0.8.5_6-1-i686
sbcl-1.0.33-1-i686
xmix-2.1-5-i686
...

Conflicts:
source/x11-extra/nvidia-173xx/FrugalBuild
source/x11-extra/nvidia-96xx/FrugalBuild
source/x11-extra/nvidia/FrugalBuild

diff --cc source/x11-extra/nvidia-173xx/FrugalBuild
index 3073311,6390972..eab7e69
--- a/source/x11-extra/nvidia-173xx/FrugalBuild
+++ b/source/x11-extra/nvidia-173xx/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier <herm...@frugalware.org>

pkgname=nvidia-173xx
-pkgver=173.14.20
-pkgrel=4
+pkgver=173.14.22
- pkgrel=1
++pkgrel=2
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="173.14.xx"
Finclude nvidia
diff --cc source/x11-extra/nvidia-96xx/FrugalBuild
index 54c9a88,5dd8a56..dbaa331
--- a/source/x11-extra/nvidia-96xx/FrugalBuild
+++ b/source/x11-extra/nvidia-96xx/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier <herm...@frugalware.org>

pkgname=nvidia-96xx
-pkgver=96.43.13
-pkgrel=4
+pkgver=96.43.14
- pkgrel=1
++pkgrel=2
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="96.43.xx"
Finclude nvidia
diff --cc source/x11-extra/nvidia/FrugalBuild
index 6ee0b25,9b21d7b..1395a6a
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier <herm...@frugalware.org>

pkgname=nvidia
-pkgver=185.18.36
-pkgrel=5
+pkgver=190.42
- pkgrel=1
++pkgrel=2
archs=('i686' 'x86_64' '!ppc')
Finclude nvidia
case "$_F_nvidia_arch" in
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to