[arch-commits] Commit in openoffice-base-beta/repos (3 files)

2009-12-07 Thread andyrtr
Date: Tuesday, December 8, 2009 @ 01:23:27
  Author: andyrtr
Revision: 60870

Merged revisions 60868 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-base-beta/trunk


  r60868 | andyrtr | 2009-12-08 05:54:31 + (Di, 08 Dez 2009) | 2 lines
  
  upgpkg: openoffice-base-beta 3.2.0_ooo320_m7-1
  new version 3.2.0_ooo320_m7


Modified:
  openoffice-base-beta/repos/extra-x86_64/  (properties)
  openoffice-base-beta/repos/extra-x86_64/ChangeLog
  openoffice-base-beta/repos/extra-x86_64/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)


Property changes on: openoffice-base-beta/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /openoffice-base-beta/trunk:1-59856
   + /openoffice-base-beta/trunk:1-60869

Modified: extra-x86_64/ChangeLog
===
--- extra-x86_64/ChangeLog  2009-12-08 05:55:22 UTC (rev 60869)
+++ extra-x86_64/ChangeLog  2009-12-08 06:23:27 UTC (rev 60870)
@@ -1,3 +1,8 @@
+2009-12-07 Andreas Radke 
+
+* 3.2.0-OOO320_m7-1 :
+   - new snapshot
+
 2009-11-27 Andreas Radke 
 
 * 3.2.0-OOO320_m6-1 :

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-08 05:55:22 UTC (rev 60869)
+++ extra-x86_64/PKGBUILD   2009-12-08 06:23:27 UTC (rev 60870)
@@ -4,7 +4,7 @@
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO320_m6
+_OO_milestone=OOO320_m7
 pkgver=3.2.0_${_OO_milestone/OOO/ooo} # m2=3.2.0 BETA
 pkgrel=1
 arch=('i686' 'x86_64')



[arch-commits] Commit in openoffice-base-beta/repos (3 files)

2009-12-07 Thread andyrtr
Date: Tuesday, December 8, 2009 @ 00:55:22
  Author: andyrtr
Revision: 60869

Merged revisions 60868 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-base-beta/trunk


  r60868 | andyrtr | 2009-12-08 05:54:31 + (Di, 08 Dez 2009) | 2 lines
  
  upgpkg: openoffice-base-beta 3.2.0_ooo320_m7-1
  new version 3.2.0_ooo320_m7


Modified:
  openoffice-base-beta/repos/extra-i686/(properties)
  openoffice-base-beta/repos/extra-i686/ChangeLog
  openoffice-base-beta/repos/extra-i686/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)


Property changes on: openoffice-base-beta/repos/extra-i686
___
Modified: svnmerge-integrated
   - /openoffice-base-beta/trunk:1-59855
   + /openoffice-base-beta/trunk:1-60868

Modified: extra-i686/ChangeLog
===
--- extra-i686/ChangeLog2009-12-08 05:54:31 UTC (rev 60868)
+++ extra-i686/ChangeLog2009-12-08 05:55:22 UTC (rev 60869)
@@ -1,3 +1,8 @@
+2009-12-07 Andreas Radke 
+
+* 3.2.0-OOO320_m7-1 :
+   - new snapshot
+
 2009-11-27 Andreas Radke 
 
 * 3.2.0-OOO320_m6-1 :

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-08 05:54:31 UTC (rev 60868)
+++ extra-i686/PKGBUILD 2009-12-08 05:55:22 UTC (rev 60869)
@@ -4,7 +4,7 @@
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO320_m6
+_OO_milestone=OOO320_m7
 pkgver=3.2.0_${_OO_milestone/OOO/ooo} # m2=3.2.0 BETA
 pkgrel=1
 arch=('i686' 'x86_64')



[arch-commits] Commit in openoffice-base-beta/trunk (ChangeLog PKGBUILD)

2009-12-07 Thread andyrtr
Date: Tuesday, December 8, 2009 @ 00:54:31
  Author: andyrtr
Revision: 60868

upgpkg: openoffice-base-beta 3.2.0_ooo320_m7-1
new version 3.2.0_ooo320_m7

Modified:
  openoffice-base-beta/trunk/ChangeLog
  openoffice-base-beta/trunk/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Modified: ChangeLog
===
--- ChangeLog   2009-12-08 02:01:22 UTC (rev 60867)
+++ ChangeLog   2009-12-08 05:54:31 UTC (rev 60868)
@@ -1,3 +1,8 @@
+2009-12-07 Andreas Radke 
+
+* 3.2.0-OOO320_m7-1 :
+   - new snapshot
+
 2009-11-27 Andreas Radke 
 
 * 3.2.0-OOO320_m6-1 :

Modified: PKGBUILD
===
--- PKGBUILD2009-12-08 02:01:22 UTC (rev 60867)
+++ PKGBUILD2009-12-08 05:54:31 UTC (rev 60868)
@@ -4,7 +4,7 @@
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO320_m6
+_OO_milestone=OOO320_m7
 pkgver=3.2.0_${_OO_milestone/OOO/ooo} # m2=3.2.0 BETA
 pkgrel=1
 arch=('i686' 'x86_64')



[arch-commits] Commit in gegl/trunk (PKGBUILD)

2009-12-07 Thread Eric Bélanger
Date: Monday, December 7, 2009 @ 21:01:22
  Author: eric
Revision: 60867

Added optdepends (close FS#17413)

Modified:
  gegl/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-08 01:58:33 UTC (rev 60866)
+++ PKGBUILD2009-12-08 02:01:22 UTC (rev 60867)
@@ -11,6 +11,7 @@
 license=('GPL3' 'LGPL3')
 depends=('babl>=0.1.0' 'libpng' 'libjpeg>=7' 'gtk2')
 makedepends=('ruby' 'openexr' 'ffmpeg' 'librsvg')
+optdepends=('openexr: for using the openexr plugin' 'ffmpeg: for using the 
ffmpeg plugin' 'librsvg: for using the svg plugin')
 options=('!libtool')
 
#source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
 )
 source=(ftp://ftp.archlinux.org/other/gegl/gegl-git.tar.bz2)



[arch-commits] Commit in xine-lib/trunk (PKGBUILD)

2009-12-07 Thread Eric Bélanger
Date: Monday, December 7, 2009 @ 20:58:33
  Author: eric
Revision: 60866

Added optdepends (close FS#17420)

Modified:
  xine-lib/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-08 00:07:30 UTC (rev 60865)
+++ PKGBUILD2009-12-08 01:58:33 UTC (rev 60866)
@@ -13,6 +13,7 @@
  'libxcb' 'wavpack' 'ffmpeg>=0.5' 'heimdal>=1.2.1' 'faad2>=2.7')
 makedepends=('pkgconfig' 'libtool' 'imagemagick' 'smbclient' 'mesa' 'alsa-lib' 
  'vcdimager' 'jack-audio-connection-kit')
+optdepends=('imagamagick: for using the imagemagick plugin' 'smbclient: for 
using the smb plugin' 'jack-audio-connection-kit: for using the jack plugin')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
 xine-lib-1.1.1-configure-no-mcpu-march.patch)



[arch-commits] Commit in mythweather/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Juergen Hoetzel
Date: Monday, December 7, 2009 @ 19:07:30
  Author: juergen
Revision: 60865

Merged revisions 60862 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mythweather/trunk


  r60862 | juergen | 2009-12-08 00:54:00 +0100 (Di, 08 Dez 2009) | 2 lines
  
  Fix FS#17432 (undefined symbol on load)


Modified:
  mythweather/repos/extra-x86_64/   (properties)
  mythweather/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Property changes on: mythweather/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /mythweather/trunk:1-60836
   + /mythweather/trunk:1-60864

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 23:55:29 UTC (rev 60864)
+++ extra-x86_64/PKGBUILD   2009-12-08 00:07:30 UTC (rev 60865)
@@ -4,7 +4,7 @@
 
 pkgname=mythweather
 pkgver=0.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Weather checking plugin for MythTV"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org";



[arch-commits] Commit in lyx/repos (testing-x86_64 testing-x86_64/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 18:55:29
  Author: giovanni
Revision: 60864

Merged revisions 60860 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/lyx/trunk


  r60860 | giovanni | 2009-12-07 15:51:20 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: lyx 1.6.5-1
  upstream release


Modified:
  lyx/repos/testing-x86_64/ (properties)
  lyx/repos/testing-x86_64/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)


Property changes on: lyx/repos/testing-x86_64
___
Modified: svnmerge-integrated
   - /lyx/trunk:1-60698
   + /lyx/trunk:1-60863

Modified: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2009-12-07 23:54:37 UTC (rev 60863)
+++ testing-x86_64/PKGBUILD 2009-12-07 23:55:29 UTC (rev 60864)
@@ -3,17 +3,17 @@
 # Contributor: Jason Chu 
 
 pkgname=lyx
-pkgver=1.6.4.2
-pkgrel=2
+pkgver=1.6.5
+pkgrel=1
 pkgdesc="An advanced open-source document processor."
-arch=(i686 x86_64)
-url='http://www.lyx.org'
+arch=('i686' 'x86_64')
+url="http://www.lyx.org";
 depends=('qt' 'texlive-core' 'python' 'perl' 'imagemagick' 'aspell' 
'aiksaurus' 'boost>=1.41.0')
 optdepends=('texlive-latex3: pdf export')
 license=('GPL')
 source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \
lyx.desktop)
-md5sums=('d1017f88e85b1ee21d24d99b1d49f308'
+md5sums=('35a10d8cb8e4bdd296092d9d981330c9'
  'c11db315dc99254a4118827f98922623')
 
 build() {



[arch-commits] Commit in mythweather/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Juergen Hoetzel
Date: Monday, December 7, 2009 @ 18:54:37
  Author: juergen
Revision: 60863

Merged revisions 60862 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mythweather/trunk


  r60862 | juergen | 2009-12-08 00:54:00 +0100 (Di, 08 Dez 2009) | 2 lines
  
  Fix FS#17432 (undefined symbol on load)


Modified:
  mythweather/repos/extra-i686/ (properties)
  mythweather/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Property changes on: mythweather/repos/extra-i686
___
Modified: svnmerge-integrated
   - /mythweather/trunk:1-60839
   + /mythweather/trunk:1-60862

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 23:54:00 UTC (rev 60862)
+++ extra-i686/PKGBUILD 2009-12-07 23:54:37 UTC (rev 60863)
@@ -4,7 +4,7 @@
 
 pkgname=mythweather
 pkgver=0.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Weather checking plugin for MythTV"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org";



[arch-commits] Commit in mythweather/trunk (PKGBUILD)

2009-12-07 Thread Juergen Hoetzel
Date: Monday, December 7, 2009 @ 18:54:00
  Author: juergen
Revision: 60862

Fix FS#17432 (undefined symbol on load)

Modified:
  mythweather/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 23:52:16 UTC (rev 60861)
+++ PKGBUILD2009-12-07 23:54:00 UTC (rev 60862)
@@ -4,7 +4,7 @@
 
 pkgname=mythweather
 pkgver=0.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Weather checking plugin for MythTV"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org";



[arch-commits] Commit in lyx/repos (testing-i686 testing-i686/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 18:52:16
  Author: giovanni
Revision: 60861

Merged revisions 60860 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/lyx/trunk


  r60860 | giovanni | 2009-12-07 15:51:20 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: lyx 1.6.5-1
  upstream release


Modified:
  lyx/repos/testing-i686/   (properties)
  lyx/repos/testing-i686/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)


Property changes on: lyx/repos/testing-i686
___
Modified: svnmerge-integrated
   - /lyx/trunk:1-60696
   + /lyx/trunk:1-60860

Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2009-12-07 23:51:20 UTC (rev 60860)
+++ testing-i686/PKGBUILD   2009-12-07 23:52:16 UTC (rev 60861)
@@ -3,17 +3,17 @@
 # Contributor: Jason Chu 
 
 pkgname=lyx
-pkgver=1.6.4.2
-pkgrel=2
+pkgver=1.6.5
+pkgrel=1
 pkgdesc="An advanced open-source document processor."
-arch=(i686 x86_64)
-url='http://www.lyx.org'
+arch=('i686' 'x86_64')
+url="http://www.lyx.org";
 depends=('qt' 'texlive-core' 'python' 'perl' 'imagemagick' 'aspell' 
'aiksaurus' 'boost>=1.41.0')
 optdepends=('texlive-latex3: pdf export')
 license=('GPL')
 source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \
lyx.desktop)
-md5sums=('d1017f88e85b1ee21d24d99b1d49f308'
+md5sums=('35a10d8cb8e4bdd296092d9d981330c9'
  'c11db315dc99254a4118827f98922623')
 
 build() {



[arch-commits] Commit in lyx/trunk (PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 18:51:20
  Author: giovanni
Revision: 60860

upgpkg: lyx 1.6.5-1
upstream release

Modified:
  lyx/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 19:07:37 UTC (rev 60859)
+++ PKGBUILD2009-12-07 23:51:20 UTC (rev 60860)
@@ -3,17 +3,17 @@
 # Contributor: Jason Chu 
 
 pkgname=lyx
-pkgver=1.6.4.2
-pkgrel=2
+pkgver=1.6.5
+pkgrel=1
 pkgdesc="An advanced open-source document processor."
-arch=(i686 x86_64)
-url='http://www.lyx.org'
+arch=('i686' 'x86_64')
+url="http://www.lyx.org";
 depends=('qt' 'texlive-core' 'python' 'perl' 'imagemagick' 'aspell' 
'aiksaurus' 'boost>=1.41.0')
 optdepends=('texlive-latex3: pdf export')
 license=('GPL')
 source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \
lyx.desktop)
-md5sums=('d1017f88e85b1ee21d24d99b1d49f308'
+md5sums=('35a10d8cb8e4bdd296092d9d981330c9'
  'c11db315dc99254a4118827f98922623')
 
 build() {



[arch-commits] Commit in telepathy-gabble/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 14:07:37
  Author: ibiru
Revision: 60859

Merged revisions 60857 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/telepathy-gabble/trunk


  r60857 | ibiru | 2009-12-07 21:05:59 +0200 (Mon, 07 Dec 2009) | 2 lines
  
  upgpkg: telepathy-gabble 0.8.9-1
  new ver


Modified:
  telepathy-gabble/repos/extra-x86_64/  (properties)
  telepathy-gabble/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Property changes on: telepathy-gabble/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /telepathy-gabble/trunk:1-58594
   + /telepathy-gabble/trunk:1-60858

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 19:06:44 UTC (rev 60858)
+++ extra-x86_64/PKGBUILD   2009-12-07 19:07:37 UTC (rev 60859)
@@ -3,7 +3,7 @@
 # Contributor: Daniel Balieiro 
 # Contributor: Rodrigo L. M. Flores 
 pkgname=telepathy-gabble
-pkgver=0.8.8
+pkgver=0.8.9
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64')
@@ -21,6 +21,6 @@
--libexecdir=/usr/lib/telepathy \
--enable-shave
   make || return 1
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install || return 1
 }
-md5sums=('1661fe3412552a30dc561e3094df545b')
+md5sums=('ddf89b1eea2f418a68b1013427eb0cb1')



[arch-commits] Commit in telepathy-gabble/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 14:06:44
  Author: ibiru
Revision: 60858

Merged revisions 60857 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/telepathy-gabble/trunk


  r60857 | ibiru | 2009-12-07 21:05:59 +0200 (Mon, 07 Dec 2009) | 2 lines
  
  upgpkg: telepathy-gabble 0.8.9-1
  new ver


Modified:
  telepathy-gabble/repos/extra-i686/(properties)
  telepathy-gabble/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Property changes on: telepathy-gabble/repos/extra-i686
___
Modified: svnmerge-integrated
   - /telepathy-gabble/trunk:1-58593
   + /telepathy-gabble/trunk:1-60857

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 19:05:59 UTC (rev 60857)
+++ extra-i686/PKGBUILD 2009-12-07 19:06:44 UTC (rev 60858)
@@ -3,7 +3,7 @@
 # Contributor: Daniel Balieiro 
 # Contributor: Rodrigo L. M. Flores 
 pkgname=telepathy-gabble
-pkgver=0.8.8
+pkgver=0.8.9
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64')
@@ -21,6 +21,6 @@
--libexecdir=/usr/lib/telepathy \
--enable-shave
   make || return 1
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install || return 1
 }
-md5sums=('1661fe3412552a30dc561e3094df545b')
+md5sums=('ddf89b1eea2f418a68b1013427eb0cb1')



[arch-commits] Commit in telepathy-gabble/trunk (PKGBUILD)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 14:05:59
  Author: ibiru
Revision: 60857

upgpkg: telepathy-gabble 0.8.9-1
new ver

Modified:
  telepathy-gabble/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 15:30:05 UTC (rev 60856)
+++ PKGBUILD2009-12-07 19:05:59 UTC (rev 60857)
@@ -3,7 +3,7 @@
 # Contributor: Daniel Balieiro 
 # Contributor: Rodrigo L. M. Flores 
 pkgname=telepathy-gabble
-pkgver=0.8.8
+pkgver=0.8.9
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64')
@@ -21,6 +21,6 @@
--libexecdir=/usr/lib/telepathy \
--enable-shave
   make || return 1
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install || return 1
 }
-md5sums=('1661fe3412552a30dc561e3094df545b')
+md5sums=('ddf89b1eea2f418a68b1013427eb0cb1')



[arch-commits] Commit in xorg-server/repos (10 files)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 10:30:05
  Author: ibiru
Revision: 60856

Merged revisions 60211,60217,60854 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk


  r60211 | jgc | 2009-12-02 12:00:06 +0200 (Wed, 02 Dec 2009) | 7 lines
  
  Disable record extension for now, it's broken anyways
  
  record: RECORD extension enabled at configure time.
  record: This extension is known to be broken, disabling extension now..
  record: http://bugs.freedesktop.org/show_bug.cgi?id=20500

  r60217 | jgc | 2009-12-02 13:52:45 +0200 (Wed, 02 Dec 2009) | 2 lines
  
  Disable config-dbus. It is not used by anything I know about, and upstream 
doesn't encourage users to use it. So far it was only enabled because we pull 
in the dbus dependency anyways.

  r60854 | jgc | 2009-12-07 15:16:53 +0200 (Mon, 07 Dec 2009) | 2 lines
  
  upgpkg: xorg-server 1.7.3-1
  Add upstream patches. Revert upstream commit that causes crashes on at 
least intel and ati/amd, reintroduce the fedora patches to fix issues with it


Added:
  xorg-server/repos/extra-i686/dix-fix-memleak.patch
(from rev 60854, xorg-server/trunk/dix-fix-memleak.patch)
  xorg-server/repos/extra-i686/dix-remove-core-devices-on-shutdown.patch
(from rev 60854, 
xorg-server/trunk/dix-remove-core-devices-on-shutdown.patch)
  xorg-server/repos/extra-i686/exa-fix-defragment.patch
(from rev 60854, xorg-server/trunk/exa-fix-defragment.patch)
  xorg-server/repos/extra-i686/exa-fix-mixed-pixmaps.patch
(from rev 60854, xorg-server/trunk/exa-fix-mixed-pixmaps.patch)
  xorg-server/repos/extra-i686/fix-repeat-events.patch
(from rev 60854, xorg-server/trunk/fix-repeat-events.patch)
  xorg-server/repos/extra-i686/revert-bug25136.patch
(from rev 60854, xorg-server/trunk/revert-bug25136.patch)
  xorg-server/repos/extra-i686/xv-fix-adjustframe-reputimage.patch
(from rev 60854, xorg-server/trunk/xv-fix-adjustframe-reputimage.patch)
Modified:
  xorg-server/repos/extra-i686/ (properties)
  xorg-server/repos/extra-i686/PKGBUILD
Deleted:
  xorg-server/repos/extra-i686/fix-abi-break.patch

---+
 PKGBUILD  |   96 +---
 dix-fix-memleak.patch |   33 ++
 dix-remove-core-devices-on-shutdown.patch |   31 ++
 exa-fix-defragment.patch  |   67 +
 exa-fix-mixed-pixmaps.patch   |   46 +++
 fix-abi-break.patch   |   85 ---
 fix-repeat-events.patch   |   26 ++
 revert-bug25136.patch |  331 
 xv-fix-adjustframe-reputimage.patch   |   38 +++
 9 files changed, 635 insertions(+), 118 deletions(-)


Property changes on: xorg-server/repos/extra-i686
___
Modified: svnmerge-integrated
   - /xorg-server/trunk:1-60007
   + /xorg-server/trunk:1-60855

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 13:17:10 UTC (rev 60855)
+++ extra-i686/PKGBUILD 2009-12-07 15:30:05 UTC (rev 60856)
@@ -2,14 +2,14 @@
 # Maintainer: Jan de Groot 
 
 pkgname=xorg-server
-pkgver=1.7.2
-pkgrel=2
+pkgver=1.7.3
+pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org";
 depends=('hal>=0.5.13' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 
'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.2' 'xcursor-themes>=1.0.2' 
'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 
'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0-1')
-makedepends=('libx11>=1.3' 'mesa>=7.6' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 
'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 
'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 
'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 
'xf86dgaproto>=2.1' 'recordproto>=1.14' 'libgl>=7.6' 'glproto>=1.4.10' 
'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2')
+makedepends=('libx11>=1.3' 'mesa>=7.6' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 
'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 
'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 
'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 
'xf86dgaproto>=2.1' 'libgl>=7.6' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 
'xineramaproto>=1.2')
 conflicts=('catalyst-utils<=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 
'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 
'xf86-input-elo2300'
'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 
'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb' 
'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 
'xf86-video-intel-legacy' 'nvidia-96xx-utils<96.43.14' 
'nvidia-173xx-utils<173.14.21')
 options=('!libtool')
@@ -18,18 +18,34 @@
 install=xorg

[arch-commits] Commit in xorg-server/repos (10 files)

2009-12-07 Thread Jan de Groot
Date: Monday, December 7, 2009 @ 08:17:10
  Author: jgc
Revision: 60855

Merged revisions 60211,60217,60854 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk


  r60211 | jgc | 2009-12-02 11:00:06 +0100 (Wed, 02 Dec 2009) | 7 lines
  
  Disable record extension for now, it's broken anyways
  
  record: RECORD extension enabled at configure time.
  record: This extension is known to be broken, disabling extension now..
  record: http://bugs.freedesktop.org/show_bug.cgi?id=20500

  r60217 | jgc | 2009-12-02 12:52:45 +0100 (Wed, 02 Dec 2009) | 2 lines
  
  Disable config-dbus. It is not used by anything I know about, and upstream 
doesn't encourage users to use it. So far it was only enabled because we pull 
in the dbus dependency anyways.

  r60854 | jgc | 2009-12-07 14:16:53 +0100 (Mon, 07 Dec 2009) | 2 lines
  
  upgpkg: xorg-server 1.7.3-1
  Add upstream patches. Revert upstream commit that causes crashes on at 
least intel and ati/amd, reintroduce the fedora patches to fix issues with it


Added:
  xorg-server/repos/extra-x86_64/dix-fix-memleak.patch
(from rev 60854, xorg-server/trunk/dix-fix-memleak.patch)
  xorg-server/repos/extra-x86_64/dix-remove-core-devices-on-shutdown.patch
(from rev 60854, 
xorg-server/trunk/dix-remove-core-devices-on-shutdown.patch)
  xorg-server/repos/extra-x86_64/exa-fix-defragment.patch
(from rev 60854, xorg-server/trunk/exa-fix-defragment.patch)
  xorg-server/repos/extra-x86_64/exa-fix-mixed-pixmaps.patch
(from rev 60854, xorg-server/trunk/exa-fix-mixed-pixmaps.patch)
  xorg-server/repos/extra-x86_64/fix-repeat-events.patch
(from rev 60854, xorg-server/trunk/fix-repeat-events.patch)
  xorg-server/repos/extra-x86_64/revert-bug25136.patch
(from rev 60854, xorg-server/trunk/revert-bug25136.patch)
  xorg-server/repos/extra-x86_64/xv-fix-adjustframe-reputimage.patch
(from rev 60854, xorg-server/trunk/xv-fix-adjustframe-reputimage.patch)
Modified:
  xorg-server/repos/extra-x86_64/   (properties)
  xorg-server/repos/extra-x86_64/PKGBUILD
Deleted:
  xorg-server/repos/extra-x86_64/fix-abi-break.patch

---+
 PKGBUILD  |   96 +---
 dix-fix-memleak.patch |   33 ++
 dix-remove-core-devices-on-shutdown.patch |   31 ++
 exa-fix-defragment.patch  |   67 +
 exa-fix-mixed-pixmaps.patch   |   46 +++
 fix-abi-break.patch   |   85 ---
 fix-repeat-events.patch   |   26 ++
 revert-bug25136.patch |  331 
 xv-fix-adjustframe-reputimage.patch   |   38 +++
 9 files changed, 635 insertions(+), 118 deletions(-)


Property changes on: xorg-server/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /xorg-server/trunk:1-60006
   + /xorg-server/trunk:1-60854

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 13:16:53 UTC (rev 60854)
+++ extra-x86_64/PKGBUILD   2009-12-07 13:17:10 UTC (rev 60855)
@@ -2,14 +2,14 @@
 # Maintainer: Jan de Groot 
 
 pkgname=xorg-server
-pkgver=1.7.2
-pkgrel=2
+pkgver=1.7.3
+pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org";
 depends=('hal>=0.5.13' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 
'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.2' 'xcursor-themes>=1.0.2' 
'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 
'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0-1')
-makedepends=('libx11>=1.3' 'mesa>=7.6' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 
'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 
'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 
'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 
'xf86dgaproto>=2.1' 'recordproto>=1.14' 'libgl>=7.6' 'glproto>=1.4.10' 
'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2')
+makedepends=('libx11>=1.3' 'mesa>=7.6' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 
'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 
'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 
'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 
'xf86dgaproto>=2.1' 'libgl>=7.6' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 
'xineramaproto>=1.2')
 conflicts=('catalyst-utils<=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 
'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 
'xf86-input-elo2300'
'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 
'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb' 
'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 
'xf86-video-intel-legacy' 'nvidia-96xx-utils<96.43.14' 
'nvidia-173xx-utils<173.14.21')
 options=('

[arch-commits] Commit in xorg-server/trunk (9 files)

2009-12-07 Thread Jan de Groot
Date: Monday, December 7, 2009 @ 08:16:53
  Author: jgc
Revision: 60854

upgpkg: xorg-server 1.7.3-1
Add upstream patches. Revert upstream commit that causes crashes on at 
least intel and ati/amd, reintroduce the fedora patches to fix issues with it

Added:
  xorg-server/trunk/dix-fix-memleak.patch
  xorg-server/trunk/dix-remove-core-devices-on-shutdown.patch
  xorg-server/trunk/exa-fix-defragment.patch
  xorg-server/trunk/exa-fix-mixed-pixmaps.patch
  xorg-server/trunk/fix-repeat-events.patch
  xorg-server/trunk/revert-bug25136.patch
  xorg-server/trunk/xv-fix-adjustframe-reputimage.patch
Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/fix-abi-break.patch

---+
 PKGBUILD  |   94 +--
 dix-fix-memleak.patch |   33 ++
 dix-remove-core-devices-on-shutdown.patch |   31 ++
 exa-fix-defragment.patch  |   67 +
 exa-fix-mixed-pixmaps.patch   |   46 +++
 fix-abi-break.patch   |   85 ---
 fix-repeat-events.patch   |   26 ++
 revert-bug25136.patch |  331 
 xv-fix-adjustframe-reputimage.patch   |   38 +++
 9 files changed, 634 insertions(+), 117 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 12:43:05 UTC (rev 60853)
+++ PKGBUILD2009-12-07 13:16:53 UTC (rev 60854)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot 
 
 pkgname=xorg-server
-pkgver=1.7.2
-pkgrel=2
+pkgver=1.7.3
+pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -18,18 +18,34 @@
 install=xorg-server.install
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
 xorg-redhat-die-ugly-pattern-die-die-die.patch
+xserver-1.7.1-window-pictures.patch
+xserver-1.7.1-nvidia-performance.patch
 xserver-1.7.1-libcrypto.patch
 xserver-1.7.1-sigaction.patch
 xserver-1.7.1-gamma-kdm-fix.patch
-fix-abi-break.patch
+exa-fix-mixed-pixmaps.patch
+exa-fix-defragment.patch
+fix-repeat-events.patch
+dix-remove-core-devices-on-shutdown.patch
+dix-fix-memleak.patch
+xv-fix-adjustframe-reputimage.patch
+revert-bug25136.patch
 xvfb-run
 xvfb-run.1)
-md5sums=('5c087e0f555203065fd90d02ef5f736e'
+md5sums=('4c63b22cad9ed8ae8b86561f0f92c327'
  '1a336eb22e27cbf443ec5a2ecddfa93c'
+ '01507da1a18737a3a9202fbd00213f4c'
+ 'd5c6e2de2e15bcff98d69f4772ee09ac'
  '957d429cad03ac87281b7e40d963497c'
  '9de9025a8c93b57188fce137b3262d1e'
  '8eae23916552e609c36ecae1827c2e9d'
- 'e7e2ed598b96b1bbaf926657db85967e'
+ 'ba5389a2b0ded91a7e48bd1cd1d16f54'
+ '33e209ebfd7ad1ad2489e96a58aa3e2c'
+ '2df6d883a22d1c9121618cb90347c21e'
+ '29ce13f606fb2de78e34d4317a9634ea'
+ 'aa67e7be85a86f922b5582c3bcdb8338'
+ '955240ad0a18d77ced04fa5d1514de9f'
+ 'e3b6a19dc7e708b10fac22180a4cb3d3'
  '52fd3effd80d7bc6c1660d4ecf23d31c'
  '376c70308715cd2643f7bff936d9934b')
 
@@ -38,6 +54,15 @@
   # Get rid of the ugly pattern
   patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" || 
return  1
 
+  # Revert upstream bug 25136: causes crashes on intel and ati hw
+  patch -Np1 -R -i "${srcdir}/revert-bug25136.patch" || return 1
+
+  # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-window-pictures.patch?view=log
+  patch -Np1 -i "${srcdir}/xserver-1.7.1-window-pictures.patch" || return 1
+ 
+  # http://lists.x.org/archives/xorg-devel/2009-November/003569.html
+  patch -Np1 -i "${srcdir}/xserver-1.7.1-nvidia-performance.patch" || return 1
+
   # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-libcrypto.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-libcrypto.patch" || return 1
 
@@ -47,8 +72,13 @@
   # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-gamma-kdm-fix.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-gamma-kdm-fix.patch" || return 1
 
-  # 
http://cgit.freedesktop.org/xorg/xserver/commit/?id=155e61a9f0429bf28ce493c0fe7a2d076cb7e137
-  patch -Np1 -i "${srcdir}/fix-abi-break.patch" || return 1
+  # Upstream patches from 1.7-nominations branch
+  patch -Np1 -i "${srcdir}/exa-fix-mixed-pixmaps.patch" || return 1
+  patch -Np1 -i "${srcdir}/exa-fix-defragment.patch" || return 1
+  patch -Np1 -i "${srcdir}/fix-repeat-events.patch" || return 1
+  patch -Np1 -i "${srcdir}/dix-remove-core-devices-on-shutdown.patch" || 
return 1
+  patch -Np1 -i "${srcdir}/dix-fix-memleak.patch" || return 1
+  patch -Np1 -i "${srcdir}/xv-fix-adjustframe-reputimage.patch" || return 1
 
   # Fix dbus config path
   sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
@@ -56,31 +86,31 @@
   autocon

[arch-commits] Commit in normalize/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 07:43:05
  Author: giovanni
Revision: 60853

Merged revisions 60851 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/normalize/trunk


  r60851 | giovanni | 2009-12-07 04:40:27 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: normalize 0.7.7-4
  Rebuilt against new version of mpg123 - soname bump


Modified:
  normalize/repos/extra-x86_64/ (properties)
  normalize/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)


Property changes on: normalize/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /normalize/trunk:1-6272
   + /normalize/trunk:1-60852

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 12:41:47 UTC (rev 60852)
+++ extra-x86_64/PKGBUILD   2009-12-07 12:43:05 UTC (rev 60853)
@@ -4,8 +4,8 @@
 
 pkgname=normalize
 pkgver=0.7.7
-pkgrel=3
-pkgdesc="normalize is a tool for adjusting the volume of WAV files to a 
standard level"
+pkgrel=4
+pkgdesc="A tool for adjusting the volume of WAV files to a standard level"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123')
@@ -14,12 +14,12 @@
 md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   ./configure --prefix=/usr \
   --mandir=/usr/share/man \
   --with-audiofile \
   --with-mad
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }
-



[arch-commits] Commit in normalize/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 07:41:47
  Author: giovanni
Revision: 60852

Merged revisions 60851 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/normalize/trunk


  r60851 | giovanni | 2009-12-07 04:40:27 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: normalize 0.7.7-4
  Rebuilt against new version of mpg123 - soname bump


Modified:
  normalize/repos/extra-i686/   (properties)
  normalize/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)


Property changes on: normalize/repos/extra-i686
___
Modified: svnmerge-integrated
   - /normalize/trunk:1-6104
   + /normalize/trunk:1-60851

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 12:40:27 UTC (rev 60851)
+++ extra-i686/PKGBUILD 2009-12-07 12:41:47 UTC (rev 60852)
@@ -4,8 +4,8 @@
 
 pkgname=normalize
 pkgver=0.7.7
-pkgrel=3
-pkgdesc="normalize is a tool for adjusting the volume of WAV files to a 
standard level"
+pkgrel=4
+pkgdesc="A tool for adjusting the volume of WAV files to a standard level"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123')
@@ -14,12 +14,12 @@
 md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   ./configure --prefix=/usr \
   --mandir=/usr/share/man \
   --with-audiofile \
   --with-mad
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }
-



[arch-commits] Commit in normalize/trunk (PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 07:40:27
  Author: giovanni
Revision: 60851

upgpkg: normalize 0.7.7-4
Rebuilt against new version of mpg123 - soname bump

Modified:
  normalize/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 12:36:05 UTC (rev 60850)
+++ PKGBUILD2009-12-07 12:40:27 UTC (rev 60851)
@@ -4,8 +4,8 @@
 
 pkgname=normalize
 pkgver=0.7.7
-pkgrel=3
-pkgdesc="normalize is a tool for adjusting the volume of WAV files to a 
standard level"
+pkgrel=4
+pkgdesc="A tool for adjusting the volume of WAV files to a standard level"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123')
@@ -14,12 +14,12 @@
 md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   ./configure --prefix=/usr \
   --mandir=/usr/share/man \
   --with-audiofile \
   --with-mad
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }
-



[arch-commits] Commit in gqmpeg/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 07:36:05
  Author: giovanni
Revision: 60850

Merged revisions 60848 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gqmpeg/trunk


  r60848 | giovanni | 2009-12-07 04:33:22 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: gqmpeg 0.91.1-3
  Rebuilt against new version of mpg123 - soname bump


Modified:
  gqmpeg/repos/extra-x86_64/(properties)
  gqmpeg/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: gqmpeg/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /gqmpeg/trunk:1-57071
   + /gqmpeg/trunk:1-60849

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 12:34:26 UTC (rev 60849)
+++ extra-x86_64/PKGBUILD   2009-12-07 12:36:05 UTC (rev 60850)
@@ -4,8 +4,8 @@
 
 pkgname=gqmpeg
 pkgver=0.91.1
-pkgrel=2
-pkgdesc="GQmpeg is a frontend to mpg123 with extensive themeability and 
playlist support"
+pkgrel=3
+pkgdesc="A frontend to mpg123 with extensive themeability and playlist support"
 arch=('i686' 'x86_64')
 url="http://gqmpeg.sourceforge.net/";
 license=('GPL2')



[arch-commits] Commit in gqmpeg/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 07:34:26
  Author: giovanni
Revision: 60849

Merged revisions 60848 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gqmpeg/trunk


  r60848 | giovanni | 2009-12-07 04:33:22 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: gqmpeg 0.91.1-3
  Rebuilt against new version of mpg123 - soname bump


Modified:
  gqmpeg/repos/extra-i686/  (properties)
  gqmpeg/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: gqmpeg/repos/extra-i686
___
Modified: svnmerge-integrated
   - /gqmpeg/trunk:1-57068
   + /gqmpeg/trunk:1-60848

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 12:33:22 UTC (rev 60848)
+++ extra-i686/PKGBUILD 2009-12-07 12:34:26 UTC (rev 60849)
@@ -4,8 +4,8 @@
 
 pkgname=gqmpeg
 pkgver=0.91.1
-pkgrel=2
-pkgdesc="GQmpeg is a frontend to mpg123 with extensive themeability and 
playlist support"
+pkgrel=3
+pkgdesc="A frontend to mpg123 with extensive themeability and playlist support"
 arch=('i686' 'x86_64')
 url="http://gqmpeg.sourceforge.net/";
 license=('GPL2')



[arch-commits] Commit in gqmpeg/trunk (PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 07:33:22
  Author: giovanni
Revision: 60848

upgpkg: gqmpeg 0.91.1-3
Rebuilt against new version of mpg123 - soname bump

Modified:
  gqmpeg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 12:25:58 UTC (rev 60847)
+++ PKGBUILD2009-12-07 12:33:22 UTC (rev 60848)
@@ -4,8 +4,8 @@
 
 pkgname=gqmpeg
 pkgver=0.91.1
-pkgrel=2
-pkgdesc="GQmpeg is a frontend to mpg123 with extensive themeability and 
playlist support"
+pkgrel=3
+pkgdesc="A frontend to mpg123 with extensive themeability and playlist support"
 arch=('i686' 'x86_64')
 url="http://gqmpeg.sourceforge.net/";
 license=('GPL2')



[arch-commits] Commit in mpg123/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 07:25:58
  Author: giovanni
Revision: 60847

Merged revisions 60845 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mpg123/trunk


  r60845 | giovanni | 2009-12-07 04:23:30 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: mpg123 1.10.0-1
  upstream release


Modified:
  mpg123/repos/extra-x86_64/(properties)
  mpg123/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)


Property changes on: mpg123/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /mpg123/trunk:1-59912
   + /mpg123/trunk:1-60846

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 12:24:24 UTC (rev 60846)
+++ extra-x86_64/PKGBUILD   2009-12-07 12:25:58 UTC (rev 60847)
@@ -3,7 +3,7 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=mpg123
-pkgver=1.9.2
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
@@ -16,14 +16,12 @@
 provides=('mpg321')
 replaces=('mpg321')
 options=('libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-mpg123-1.9.2-libtool.patch)
-md5sums=('5313b1bcc0274b4d7c394397c205bb20'
- '570ac56f363011237cc5b9ed8cbdcf9e')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0005c9a89c381484e2d2ff450b3dfe5e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/mpg123-1.9.2-libtool.patch || return 1
+
   ./configure --prefix=/usr \
   --with-audio="alsa esd sdl" || return 1
   make || return 1



[arch-commits] Commit in mpg123/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 07:24:24
  Author: giovanni
Revision: 60846

Merged revisions 60845 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mpg123/trunk


  r60845 | giovanni | 2009-12-07 04:23:30 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: mpg123 1.10.0-1
  upstream release


Modified:
  mpg123/repos/extra-i686/  (properties)
  mpg123/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)


Property changes on: mpg123/repos/extra-i686
___
Modified: svnmerge-integrated
   - /mpg123/trunk:1-59911
   + /mpg123/trunk:1-60845

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 12:23:30 UTC (rev 60845)
+++ extra-i686/PKGBUILD 2009-12-07 12:24:24 UTC (rev 60846)
@@ -3,7 +3,7 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=mpg123
-pkgver=1.9.2
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
@@ -16,14 +16,12 @@
 provides=('mpg321')
 replaces=('mpg321')
 options=('libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-mpg123-1.9.2-libtool.patch)
-md5sums=('5313b1bcc0274b4d7c394397c205bb20'
- '570ac56f363011237cc5b9ed8cbdcf9e')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0005c9a89c381484e2d2ff450b3dfe5e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/mpg123-1.9.2-libtool.patch || return 1
+
   ./configure --prefix=/usr \
   --with-audio="alsa esd sdl" || return 1
   make || return 1



[arch-commits] Commit in mpg123/trunk (PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 07:23:30
  Author: giovanni
Revision: 60845

upgpkg: mpg123 1.10.0-1
upstream release

Modified:
  mpg123/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 12:22:13 UTC (rev 60844)
+++ PKGBUILD2009-12-07 12:23:30 UTC (rev 60845)
@@ -3,7 +3,7 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=mpg123
-pkgver=1.9.2
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
@@ -16,14 +16,12 @@
 provides=('mpg321')
 replaces=('mpg321')
 options=('libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-mpg123-1.9.2-libtool.patch)
-md5sums=('5313b1bcc0274b4d7c394397c205bb20'
- '570ac56f363011237cc5b9ed8cbdcf9e')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0005c9a89c381484e2d2ff450b3dfe5e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/mpg123-1.9.2-libtool.patch || return 1
+
   ./configure --prefix=/usr \
   --with-audio="alsa esd sdl" || return 1
   make || return 1



[arch-commits] Commit in gajim/repos (4 files)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 07:22:13
  Author: ibiru
Revision: 60844

Merged revisions 60842 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gajim/trunk


  r60842 | ibiru | 2009-12-07 14:20:46 +0200 (Mon, 07 Dec 2009) | 2 lines
  
  upgpkg: gajim 0.13.1-2
  FS#17403 fix when using gnome-keyring


Added:
  gajim/repos/extra-x86_64/gnome-keyring-password-fix.patch
(from rev 60842, gajim/trunk/gnome-keyring-password-fix.patch)
Modified:
  gajim/repos/extra-x86_64/ (properties)
  gajim/repos/extra-x86_64/PKGBUILD
Deleted:
  gajim/repos/extra-x86_64/9283.diff

--+
 9283.diff|   11 ---
 PKGBUILD |   10 +++---
 gnome-keyring-password-fix.patch |   12 
 3 files changed, 19 insertions(+), 14 deletions(-)


Property changes on: gajim/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /gajim/trunk:1-59907
   + /gajim/trunk:1-60843

Deleted: extra-x86_64/9283.diff
===
--- extra-x86_64/9283.diff  2009-12-07 12:21:22 UTC (rev 60843)
+++ extra-x86_64/9283.diff  2009-12-07 12:22:13 UTC (rev 60844)
@@ -1,11 +0,0 @@
-Index: trunk/src/common/helpers.py
-===
 trunk/src/common/helpers.py (revision 9282)
-+++ trunk/src/common/helpers.py (revision 9283)
-@@ -794,5 +794,5 @@
- 
-   # our last chance, ask uname and strip it
--  uname_output = get_output_of_command('uname -a | cut -d" " 
-f1,3')
-+  uname_output = get_output_of_command('uname -sr')
-   if uname_output is not None:
-   return uname_output[0] # only first line

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 12:21:22 UTC (rev 60843)
+++ extra-x86_64/PKGBUILD   2009-12-07 12:22:13 UTC (rev 60844)
@@ -5,7 +5,7 @@
 
 pkgname=gajim
 pkgver=0.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Jabber client written in PyGTK"
 arch=(i686 x86_64)
 url="http://www.gajim.org/";
@@ -14,14 +14,18 @@
 makedepends=('gettext' 'intltool' 'dbus')
 optdepends=('dbus-python' 'pyopenssl')
 options=(!libtool)
-source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz)
+source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz
+   gnome-keyring-password-fix.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/gnome-keyring-password-fix.patch" || return 1
+
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   find "${pkgdir}/usr/share/gajim/" -name "*.pyo" | xargs rm -rf
 }
-sha256sums=('a2ed0383609a8423d65ab9f60e5e29bf5bf5eb9daeb69c70ba9d47f97a6cedbb')
+md5sums=('844752ab1b368b709b05572ad76fdc2d'
+ '55c6191e78bbe5f224cd7f941f4d1cf1')

Copied: gajim/repos/extra-x86_64/gnome-keyring-password-fix.patch (from rev 
60842, gajim/trunk/gnome-keyring-password-fix.patch)
===
--- extra-x86_64/gnome-keyring-password-fix.patch   
(rev 0)
+++ extra-x86_64/gnome-keyring-password-fix.patch   2009-12-07 12:22:13 UTC 
(rev 60844)
@@ -0,0 +1,12 @@
+diff -Nur gajim-0.13.1.old/src/common/passwords.py 
gajim-0.13.1/src/common/passwords.py
+--- gajim-0.13.1.old/src/common/passwords.py   2009-10-29 12:15:17.0 
+0200
 gajim-0.13.1/src/common/passwords.py   2009-12-07 13:59:42.179454769 
+0200
+@@ -122,6 +122,8 @@
+   user = gajim.config.get_per('accounts', account_name, 'name')
+   display_name = _('XMPP account %...@%s') % (user, server)
+   attributes1 = dict(server=str(server), user=str(user), 
protocol='xmpp')
++  if password is None:
++  password = str()
+   try:
+   auth_token = gnomekeyring.item_create_sync(
+   self.keyring, 
gnomekeyring.ITEM_NETWORK_PASSWORD,



[arch-commits] Commit in gajim/repos (4 files)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 07:21:22
  Author: ibiru
Revision: 60843

Merged revisions 60842 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gajim/trunk


  r60842 | ibiru | 2009-12-07 14:20:46 +0200 (Mon, 07 Dec 2009) | 2 lines
  
  upgpkg: gajim 0.13.1-2
  FS#17403 fix when using gnome-keyring


Added:
  gajim/repos/extra-i686/gnome-keyring-password-fix.patch
(from rev 60842, gajim/trunk/gnome-keyring-password-fix.patch)
Modified:
  gajim/repos/extra-i686/   (properties)
  gajim/repos/extra-i686/PKGBUILD
Deleted:
  gajim/repos/extra-i686/9283.diff

--+
 9283.diff|   11 ---
 PKGBUILD |   10 +++---
 gnome-keyring-password-fix.patch |   12 
 3 files changed, 19 insertions(+), 14 deletions(-)


Property changes on: gajim/repos/extra-i686
___
Modified: svnmerge-integrated
   - /gajim/trunk:1-59905
   + /gajim/trunk:1-60842

Deleted: extra-i686/9283.diff
===
--- extra-i686/9283.diff2009-12-07 12:20:46 UTC (rev 60842)
+++ extra-i686/9283.diff2009-12-07 12:21:22 UTC (rev 60843)
@@ -1,11 +0,0 @@
-Index: trunk/src/common/helpers.py
-===
 trunk/src/common/helpers.py (revision 9282)
-+++ trunk/src/common/helpers.py (revision 9283)
-@@ -794,5 +794,5 @@
- 
-   # our last chance, ask uname and strip it
--  uname_output = get_output_of_command('uname -a | cut -d" " 
-f1,3')
-+  uname_output = get_output_of_command('uname -sr')
-   if uname_output is not None:
-   return uname_output[0] # only first line

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 12:20:46 UTC (rev 60842)
+++ extra-i686/PKGBUILD 2009-12-07 12:21:22 UTC (rev 60843)
@@ -5,7 +5,7 @@
 
 pkgname=gajim
 pkgver=0.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Jabber client written in PyGTK"
 arch=(i686 x86_64)
 url="http://www.gajim.org/";
@@ -14,14 +14,18 @@
 makedepends=('gettext' 'intltool' 'dbus')
 optdepends=('dbus-python' 'pyopenssl')
 options=(!libtool)
-source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz)
+source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz
+   gnome-keyring-password-fix.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/gnome-keyring-password-fix.patch" || return 1
+
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   find "${pkgdir}/usr/share/gajim/" -name "*.pyo" | xargs rm -rf
 }
-sha256sums=('a2ed0383609a8423d65ab9f60e5e29bf5bf5eb9daeb69c70ba9d47f97a6cedbb')
+md5sums=('844752ab1b368b709b05572ad76fdc2d'
+ '55c6191e78bbe5f224cd7f941f4d1cf1')

Copied: gajim/repos/extra-i686/gnome-keyring-password-fix.patch (from rev 
60842, gajim/trunk/gnome-keyring-password-fix.patch)
===
--- extra-i686/gnome-keyring-password-fix.patch (rev 0)
+++ extra-i686/gnome-keyring-password-fix.patch 2009-12-07 12:21:22 UTC (rev 
60843)
@@ -0,0 +1,12 @@
+diff -Nur gajim-0.13.1.old/src/common/passwords.py 
gajim-0.13.1/src/common/passwords.py
+--- gajim-0.13.1.old/src/common/passwords.py   2009-10-29 12:15:17.0 
+0200
 gajim-0.13.1/src/common/passwords.py   2009-12-07 13:59:42.179454769 
+0200
+@@ -122,6 +122,8 @@
+   user = gajim.config.get_per('accounts', account_name, 'name')
+   display_name = _('XMPP account %...@%s') % (user, server)
+   attributes1 = dict(server=str(server), user=str(user), 
protocol='xmpp')
++  if password is None:
++  password = str()
+   try:
+   auth_token = gnomekeyring.item_create_sync(
+   self.keyring, 
gnomekeyring.ITEM_NETWORK_PASSWORD,



[arch-commits] Commit in gajim/trunk (3 files)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 07:20:46
  Author: ibiru
Revision: 60842

upgpkg: gajim 0.13.1-2
FS#17403 fix when using gnome-keyring

Added:
  gajim/trunk/gnome-keyring-password-fix.patch
Modified:
  gajim/trunk/PKGBUILD
Deleted:
  gajim/trunk/9283.diff

--+
 9283.diff|   11 ---
 PKGBUILD |   10 +++---
 gnome-keyring-password-fix.patch |   12 
 3 files changed, 19 insertions(+), 14 deletions(-)

Deleted: 9283.diff
===
--- 9283.diff   2009-12-07 11:58:25 UTC (rev 60841)
+++ 9283.diff   2009-12-07 12:20:46 UTC (rev 60842)
@@ -1,11 +0,0 @@
-Index: trunk/src/common/helpers.py
-===
 trunk/src/common/helpers.py (revision 9282)
-+++ trunk/src/common/helpers.py (revision 9283)
-@@ -794,5 +794,5 @@
- 
-   # our last chance, ask uname and strip it
--  uname_output = get_output_of_command('uname -a | cut -d" " 
-f1,3')
-+  uname_output = get_output_of_command('uname -sr')
-   if uname_output is not None:
-   return uname_output[0] # only first line

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 11:58:25 UTC (rev 60841)
+++ PKGBUILD2009-12-07 12:20:46 UTC (rev 60842)
@@ -5,7 +5,7 @@
 
 pkgname=gajim
 pkgver=0.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Jabber client written in PyGTK"
 arch=(i686 x86_64)
 url="http://www.gajim.org/";
@@ -14,14 +14,18 @@
 makedepends=('gettext' 'intltool' 'dbus')
 optdepends=('dbus-python' 'pyopenssl')
 options=(!libtool)
-source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz)
+source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz
+   gnome-keyring-password-fix.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np1 -i "${srcdir}/gnome-keyring-password-fix.patch" || return 1
+
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   find "${pkgdir}/usr/share/gajim/" -name "*.pyo" | xargs rm -rf
 }
-sha256sums=('a2ed0383609a8423d65ab9f60e5e29bf5bf5eb9daeb69c70ba9d47f97a6cedbb')
+md5sums=('844752ab1b368b709b05572ad76fdc2d'
+ '55c6191e78bbe5f224cd7f941f4d1cf1')

Added: gnome-keyring-password-fix.patch
===
--- gnome-keyring-password-fix.patch(rev 0)
+++ gnome-keyring-password-fix.patch2009-12-07 12:20:46 UTC (rev 60842)
@@ -0,0 +1,12 @@
+diff -Nur gajim-0.13.1.old/src/common/passwords.py 
gajim-0.13.1/src/common/passwords.py
+--- gajim-0.13.1.old/src/common/passwords.py   2009-10-29 12:15:17.0 
+0200
 gajim-0.13.1/src/common/passwords.py   2009-12-07 13:59:42.179454769 
+0200
+@@ -122,6 +122,8 @@
+   user = gajim.config.get_per('accounts', account_name, 'name')
+   display_name = _('XMPP account %...@%s') % (user, server)
+   attributes1 = dict(server=str(server), user=str(user), 
protocol='xmpp')
++  if password is None:
++  password = str()
+   try:
+   auth_token = gnomekeyring.item_create_sync(
+   self.keyring, 
gnomekeyring.ITEM_NETWORK_PASSWORD,



[arch-commits] Commit in miro/repos (testing-x86_64 testing-x86_64/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 06:58:25
  Author: giovanni
Revision: 60841

Merged revisions 60838 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/miro/trunk


  r60838 | giovanni | 2009-12-07 03:54:11 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: miro 2.5.4-1
  upstream release


Modified:
  miro/repos/testing-x86_64/(properties)
  miro/repos/testing-x86_64/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Property changes on: miro/repos/testing-x86_64
___
Modified: svnmerge-integrated
   - /miro/trunk:1-60693
   + /miro/trunk:1-60840

Modified: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2009-12-07 11:57:19 UTC (rev 60840)
+++ testing-x86_64/PKGBUILD 2009-12-07 11:58:25 UTC (rev 60841)
@@ -2,8 +2,8 @@
 # Maintainer: Ronald van Haren 
 
 pkgname=miro
-pkgver=2.5.3
-pkgrel=2
+pkgver=2.5.4
+pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com";
@@ -16,7 +16,7 @@
 makedepends=('pkgconfig' 'pm-utils' 'qt3')
 install=miro.install
 source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-${pkgver}.tar.gz)
-md5sums=('de3ada44e9904f2b046a6503b1a47a6d')
+md5sums=('d0ae2bf0463201c6b6dc7367f1fa8b3c')
 
 build() {
   cd ${srcdir}/miro-${pkgver}/platform/gtk-x11



[arch-commits] Commit in mythweather/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Juergen Hoetzel
Date: Monday, December 7, 2009 @ 06:57:19
  Author: juergen
Revision: 60840

Merged revisions 60377 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mythweather/trunk


  r60377 | juergen | 2009-12-04 14:50:07 +0100 (Fr, 04 Dez 2009) | 1 line
  
  update to 0.22


Modified:
  mythweather/repos/extra-i686/ (properties)
  mythweather/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   23 ++-
 1 file changed, 10 insertions(+), 13 deletions(-)


Property changes on: mythweather/repos/extra-i686
___
Modified: svnmerge-integrated
   - /mythweather/trunk:1-27121
   + /mythweather/trunk:1-60839

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 11:55:21 UTC (rev 60839)
+++ extra-i686/PKGBUILD 2009-12-07 11:57:19 UTC (rev 60840)
@@ -3,7 +3,7 @@
 # Contributor: kleptophob...@gmail.com
 
 pkgname=mythweather
-pkgver=0.21
+pkgver=0.22
 pkgrel=1
 pkgdesc="Weather checking plugin for MythTV"
 arch=('i686' 'x86_64')
@@ -11,22 +11,19 @@
 license=('GPL')
 depends=("mythtv>=${pkgver}" 'wget')
 source=("ftp://ftp.osuosl.org/pub/mythtv/mythplugins-$pkgver.tar.bz2";)
-md5sums=('6c08043227bef1384858deee12b5cdc3')
+md5sums=('09c8fa1058399a0c5db169a71561e985')
 groups=('mythtv-extras')
 
 build() {
cd $startdir/src/mythplugins-${pkgver}
-   . /etc/profile.d/qt3.sh
-
-   # use QT3 qmake
-   export PATH=$QTDIR/bin:$PATH
-
-   ./configure --prefix=/usr --enable-opengl --disable-all --enable-mythweather
- 
-   qmake mythplugins.pro
-   make qmake || return 1
-   make -j 2 || return 1
-
+   ./configure --prefix=/usr \
+--disable-all \
+\
+--enable-$pkgname \
+--enable-opengl
+   
+   qmake mythplugins.pro 
+   make qmake 
make INSTALL_ROOT=$startdir/pkg install
 }
 



[arch-commits] Commit in miro/repos (testing-i686 testing-i686/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 06:55:21
  Author: giovanni
Revision: 60839

Merged revisions 60838 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/miro/trunk


  r60838 | giovanni | 2009-12-07 03:54:11 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: miro 2.5.4-1
  upstream release


Modified:
  miro/repos/testing-i686/  (properties)
  miro/repos/testing-i686/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Property changes on: miro/repos/testing-i686
___
Modified: svnmerge-integrated
   - /miro/trunk:1-60691
   + /miro/trunk:1-60838

Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2009-12-07 11:54:11 UTC (rev 60838)
+++ testing-i686/PKGBUILD   2009-12-07 11:55:21 UTC (rev 60839)
@@ -2,8 +2,8 @@
 # Maintainer: Ronald van Haren 
 
 pkgname=miro
-pkgver=2.5.3
-pkgrel=2
+pkgver=2.5.4
+pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com";
@@ -16,7 +16,7 @@
 makedepends=('pkgconfig' 'pm-utils' 'qt3')
 install=miro.install
 source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-${pkgver}.tar.gz)
-md5sums=('de3ada44e9904f2b046a6503b1a47a6d')
+md5sums=('d0ae2bf0463201c6b6dc7367f1fa8b3c')
 
 build() {
   cd ${srcdir}/miro-${pkgver}/platform/gtk-x11



[arch-commits] Commit in miro/trunk (PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 06:54:11
  Author: giovanni
Revision: 60838

upgpkg: miro 2.5.4-1
upstream release

Modified:
  miro/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 11:52:35 UTC (rev 60837)
+++ PKGBUILD2009-12-07 11:54:11 UTC (rev 60838)
@@ -2,8 +2,8 @@
 # Maintainer: Ronald van Haren 
 
 pkgname=miro
-pkgver=2.5.3
-pkgrel=2
+pkgver=2.5.4
+pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com";
@@ -16,7 +16,7 @@
 makedepends=('pkgconfig' 'pm-utils' 'qt3')
 install=miro.install
 source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-${pkgver}.tar.gz)
-md5sums=('de3ada44e9904f2b046a6503b1a47a6d')
+md5sums=('d0ae2bf0463201c6b6dc7367f1fa8b3c')
 
 build() {
   cd ${srcdir}/miro-${pkgver}/platform/gtk-x11



[arch-commits] Commit in mythweather/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Juergen Hoetzel
Date: Monday, December 7, 2009 @ 06:52:35
  Author: juergen
Revision: 60837

Merged revisions 60377 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mythweather/trunk


  r60377 | juergen | 2009-12-04 14:50:07 +0100 (Fr, 04 Dez 2009) | 1 line
  
  update to 0.22


Modified:
  mythweather/repos/extra-x86_64/   (properties)
  mythweather/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |   23 ++-
 1 file changed, 10 insertions(+), 13 deletions(-)


Property changes on: mythweather/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /mythweather/trunk:1-27122
   + /mythweather/trunk:1-60836

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 11:20:09 UTC (rev 60836)
+++ extra-x86_64/PKGBUILD   2009-12-07 11:52:35 UTC (rev 60837)
@@ -3,7 +3,7 @@
 # Contributor: kleptophob...@gmail.com
 
 pkgname=mythweather
-pkgver=0.21
+pkgver=0.22
 pkgrel=1
 pkgdesc="Weather checking plugin for MythTV"
 arch=('i686' 'x86_64')
@@ -11,22 +11,19 @@
 license=('GPL')
 depends=("mythtv>=${pkgver}" 'wget')
 source=("ftp://ftp.osuosl.org/pub/mythtv/mythplugins-$pkgver.tar.bz2";)
-md5sums=('6c08043227bef1384858deee12b5cdc3')
+md5sums=('09c8fa1058399a0c5db169a71561e985')
 groups=('mythtv-extras')
 
 build() {
cd $startdir/src/mythplugins-${pkgver}
-   . /etc/profile.d/qt3.sh
-
-   # use QT3 qmake
-   export PATH=$QTDIR/bin:$PATH
-
-   ./configure --prefix=/usr --enable-opengl --disable-all --enable-mythweather
- 
-   qmake mythplugins.pro
-   make qmake || return 1
-   make -j 2 || return 1
-
+   ./configure --prefix=/usr \
+--disable-all \
+\
+--enable-$pkgname \
+--enable-opengl
+   
+   qmake mythplugins.pro 
+   make qmake 
make INSTALL_ROOT=$startdir/pkg install
 }
 



[arch-commits] Commit in asymptote/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 06:20:09
  Author: giovanni
Revision: 60836

Merged revisions 60834 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/asymptote/trunk


  r60834 | giovanni | 2009-12-07 03:17:29 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: asymptote 1.90-1
  upstream release


Modified:
  asymptote/repos/extra-x86_64/ (properties)
  asymptote/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)


Property changes on: asymptote/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /asymptote/trunk:1-51763
   + /asymptote/trunk:1-60835

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 11:18:43 UTC (rev 60835)
+++ extra-x86_64/PKGBUILD   2009-12-07 11:20:09 UTC (rev 60836)
@@ -1,7 +1,9 @@
+# $Id$
 # Maintainer: Firmicus 
 # Contributor: bender02 at gmx dot com
+
 pkgname=asymptote
-pkgver=1.86
+pkgver=1.90
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64')
@@ -11,15 +13,17 @@
 optdepends=('python: for the xasy GUI'
 'pil: "'
 'tix: "')
-source=(http://downloads.sourceforge.net/sourceforge/asymptote/$pkgname-$pkgver.src.tgz)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install="texlive.install"
+md5sums=('fe47e212a6d585f9b28811ed095c6c27')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --enable-gc=/usr --prefix=/usr \
---with-latex=/usr/share/texmf/tex/latex \
---with-context=/usr/share/texmf/tex/context || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --enable-gc=/usr \
+  --prefix=/usr \
+  --with-latex=/usr/share/texmf/tex/latex \
+  --with-context=/usr/share/texmf/tex/context || return 1
   make asy || return 1
-  make DESTDIR=$pkgdir install-asy || return 1
+  make DESTDIR="${pkgdir}" install-asy || return 1
 }
-md5sums=('0dc9c827a5e6f3577b5bc5966cb90ca8')



[arch-commits] Commit in asymptote/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 06:18:43
  Author: giovanni
Revision: 60835

Merged revisions 60834 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/asymptote/trunk


  r60834 | giovanni | 2009-12-07 03:17:29 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: asymptote 1.90-1
  upstream release


Modified:
  asymptote/repos/extra-i686/   (properties)
  asymptote/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)


Property changes on: asymptote/repos/extra-i686
___
Modified: svnmerge-integrated
   - /asymptote/trunk:1-51762
   + /asymptote/trunk:1-60834

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 11:17:29 UTC (rev 60834)
+++ extra-i686/PKGBUILD 2009-12-07 11:18:43 UTC (rev 60835)
@@ -1,7 +1,9 @@
+# $Id$
 # Maintainer: Firmicus 
 # Contributor: bender02 at gmx dot com
+
 pkgname=asymptote
-pkgver=1.86
+pkgver=1.90
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64')
@@ -11,15 +13,17 @@
 optdepends=('python: for the xasy GUI'
 'pil: "'
 'tix: "')
-source=(http://downloads.sourceforge.net/sourceforge/asymptote/$pkgname-$pkgver.src.tgz)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install="texlive.install"
+md5sums=('fe47e212a6d585f9b28811ed095c6c27')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --enable-gc=/usr --prefix=/usr \
---with-latex=/usr/share/texmf/tex/latex \
---with-context=/usr/share/texmf/tex/context || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --enable-gc=/usr \
+  --prefix=/usr \
+  --with-latex=/usr/share/texmf/tex/latex \
+  --with-context=/usr/share/texmf/tex/context || return 1
   make asy || return 1
-  make DESTDIR=$pkgdir install-asy || return 1
+  make DESTDIR="${pkgdir}" install-asy || return 1
 }
-md5sums=('0dc9c827a5e6f3577b5bc5966cb90ca8')



[arch-commits] Commit in asymptote/trunk (PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 06:17:29
  Author: giovanni
Revision: 60834

upgpkg: asymptote 1.90-1
upstream release

Modified:
  asymptote/trunk/PKGBUILD

--+
 PKGBUILD |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 10:50:15 UTC (rev 60833)
+++ PKGBUILD2009-12-07 11:17:29 UTC (rev 60834)
@@ -1,7 +1,9 @@
+# $Id$
 # Maintainer: Firmicus 
 # Contributor: bender02 at gmx dot com
+
 pkgname=asymptote
-pkgver=1.86
+pkgver=1.90
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64')
@@ -11,15 +13,17 @@
 optdepends=('python: for the xasy GUI'
 'pil: "'
 'tix: "')
-source=(http://downloads.sourceforge.net/sourceforge/asymptote/$pkgname-$pkgver.src.tgz)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install="texlive.install"
+md5sums=('fe47e212a6d585f9b28811ed095c6c27')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --enable-gc=/usr --prefix=/usr \
---with-latex=/usr/share/texmf/tex/latex \
---with-context=/usr/share/texmf/tex/context || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --enable-gc=/usr \
+  --prefix=/usr \
+  --with-latex=/usr/share/texmf/tex/latex \
+  --with-context=/usr/share/texmf/tex/context || return 1
   make asy || return 1
-  make DESTDIR=$pkgdir install-asy || return 1
+  make DESTDIR="${pkgdir}" install-asy || return 1
 }
-md5sums=('0dc9c827a5e6f3577b5bc5966cb90ca8')



[arch-commits] Commit in arora/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 05:50:15
  Author: giovanni
Revision: 60833

Merged revisions 60831 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/arora/trunk


  r60831 | giovanni | 2009-12-07 02:47:17 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: arora 0.10.2-1
  upstream release


Modified:
  arora/repos/extra-x86_64/ (properties)
  arora/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: arora/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /arora/trunk:1-54004
   + /arora/trunk:1-60832

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 10:48:17 UTC (rev 60832)
+++ extra-x86_64/PKGBUILD   2009-12-07 10:50:15 UTC (rev 60833)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=arora
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
 pkgdesc='A cross platform web browser built using Qt and WebKit'
 url='http://www.arora-browser.org'
@@ -11,7 +11,7 @@
 depends=('qt' 'openssl' 'xdg-utils')
 install='arora.install'
 source=("http://arora.googlecode.com/files/arora-${pkgver}.tar.gz";)
-md5sums=('ac38282a2d9134687d9c30dbb73c0fbc')
+md5sums=('ccef0f214e0f03828cde8c521f7a5225')
 
 build() {
cd $srcdir/$pkgname-$pkgver



[arch-commits] Commit in arora/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 05:48:17
  Author: giovanni
Revision: 60832

Merged revisions 60831 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/arora/trunk


  r60831 | giovanni | 2009-12-07 02:47:17 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: arora 0.10.2-1
  upstream release


Modified:
  arora/repos/extra-i686/   (properties)
  arora/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: arora/repos/extra-i686
___
Modified: svnmerge-integrated
   - /arora/trunk:1-54005
   + /arora/trunk:1-60831

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 10:47:17 UTC (rev 60831)
+++ extra-i686/PKGBUILD 2009-12-07 10:48:17 UTC (rev 60832)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=arora
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
 pkgdesc='A cross platform web browser built using Qt and WebKit'
 url='http://www.arora-browser.org'
@@ -11,7 +11,7 @@
 depends=('qt' 'openssl' 'xdg-utils')
 install='arora.install'
 source=("http://arora.googlecode.com/files/arora-${pkgver}.tar.gz";)
-md5sums=('ac38282a2d9134687d9c30dbb73c0fbc')
+md5sums=('ccef0f214e0f03828cde8c521f7a5225')
 
 build() {
cd $srcdir/$pkgname-$pkgver



[arch-commits] Commit in arora/trunk (PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 05:47:17
  Author: giovanni
Revision: 60831

upgpkg: arora 0.10.2-1
upstream release

Modified:
  arora/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 10:33:29 UTC (rev 60830)
+++ PKGBUILD2009-12-07 10:47:17 UTC (rev 60831)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=arora
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
 pkgdesc='A cross platform web browser built using Qt and WebKit'
 url='http://www.arora-browser.org'
@@ -11,7 +11,7 @@
 depends=('qt' 'openssl' 'xdg-utils')
 install='arora.install'
 source=("http://arora.googlecode.com/files/arora-${pkgver}.tar.gz";)
-md5sums=('ac38282a2d9134687d9c30dbb73c0fbc')
+md5sums=('ccef0f214e0f03828cde8c521f7a5225')
 
 build() {
cd $srcdir/$pkgname-$pkgver



[arch-commits] Commit in aria2/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 05:33:29
  Author: giovanni
Revision: 60830

Merged revisions 60828 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/aria2/trunk


  r60828 | giovanni | 2009-12-07 02:30:30 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: aria2 1.7.1-1
  upstream release


Modified:
  aria2/repos/extra-x86_64/ (properties)
  aria2/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: aria2/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /aria2/trunk:1-58183
   + /aria2/trunk:1-60829

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 10:31:34 UTC (rev 60829)
+++ extra-x86_64/PKGBUILD   2009-12-07 10:33:29 UTC (rev 60830)
@@ -2,7 +2,7 @@
 # Contributor: Alexander Fehr 
 
 pkgname=aria2
-pkgver=1.6.3
+pkgver=1.7.1
 pkgrel=1
 pkgdesc="Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@
 license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
 source=( 
http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5d3e6231caaa6a8b8e708d8b51154341')
+md5sums=('ca125faf6a8fbef108184184cb70fe24')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"



[arch-commits] Commit in aria2/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 05:31:34
  Author: giovanni
Revision: 60829

Merged revisions 60828 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/aria2/trunk


  r60828 | giovanni | 2009-12-07 02:30:30 -0800 (lun, 07 dic 2009) | 2 lines
  
  upgpkg: aria2 1.7.1-1
  upstream release


Modified:
  aria2/repos/extra-i686/   (properties)
  aria2/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: aria2/repos/extra-i686
___
Modified: svnmerge-integrated
   - /aria2/trunk:1-58170
   + /aria2/trunk:1-60828

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 10:30:30 UTC (rev 60828)
+++ extra-i686/PKGBUILD 2009-12-07 10:31:34 UTC (rev 60829)
@@ -2,7 +2,7 @@
 # Contributor: Alexander Fehr 
 
 pkgname=aria2
-pkgver=1.6.3
+pkgver=1.7.1
 pkgrel=1
 pkgdesc="Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@
 license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
 source=( 
http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5d3e6231caaa6a8b8e708d8b51154341')
+md5sums=('ca125faf6a8fbef108184184cb70fe24')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"



[arch-commits] Commit in aria2/trunk (PKGBUILD)

2009-12-07 Thread Giovanni Scafora
Date: Monday, December 7, 2009 @ 05:30:30
  Author: giovanni
Revision: 60828

upgpkg: aria2 1.7.1-1
upstream release

Modified:
  aria2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 10:05:14 UTC (rev 60827)
+++ PKGBUILD2009-12-07 10:30:30 UTC (rev 60828)
@@ -2,7 +2,7 @@
 # Contributor: Alexander Fehr 
 
 pkgname=aria2
-pkgver=1.6.3
+pkgver=1.7.1
 pkgrel=1
 pkgdesc="Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@
 license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
 source=( 
http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5d3e6231caaa6a8b8e708d8b51154341')
+md5sums=('ca125faf6a8fbef108184184cb70fe24')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"



[arch-commits] Commit in fluidsynth/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 05:05:14
  Author: ibiru
Revision: 60827

Merged revisions 60825 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/fluidsynth/trunk


  r60825 | ibiru | 2009-12-07 12:03:43 +0200 (Mon, 07 Dec 2009) | 2 lines
  
  upgpkg: fluidsynth 1.1.0-2
  add glib2 to dependency  FS#17412


Modified:
  fluidsynth/repos/extra-x86_64/(properties)
  fluidsynth/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: fluidsynth/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /fluidsynth/trunk:1-59799
   + /fluidsynth/trunk:1-60826

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-07 10:04:19 UTC (rev 60826)
+++ extra-x86_64/PKGBUILD   2009-12-07 10:05:14 UTC (rev 60827)
@@ -3,11 +3,11 @@
 
 pkgname=fluidsynth
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 
specifications."
 arch=("i686" "x86_64")
 url="http://www.fluidsynth.org/";
-depends=('jack-audio-connection-kit' 'ladspa')
+depends=('glib2' 'jack-audio-connection-kit' 'ladspa')
 options=('!libtool')
 license=('LGPL')
 source=("http://savannah.nongnu.org/download/fluid/$pkgname-$pkgver.tar.gz";)



[arch-commits] Commit in fluidsynth/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 05:04:19
  Author: ibiru
Revision: 60826

Merged revisions 60825 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/fluidsynth/trunk


  r60825 | ibiru | 2009-12-07 12:03:43 +0200 (Mon, 07 Dec 2009) | 2 lines
  
  upgpkg: fluidsynth 1.1.0-2
  add glib2 to dependency  FS#17412


Modified:
  fluidsynth/repos/extra-i686/  (properties)
  fluidsynth/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: fluidsynth/repos/extra-i686
___
Modified: svnmerge-integrated
   - /fluidsynth/trunk:1-59798
   + /fluidsynth/trunk:1-60825

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-07 10:03:43 UTC (rev 60825)
+++ extra-i686/PKGBUILD 2009-12-07 10:04:19 UTC (rev 60826)
@@ -3,11 +3,11 @@
 
 pkgname=fluidsynth
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 
specifications."
 arch=("i686" "x86_64")
 url="http://www.fluidsynth.org/";
-depends=('jack-audio-connection-kit' 'ladspa')
+depends=('glib2' 'jack-audio-connection-kit' 'ladspa')
 options=('!libtool')
 license=('LGPL')
 source=("http://savannah.nongnu.org/download/fluid/$pkgname-$pkgver.tar.gz";)



[arch-commits] Commit in fluidsynth/trunk (PKGBUILD)

2009-12-07 Thread Ionut Biru
Date: Monday, December 7, 2009 @ 05:03:43
  Author: ibiru
Revision: 60825

upgpkg: fluidsynth 1.1.0-2
add glib2 to dependency  FS#17412

Modified:
  fluidsynth/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 09:19:00 UTC (rev 60824)
+++ PKGBUILD2009-12-07 10:03:43 UTC (rev 60825)
@@ -3,11 +3,11 @@
 
 pkgname=fluidsynth
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 
specifications."
 arch=("i686" "x86_64")
 url="http://www.fluidsynth.org/";
-depends=('jack-audio-connection-kit' 'ladspa')
+depends=('glib2' 'jack-audio-connection-kit' 'ladspa')
 options=('!libtool')
 license=('LGPL')
 source=("http://savannah.nongnu.org/download/fluid/$pkgname-$pkgver.tar.gz";)



[arch-commits] Commit in xf86-video-ati/repos (testing-x86_64)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 04:19:00
  Author: andyrtr
Revision: 60824

Initialized merge tracking via "svnmerge" with revisions "1-60822" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-ati/trunk

Modified:
  xf86-video-ati/repos/testing-x86_64/  (properties)


Property changes on: xf86-video-ati/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /xf86-video-ati/trunk:1-60822



[arch-commits] Commit in xf86-video-ati/repos (testing-x86_64)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 04:18:42
  Author: andyrtr
Revision: 60823

archrelease: new repo testing-x86_64

Added:
  xf86-video-ati/repos/testing-x86_64/



[arch-commits] Commit in xf86-video-ati/repos (testing-i686)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 04:18:07
  Author: andyrtr
Revision: 60822

Initialized merge tracking via "svnmerge" with revisions "1-60820" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-ati/trunk

Modified:
  xf86-video-ati/repos/testing-i686/(properties)


Property changes on: xf86-video-ati/repos/testing-i686
___
Added: svnmerge-integrated
   + /xf86-video-ati/trunk:1-60820



[arch-commits] Commit in xf86-video-ati/repos (testing-i686)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 04:17:49
  Author: andyrtr
Revision: 60821

archrelease: new repo testing-i686

Added:
  xf86-video-ati/repos/testing-i686/



[arch-commits] Commit in xf86-video-ati/trunk (PKGBUILD)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 04:17:28
  Author: andyrtr
Revision: 60820

upgpkg: xf86-video-ati 6.12.99.git20091207-1
new snapshot 20091207

Modified:
  xf86-video-ati/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 08:54:56 UTC (rev 60819)
+++ PKGBUILD2009-12-07 09:17:28 UTC (rev 60820)
@@ -3,7 +3,7 @@
 # Contributor: Alexander Baldeck 
 
 pkgname=xf86-video-ati
-_gitdate=20091014
+_gitdate=20091207
 pkgver=6.12.99.git${_gitdate} # see configure.ac
 #pkgver=6.12.4
 pkgrel=1
@@ -11,7 +11,7 @@
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/";
 license=('custom')
-depends=('libdrm>=2.4.15' 'libpciaccess' 'ati-dri>=7.6' 'pixman>=0.16.2')
+depends=('libdrm>=2.4.16' 'libpciaccess' 'ati-dri>=7.6' 'pixman>=0.16.2')
 makedepends=('pkgconfig' 'xorg-server>=1.7.0' 'fontsproto'
 'glproto>=1.4.10' 'xf86driproto' 'diffutils' 'xorg-util-macros' 
'xineramaproto' 'mesa>=7.6')
 conflicts=('xorg-server<1.7.0')
@@ -19,13 +19,13 @@
 options=('!libtool')
 source=( # ${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

ftp://ftp.archlinux.org/other/$pkgname/xf86-video-ati-${_gitdate}.tar.bz2
-LICENSE)
-md5sums=('d24626cad6243c7bf0d5a7bab3b578fe'
+   LICENSE)
+md5sums=('72705fd52ce3391a33dabd8e4b321440'
  '75da66945980a43adf1e1856271b9d4a')
 
 build() {
   # get git code
-  cd ${srcdir}
+#  cd ${srcdir}
 #  git clone -v git://anongit.freedesktop.org/xorg/driver/xf86-video-ati
 #  cd xf86-video-ati
 #  git archive --prefix=xf86-video-ati-${_gitdate}/ --format=tar HEAD | bzip2 
> ../../xf86-video-ati-${_gitdate}.tar.bz2



[arch-commits] Commit in xf86-video-nouveau/repos (testing-x86_64)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:54:56
  Author: andyrtr
Revision: 60819

Initialized merge tracking via "svnmerge" with revisions "1-60817" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-nouveau/trunk

Modified:
  xf86-video-nouveau/repos/testing-x86_64/  (properties)


Property changes on: xf86-video-nouveau/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /xf86-video-nouveau/trunk:1-60817



[arch-commits] Commit in xf86-video-nouveau/repos (testing-x86_64)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:54:38
  Author: andyrtr
Revision: 60818

archrelease: new repo testing-x86_64

Added:
  xf86-video-nouveau/repos/testing-x86_64/



[arch-commits] Commit in xf86-video-nouveau/repos (testing-i686)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:54:05
  Author: andyrtr
Revision: 60817

Initialized merge tracking via "svnmerge" with revisions "1-60815" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-nouveau/trunk

Modified:
  xf86-video-nouveau/repos/testing-i686/(properties)


Property changes on: xf86-video-nouveau/repos/testing-i686
___
Added: svnmerge-integrated
   + /xf86-video-nouveau/trunk:1-60815



[arch-commits] Commit in xf86-video-nouveau/repos (testing-i686)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:53:47
  Author: andyrtr
Revision: 60816

archrelease: new repo testing-i686

Added:
  xf86-video-nouveau/repos/testing-i686/



[arch-commits] Commit in xf86-video-nouveau/trunk (PKGBUILD)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:53:26
  Author: andyrtr
Revision: 60815

upgpkg: xf86-video-nouveau 0.0.10_git20091207-1
new snapshot 20091207

Modified:
  xf86-video-nouveau/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 08:22:50 UTC (rev 60814)
+++ PKGBUILD2009-12-07 08:53:26 UTC (rev 60815)
@@ -3,25 +3,25 @@
 # Contributor: buddabrod 
 
 pkgname=xf86-video-nouveau
-_gitdate=20091101
+_gitdate=20091207
 pkgver=0.0.10_git${_gitdate} # see configure.ac
 pkgrel=1
 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/wiki/";
 license=('GPL') #and MIT, not yet a license file, see 
http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
-depends=('nouveau-drm>=0.0.15_20091101' 'libdrm>=2.4.15')
+depends=('nouveau-drm>=0.0.15_20091206' 'libdrm>=2.4.16')
 optdepends=('nouveau-dri:  highly experimental gallium3d features')
 makedepends=('pkgconfig' 'xorg-server>=1.7.1' 'mesa>=7.6' 'glproto>=1.4.10' 
'xorg-util-macros' 'xf86driproto' 'autoconf')
 conflicts=('xorg-server<1.7.0')
 groups=('xorg-video-drivers')
 options=('!libtool') # 'force'
 
source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('4f7257f1d9d11b9ffee0e855f6c7feb8')
+md5sums=('71f056dd4e94ee249516660129b7222c')
 
 build() {
-  # get git code for both sources
-  cd ${srcdir}
+  # get git code
+#  cd ${srcdir}
 #  git clone -v git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
 #  cd xf86-video-nouveau
 #  git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | 
bzip2 > ../../xf86-video-nouveau-${_gitdate}.tar.bz2



[arch-commits] Commit in libdrm/repos (testing-x86_64)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:22:50
  Author: andyrtr
Revision: 60814

Initialized merge tracking via "svnmerge" with revisions "1-60812" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libdrm/trunk

Modified:
  libdrm/repos/testing-x86_64/  (properties)


Property changes on: libdrm/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /libdrm/trunk:1-60812



[arch-commits] Commit in libdrm/repos (testing-x86_64)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:22:32
  Author: andyrtr
Revision: 60813

archrelease: new repo testing-x86_64

Added:
  libdrm/repos/testing-x86_64/



[arch-commits] Commit in libdrm/repos (testing-i686)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:21:59
  Author: andyrtr
Revision: 60812

Initialized merge tracking via "svnmerge" with revisions "1-60810" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libdrm/trunk

Modified:
  libdrm/repos/testing-i686/(properties)


Property changes on: libdrm/repos/testing-i686
___
Added: svnmerge-integrated
   + /libdrm/trunk:1-60810



[arch-commits] Commit in libdrm/repos (testing-i686)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:21:41
  Author: andyrtr
Revision: 60811

archrelease: new repo testing-i686

Added:
  libdrm/repos/testing-i686/



[arch-commits] Commit in libdrm/trunk (PKGBUILD no-pthread-stubs.patch)

2009-12-07 Thread andyrtr
Date: Monday, December 7, 2009 @ 03:21:20
  Author: andyrtr
Revision: 60810

upgpkg: libdrm 2.4.16-1
new version 2.4.16

Modified:
  libdrm/trunk/PKGBUILD
  libdrm/trunk/no-pthread-stubs.patch

+
 PKGBUILD   |8 +++---
 no-pthread-stubs.patch |   57 +++
 2 files changed, 32 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-07 07:55:07 UTC (rev 60809)
+++ PKGBUILD2009-12-07 08:21:20 UTC (rev 60810)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=libdrm
-pkgver=2.4.15
+pkgver=2.4.16
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
@@ -13,10 +13,10 @@
 source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 no-pthread-stubs.patch
 COPYING)
-md5sums=('7f5026d72145250e736f583fd60a2ce6'
- '8b5462f8a6540c8b5c897fc3efe27b07'
+md5sums=('fa47a49641a8e846510566787a85cb8b'
+ '9b5ec3bbebe86921e2057694c42f65b8'
  'ba65e71c481b94ef0fb6c23c7f21ffa1')
-
+ 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" || return 1

Modified: no-pthread-stubs.patch
===
--- no-pthread-stubs.patch  2009-12-07 07:55:07 UTC (rev 60809)
+++ no-pthread-stubs.patch  2009-12-07 08:21:20 UTC (rev 60810)
@@ -12,15 +12,14 @@
  pkgconfigdir=${libdir}/pkgconfig
  AC_SUBST(pkgconfigdir)
  AC_ARG_ENABLE(udev,   AS_HELP_STRING([--enable-udev],
-diff -ru libdrm-2.4.0/libdrm/intel/Makefile.am 
libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am
 libdrm-2.4.0/libdrm/intel/Makefile.am  2008-10-14 01:39:32.0 
+0200
-+++ libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am  2008-10-21 
10:49:00.0 +0200
+--- libdrm-2.4.16/intel/Makefile.am2009-11-20 23:54:36.0 +
 libdrm-2.4.16/intel/Makefile.am.new2009-12-07 08:11:32.235748069 
+
 @@ -26,13 +26,12 @@
$(WARN_CFLAGS) \
-   -I$(top_srcdir)/libdrm \
-   -I$(top_srcdir)/libdrm/intel \
+   -I$(top_srcdir) \
+   -I$(top_srcdir)/intel \
 -  $(PTHREADSTUBS_CFLAGS) \
-   -I$(top_srcdir)/shared-core
+   -I$(top_srcdir)/include/drm
  
  libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
  libdrm_intel_ladir = $(libdir)
@@ -29,32 +28,15 @@
 +libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@
  
  libdrm_intel_la_SOURCES = \
-   intel_bufmgr.c \
 libdrm-2.4.5/libdrm/nouveau/Makefile.am.orig   2009-02-28 
19:06:24.0 +
-+++ libdrm-2.4.5/libdrm/nouveau/Makefile.am2009-02-28 19:06:33.0 
+
-@@ -2,13 +2,12 @@
-   $(WARN_CFLAGS) \
-   -I$(top_srcdir)/libdrm \
-   -I$(top_srcdir)/libdrm/nouveau \
--  $(PTHREADSTUBS_CFLAGS) \
-   -I$(top_srcdir)/shared-core
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
-   nouveau_device.c \
 libdrm-2.4.12/libdrm/radeon/Makefile.am.orig   2009-07-18 
15:53:08.0 +0200
-+++ libdrm-2.4.12/libdrm/radeon/Makefile.am2009-07-18 15:53:23.0 
+0200
+   intel_atomic.h \
+--- libdrm-2.4.16/radeon/Makefile.am   2009-11-20 23:54:36.0 +
 libdrm-2.4.16/radeon/Makefile.am.new   2009-12-07 08:12:31.889075388 
+
 @@ -26,13 +26,12 @@
$(WARN_CFLAGS) \
-   -I$(top_srcdir)/libdrm \
-   -I$(top_srcdir)/libdrm/radeon \
+   -I$(top_srcdir) \
+   -I$(top_srcdir)/radeon \
 -  $(PTHREADSTUBS_CFLAGS) \
-   -I$(top_srcdir)/shared-core
+   -I$(top_srcdir)/include/drm
  
  libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
  libdrm_radeon_ladir = $(libdir)
@@ -64,3 +46,20 @@
  
  libdrm_radeon_la_SOURCES = \
radeon_bo_gem.c \
+--- libdrm-2.4.16/nouveau/Makefile.am  2009-11-20 23:54:36.0 +
 libdrm-2.4.16/nouveau/Makefile.am.new  2009-12-07 08:13:01.489072320 
+
+@@ -2,13 +2,12 @@
+   $(WARN_CFLAGS) \
+   -I$(top_srcdir) \
+   -I$(top_srcdir)/nouveau \
+-  $(PTHREADSTUBS_CFLAGS) \
+   -I$(top_srcdir)/include/drm
+ 
+ libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
+ libdrm_nouveau_ladir = $(libdir)
+ libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_nouveau_la_LIBADD = ../libdrm.la
+ 
+ libdrm_nouveau_la_SOURCES = \
+   nouveau_device.c \