[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2012-03-07 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=338b6b07ac1713a93d0513d0818d864abda17105

commit 338b6b07ac1713a93d0513d0818d864abda17105
Merge: 7eaeb97 9141e7a
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed Mar 7 09:05:25 2012 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2012-02-07 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=17ec1b65d04b39e79c6c97147c9935745cbf8e1a

commit 17ec1b65d04b39e79c6c97147c9935745cbf8e1a
Merge: 890cf0d 98799f9
Author: bouleetbil bouleet...@frogdev.info
Date:   Tue Feb 7 10:44:18 2012 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2012-01-11 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=d851d1c129aa2274c9db8b4d5e16aa2118ba4964

commit d851d1c129aa2274c9db8b4d5e16aa2118ba4964
Merge: a9a7476 987a0fb
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed Jan 11 11:02:19 2012 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-12-04 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=a7edce1d12888f552a4fd3fbd9c496fd7185cdda

commit a7edce1d12888f552a4fd3fbd9c496fd7185cdda
Merge: 46b8afc 42d1dde
Author: bouleetbil bouleet...@frogdev.info
Date:   Sun Dec 4 13:48:13 2011 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-12-01 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=bb5b2554648b988906cd77fb9ae7bee80c19baec

commit bb5b2554648b988906cd77fb9ae7bee80c19baec
Merge: a4e8a4e bc0805e
Author: bouleetbil bouleet...@frogdev.info
Date:   Thu Dec 1 14:38:31 2011 +0100

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

Conflicts:
source/x11-extra/nvidia/FrugalBuild
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-11-30 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=414416f566b0e1055695a9a326ca3f442fedfc02

commit 414416f566b0e1055695a9a326ca3f442fedfc02
Merge: 046094d 7ee5727
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed Nov 30 21:03:03 2011 +0100

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

Conflicts:
source/x11-extra/nvidia/FrugalBuild
source/x11/xf86-input-synaptics/FrugalBuild
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-11-04 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=c3e401376b4d5e7a2e297b09858feef51237

commit c3e401376b4d5e7a2e297b09858feef51237
Merge: c999137 71655c6
Author: bouleetbil bouleet...@frogdev.info
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
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-08-26 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=535df043e7e4c45690629e66b89f73555a801215

commit 535df043e7e4c45690629e66b89f73555a801215
Merge: 79a5fc6 7a84c20
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri Aug 26 10:47:08 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-07-15 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=1b3748df8ef3eca0881104e622b48d5276ddc332

commit 1b3748df8ef3eca0881104e622b48d5276ddc332
Merge: f05f26c 7a593d0
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri Jul 15 13:36:52 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-07-08 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=645f91754bfa58737336762e245177c6d1802a11

commit 645f91754bfa58737336762e245177c6d1802a11
Merge: 4406599 8598aaa
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed Jul 6 22:31:18 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-07-06 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=645f91754bfa58737336762e245177c6d1802a11

commit 645f91754bfa58737336762e245177c6d1802a11
Merge: 4406599 8598aaa
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed Jul 6 22:31:18 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-05-31 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=d2785990d99cf1d647ed50b6cdd8a13515728528

commit d2785990d99cf1d647ed50b6cdd8a13515728528
Merge: 4154443 8276f3f
Author: bouleetbil bouleet...@frogdev.info
Date:   Tue May 31 10:39:55 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-05-11 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=0597b2006646d9c4763ee8f8b7df32ac0140d939

commit 0597b2006646d9c4763ee8f8b7df32ac0140d939
Merge: 4032cc1 97428ad
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed May 11 20:45:18 2011 +0200

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

Conflicts:
source/gnome/eog/FrugalBuild

diff --cc source/gnome/eog/FrugalBuild
index 238cdf4,8b8a2e3..d6204f2
--- a/source/gnome/eog/FrugalBuild
+++ b/source/gnome/eog/FrugalBuild
@@@ -3,11 -3,11 +3,11 @@@
# Contributor: Christian Hamar alias krix kr...@linuxforum.hu

pkgname=eog
- pkgver=3.1.1
+ pkgver=3.0.1
-pkgrel=1
+pkgrel=2
pkgdesc=An image viewing and cataloging program for GNOME
depends=('libxml2=2.7.8' 'libexif' 'rarian' 'desktop-file-utils' 'python=2.7' 
\
-'gnome-desktop=3.0.1' 'lcms2' 'libart_lgpl' 'libpeas-gtk')
+'gnome-desktop=3.0.1' 'lcms' 'libart_lgpl' 'libpeas-gtk')
makedepends=('intltool' 'gnome-doc-utils=0.16.0')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-05-10 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=4032cc1ad4a01fcb92187b2022ddcc8e87e7b852

commit 4032cc1ad4a01fcb92187b2022ddcc8e87e7b852
Merge: 17a8cd0 391c32a
Author: bouleetbil bouleet...@frogdev.info
Date:   Tue May 10 23:28:04 2011 +0200

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

Conflicts:
source/gnome/eog/FrugalBuild
source/xfce4/xfce4-session/FrugalBuild

diff --cc source/gnome/eog/FrugalBuild
index b94bef9,2967f77..238cdf4
--- a/source/gnome/eog/FrugalBuild
+++ b/source/gnome/eog/FrugalBuild
@@@ -3,11 -3,11 +3,11 @@@
# Contributor: Christian Hamar alias krix kr...@linuxforum.hu

pkgname=eog
- pkgver=3.0.1
+ pkgver=3.1.1
-pkgrel=1
+pkgrel=2
pkgdesc=An image viewing and cataloging program for GNOME
depends=('libxml2=2.7.8' 'libexif' 'rarian' 'desktop-file-utils' 'python=2.7' 
\
-'gnome-desktop=3.0.1-2' 'lcms' 'libart_lgpl' 'libpeas-gtk')
+'gnome-desktop=3.0.1' 'lcms2' 'libart_lgpl' 'libpeas-gtk')
makedepends=('intltool' 'gnome-doc-utils=0.16.0')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
diff --cc source/xfce4/xfce4-session/FrugalBuild
index 2ee1ca4,a72eb40..de5772b
--- a/source/xfce4/xfce4-session/FrugalBuild
+++ b/source/xfce4/xfce4-session/FrugalBuild
@@@ -3,7 -3,7 +3,7 @@@

pkgname=xfce4-session
pkgver=4.8.1
--pkgrel=2
++pkgrel=3
pkgdesc=A session manager for Xfce4.
url=http://www.xfce.org/;
depends=('libsm=1.1.0' 'libxfce4ui=4.8.0' 'libxfce4util=4.8.1' 
'xfce4-panel=4.8.0' \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-05-07 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=17a8cd0beb47ce57868e92d8920cbb07fa8e91fa

commit 17a8cd0beb47ce57868e92d8920cbb07fa8e91fa
Merge: 1123d13 35a23af
Author: bouleetbil bouleet...@frogdev.info
Date:   Sat May 7 14:55:06 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-05-06 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=3ffa9924dd0005a63ec8f434f14895ff3bbc5a7d

commit 3ffa9924dd0005a63ec8f434f14895ff3bbc5a7d
Merge: 4c6211d cc3af42
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri May 6 13:05:17 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-05-06 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=559837f9955e450103fa0825cb0f924d63a68d10

commit 559837f9955e450103fa0825cb0f924d63a68d10
Merge: d4e7208 3039dd3
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri May 6 21:11:08 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-05-06 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=47e8edd909374e2511885e1a38b62a22074dc293

commit 47e8edd909374e2511885e1a38b62a22074dc293
Merge: 2f09310 1d46051
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri May 6 22:44:52 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-04-23 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=30563d387d6c48a01b386f5a99133f660bd40029

commit 30563d387d6c48a01b386f5a99133f660bd40029
Merge: 187d68d caa8960
Author: bouleetbil bouleet...@frogdev.info
Date:   Sat Apr 23 16:15:28 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-04-17 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=34a005ae799c13d47575414e7bd1aefabee296e9

commit 34a005ae799c13d47575414e7bd1aefabee296e9
Merge: 3f14352 e825b12
Author: bouleetbil bouleet...@frogdev.info
Date:   Sun Apr 17 19:32:05 2011 +0200

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

Conflicts:
source/x11/libxfixes/FrugalBuild
source/x11/libxt/FrugalBuild
source/x11/mesa/FrugalBuild
source/x11/xkbcomp/FrugalBuild
source/x11/xterm/FrugalBuild

diff --cc source/x11/libdrm/FrugalBuild
index 2d48903,d1c4dc3..d2f78fe
--- a/source/x11/libdrm/FrugalBuild
+++ b/source/x11/libdrm/FrugalBuild
@@@ -9,10 -9,10 +9,10 @@@ pkgrel=
pkgdesc=X.Org Userspace interface to kernel DRM services
url=http://xorg.freedesktop.org/;
depends=('libpthread-stubs' 'udev')
- archs=('i686' 'x86_64' 'ppc')
+ archs=('i686' 'x86_64' 'ppc' 'arm')
groups=('x11' 'xorg-core' 'xorg-libs')
if Fuse $USE_DEVEL; then
-   pkgver=$pkgver.g2d9990c
+   pkgver=$pkgver.gba11501
_F_scm_type=git
_F_scm_url=git://anongit.freedesktop.org/mesa/drm
Finclude scm
diff --cc source/x11/libxfixes/FrugalBuild
index 4b133f7,5c856bf..050379a
--- a/source/x11/libxfixes/FrugalBuild
+++ b/source/x11/libxfixes/FrugalBuild
@@@ -8,10 -8,10 +8,10 @@@ pkgrel=
pkgdesc=X.Org Xfixes library
url=http://xorg.freedesktop.org;
groups=('x11' 'xorg-core' 'xorg-libs')
- archs=('i686' 'x86_64' 'ppc')
+depends=('libx11=1.4.3' 'fixesproto=4.0' 'xproto=7.0.15' 'xextproto=7.0.5')
+ archs=('i686' 'x86_64' 'ppc' 'arm')
-depends=('libx11=1.3.4' 'fixesproto=4.0' 'xproto=7.0.15' 'xextproto=7.0.5')
makedepends=('pkgconfig' 'inputproto=1.5')
Finclude xorg
-sha1sums=('255dfb9a8c50d795c60711ec4764f76cd0620cbf')
+sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0')

# optimization OK
diff --cc source/x11/libxt/FrugalBuild
index f571a8c,41ad47a..4ee9369
--- a/source/x11/libxt/FrugalBuild
+++ b/source/x11/libxt/FrugalBuild
@@@ -8,8 -8,8 +8,8 @@@ pkgrel=
pkgdesc=X Toolkit Library
url=http://xorg.freedesktop.org;
groups=('x11' 'xorg-core' 'xorg-libs')
- archs=('i686' 'x86_64' 'ppc')
+depends=('libx11=1.3' 'libsm=1.1.0' 'xproto=7.0.21')
+ archs=('i686' 'x86_64' 'ppc' 'arm')
-depends=('libx11=1.3' 'libsm=1.1.0' 'xproto=7.0.15')
makedepends=('pkgconfig' 'inputproto=2.0')
_F_xorg_ind=1
Finclude xorg
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-01-12 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=5c2d4b7fc6a002b1922502fd3475d84fb10bb0c8

commit 5c2d4b7fc6a002b1922502fd3475d84fb10bb0c8
Merge: ad251ba 8a9fdee
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed Jan 12 17:39:54 2011 +

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2010-12-15 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=75855255a3e2bf2f474a7a6a08180d4851eed872

commit 75855255a3e2bf2f474a7a6a08180d4851eed872
Merge: 0688544 324bca9
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed Dec 15 18:26:11 2010 +

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2010-10-15 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=a91848e73e7d2cfc525d64d6315fd2d4f86a6716

commit a91848e73e7d2cfc525d64d6315fd2d4f86a6716
Merge: 522bcc3 8ec6c97
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri Oct 15 09:39:38 2010 +

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2010-06-06 Thread Miklos Vajna
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=73793e6a808fb9e5855f100cba652e3cf44ebd81

commit 73793e6a808fb9e5855f100cba652e3cf44ebd81
Merge: a13cce9 5f2b9a5
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sun Jun 6 13:08:44 2010 +0200

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current (61 commits)
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2010-01-28 Thread Miklos Vajna
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=3e7f31b1cf175c3ebf62e638ca0e543ca311a913

commit 3e7f31b1cf175c3ebf62e638ca0e543ca311a913
Merge: 4b5c887 e7125f2
Author: Miklos Vajna vmik...@frugalware.org
Date:   Fri Jan 29 03:38:47 2010 +0100

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (1164 
commits)

Conflicts:
source/apps/hal/FrugalBuild

diff --cc source/apps/hal/FrugalBuild
index 47ebba9,fc66aad..edb6703
--- a/source/apps/hal/FrugalBuild
+++ b/source/apps/hal/FrugalBuild
@@@ -3,8 -3,8 +3,8 @@@
# Contributor: Christian Hamar alias krix kr...@linuxforum.hu

pkgname=hal
- pkgver=0.5.11
- pkgrel=10
+ pkgver=0.5.14
-pkgrel=4
++pkgrel=5
pkgdesc=Hardware Abstraction Layer
url=http://www.freedesktop.org/wiki/Software/hal;
depends=('dbus-glib=0.74' 'udev=132' 'util-linux-ng=2.15' 'glib2' 'libcap' 
'dbus=1.2.12-4' \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2010-01-06 Thread Miklos Vajna
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=0eb90e39689049fa17306b9a8e91f00bc7d6c62d

commit 0eb90e39689049fa17306b9a8e91f00bc7d6c62d
Merge: 7146ad1 9ec1c59
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Jan 7 00:40:33 2010 +0100

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (561 
commits)

Conflicts:
source/lib-extra/flickcurl/FrugalBuild
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 eab7e69,9c8f949..1d28135
--- 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=5
+pkgver=173.14.22
- pkgrel=2
++pkgrel=3
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver=173.14.xx
Finclude nvidia
diff --cc source/x11-extra/nvidia-96xx/FrugalBuild
index dbaa331,0fe37d7..9513fd5
--- 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=5
+pkgver=96.43.14
- pkgrel=2
++pkgrel=3
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver=96.43.xx
Finclude nvidia
diff --cc source/x11-extra/nvidia/FrugalBuild
index 1395a6a,f1e4339..01a19c6
--- 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=6
+pkgver=190.42
- pkgrel=2
++pkgrel=3
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


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2009-12-13 Thread Miklos Vajna
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


[Frugalware-git] xorgtesting: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2009-10-19 Thread Miklos Vajna
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=52f6b182b3ec48d0905eab3b0b3597ce469dd9b0

commit 52f6b182b3ec48d0905eab3b0b3597ce469dd9b0
Merge: 656a5dd 3ea885a
Author: Miklos Vajna vmik...@frugalware.org
Date:   Mon Oct 19 22:06:24 2009 +0200

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (690 
commits)
gtk+2-2.18.3-1-i686
binutils-2.20-1-i686
pcmciautils-016-1-i686
...

Conflicts:
source/x11/mesa/FrugalBuild

diff --cc source/x11/mesa/FrugalBuild
index dbf209b,e247aa8..f836d17
--- a/source/x11/mesa/FrugalBuild
+++ b/source/x11/mesa/FrugalBuild
@@@ -4,8 -4,8 +4,8 @@@

pkgname=mesa
origname=Mesa
-pkgver=7.5.1
+pkgver=7.6
- pkgrel=1
+ pkgrel=2
pkgdesc=Mesa is a 3D graphics library
_F_sourceforge_dirname=mesa3d
_F_sourceforge_name=MesaLib
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git