[arch-commits] Commit in qemu-kvm/trunk (PKGBUILD qemu-kvm.install)

2010-01-11 Thread Jan de Groot
Date: Monday, January 11, 2010 @ 04:26:59
  Author: jgc
Revision: 62692

Makedepend on texi2html and perl to fix documentation building
Remove old crap from install scriptlet

Modified:
  qemu-kvm/trunk/PKGBUILD
  qemu-kvm/trunk/qemu-kvm.install

--+
 PKGBUILD |5 +++--
 qemu-kvm.install |6 --
 2 files changed, 3 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 04:21:00 UTC (rev 62691)
+++ PKGBUILD2010-01-11 09:26:59 UTC (rev 62692)
@@ -8,18 +8,19 @@
 license=('GPL2' 'LGPL2.1')
 url=http://www.linux-kvm.org;
 depends=('libsasl' 'curl' 'sdl' 'alsa-lib' 'esound' 'gnutls=2.4.1' 'bluez' 
'vde2' 'util-linux-ng')
+makedepends=('texi2html' 'perl')
 install=qemu-kvm.install
 conflicts=('qemu')
 provides=('qemu')
 replaces=('kvm')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz
 65-kvm.rules)
 
 build()
 {
 cd ${srcdir}/${pkgname}-${pkgver}
 # fix esound building
-./configure --prefix=/usr --audio-drv-list=alsa,sdl,oss,esd 
--audio-card-list=ac97,sb16,es1370,adlib
+./configure --prefix=/usr --audio-drv-list=alsa,sdl,oss,esd 
--audio-card-list=ac97,sb16,es1370,adlib --enable-docs || return 1
 make || return 1
 make DESTDIR=${pkgdir} install || return 1
 # symbolic link for backwards compatibility

Modified: qemu-kvm.install
===
--- qemu-kvm.install2010-01-11 04:21:00 UTC (rev 62691)
+++ qemu-kvm.install2010-01-11 09:26:59 UTC (rev 62692)
@@ -1,4 +1,3 @@
-# kvm:  the new package version
 post_install() {
   groupadd kvm -f -g 78
 }
@@ -8,10 +7,5 @@
 }
 
 post_remove() {
-  #
   groupdel kvm
 }
-
-op=$1
-shift
-$op $*



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

2010-01-11 Thread Andrea Scarpino
Date: Monday, January 11, 2010 @ 04:42:20
  Author: andrea
Revision: 62693

upgpkg: mpd 0.15.7-1
upstream release

Modified:
  mpd/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 09:26:59 UTC (rev 62692)
+++ PKGBUILD2010-01-11 09:42:20 UTC (rev 62693)
@@ -4,8 +4,8 @@
 # Contributor: Ben b...@benmazer.net
 
 pkgname=mpd
-pkgver=0.15.6
-pkgrel=3
+pkgver=0.15.7
+pkgrel=1
 pkgdesc=Music daemon that plays MP3, FLAC, and Ogg Vorbis files
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,7 +16,7 @@
 install=mpd.install
 source=(http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2
 'mpd')
-md5sums=('e0b7a11f86f8f021a92c49a96032ff39'
+md5sums=('ecec7f0bdfe8024cc4daa53e4cc476a4'
  'b1fd15de359db08e4b9ae4b199640f0e')
 
 build() {



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

2010-01-11 Thread Andrea Scarpino
Date: Monday, January 11, 2010 @ 04:42:58
  Author: andrea
Revision: 62694

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


  r62693 | andrea | 2010-01-11 10:42:20 +0100 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: mpd 0.15.7-1
  upstream release


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

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


Property changes on: mpd/repos/testing-i686
___
Modified: svnmerge-integrated
   - /mpd/trunk:1-62666
   + /mpd/trunk:1-62693

Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2010-01-11 09:42:20 UTC (rev 62693)
+++ testing-i686/PKGBUILD   2010-01-11 09:42:58 UTC (rev 62694)
@@ -4,8 +4,8 @@
 # Contributor: Ben b...@benmazer.net
 
 pkgname=mpd
-pkgver=0.15.6
-pkgrel=3
+pkgver=0.15.7
+pkgrel=1
 pkgdesc=Music daemon that plays MP3, FLAC, and Ogg Vorbis files
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,7 +16,7 @@
 install=mpd.install
 source=(http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2
 'mpd')
-md5sums=('e0b7a11f86f8f021a92c49a96032ff39'
+md5sums=('ecec7f0bdfe8024cc4daa53e4cc476a4'
  'b1fd15de359db08e4b9ae4b199640f0e')
 
 build() {



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

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 06:23:14
  Author: ibiru
Revision: 62696

Merged revisions 55421,62511 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kmldonkey/trunk


  r55421 | andrea | 2009-10-12 23:05:26 +0300 (Mon, 12 Oct 2009) | 1 line
  
  fixed url and removed group

  r62511 | andrea | 2010-01-09 20:51:39 +0200 (Sat, 09 Jan 2010) | 2 lines
  
  upgpkg: kmldonkey 2.0.2-4
  removed kde-extragear group, new tarball, fixed source


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

--+
 PKGBUILD |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)


Property changes on: kmldonkey/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /kmldonkey/trunk:1-35806
   + /kmldonkey/trunk:1-62695

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 11:12:03 UTC (rev 62695)
+++ extra-x86_64/PKGBUILD   2010-01-11 11:23:14 UTC (rev 62696)
@@ -1,29 +1,29 @@
 # $Id: $
-# Maintainer: Pierre Schmitz pie...@archlinux.de
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=kmldonkey
 pkgver=2.0.2
-_kdever=4.2.2
-pkgrel=3
+_kdever=4.3.3
+pkgrel=4
 pkgdesc=An MLDonkey frontend for KDE
 arch=('i686' 'x86_64')
-url='http://www.kde.org'
+url='http://extragear.kde.org/apps/kmldonkey/'
 license=('GPL')
-groups=('kde-extragear')
 depends=('kdebase-workspace')
 makedepends=('pkgconfig' 'cmake' 'automoc4')
 options=('docs')
 install='kmldonkey.install'
-source=(http://download.kde.org/stable/${_kdever}/extragear/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('e9feb9f534176a2d90aaa4c119f8d65e')
+source=(http://download.kde.org/stable/${_kdever}/src/extragear/${pkgname}-${pkgver}-kde${_kdever}.tar.bz2;)
+md5sums=('76f609c488938c8a5858c126431b88fa')
 
 build() {
   cd ${srcdir}
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname}-${pkgver}-kde${_kdever} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr
-  make
+  make || return 1
   make DESTDIR=${pkgdir} install
 }



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

2010-01-11 Thread Paul Mattal
Date: Monday, January 11, 2010 @ 07:56:43
  Author: paul
Revision: 62697

upgpkg: dcron 4.2-1
upstream update to 4.2

Modified:
  dcron/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 11:23:14 UTC (rev 62696)
+++ PKGBUILD2010-01-11 12:56:43 UTC (rev 62697)
@@ -1,7 +1,7 @@
 # Maintainer: Paul Mattal paul.archlinux.org
 
 pkgname=dcron
-pkgver=4.1
+pkgver=4.2
 pkgrel=1
 pkgdesc=dillon's lightweight cron daemon
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@
 depends=('glibc')
 provides=('cron')
 source=(http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('07167517b9383972587e20ec23f2dc12')
+md5sums=('0e19b88708aed7b1bc8426d4f237d431')
 
 
 build() {



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

2010-01-11 Thread Paul Mattal
Date: Monday, January 11, 2010 @ 07:56:58
  Author: paul
Revision: 62698

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


  r62697 | paul | 2010-01-11 07:56:43 -0500 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: dcron 4.2-1
  upstream update to 4.2


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

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


Property changes on: dcron/repos/testing-i686
___
Modified: svnmerge-integrated
   - /dcron/trunk:1-62684
   + /dcron/trunk:1-62697

Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2010-01-11 12:56:43 UTC (rev 62697)
+++ testing-i686/PKGBUILD   2010-01-11 12:56:58 UTC (rev 62698)
@@ -1,7 +1,7 @@
 # Maintainer: Paul Mattal paul.archlinux.org
 
 pkgname=dcron
-pkgver=4.1
+pkgver=4.2
 pkgrel=1
 pkgdesc=dillon's lightweight cron daemon
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@
 depends=('glibc')
 provides=('cron')
 source=(http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('07167517b9383972587e20ec23f2dc12')
+md5sums=('0e19b88708aed7b1bc8426d4f237d431')
 
 
 build() {



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

2010-01-11 Thread Paul Mattal
Date: Monday, January 11, 2010 @ 07:57:47
  Author: paul
Revision: 62699

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


  r62697 | paul | 2010-01-11 07:56:43 -0500 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: dcron 4.2-1
  upstream update to 4.2


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

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


Property changes on: dcron/repos/testing-x86_64
___
Modified: svnmerge-integrated
   - /dcron/trunk:1-62686
   + /dcron/trunk:1-62698

Modified: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2010-01-11 12:56:58 UTC (rev 62698)
+++ testing-x86_64/PKGBUILD 2010-01-11 12:57:47 UTC (rev 62699)
@@ -1,7 +1,7 @@
 # Maintainer: Paul Mattal paul.archlinux.org
 
 pkgname=dcron
-pkgver=4.1
+pkgver=4.2
 pkgrel=1
 pkgdesc=dillon's lightweight cron daemon
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@
 depends=('glibc')
 provides=('cron')
 source=(http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('07167517b9383972587e20ec23f2dc12')
+md5sums=('0e19b88708aed7b1bc8426d4f237d431')
 
 
 build() {



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:29:23
  Author: vesa
Revision: 62700

archrelease: new repo testing-x86_64

Added:
  ghc/repos/testing-x86_64/



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:30:06
  Author: vesa
Revision: 62702

db-remove: haskell-binary removed by vesa

Deleted:
  haskell-binary/repos/testing-i686/



[arch-commits] Commit in haskell-extensible-exceptions/repos (testing-i686)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:30:40
  Author: vesa
Revision: 62703

db-remove: haskell-extensible-exceptions removed by vesa

Deleted:
  haskell-extensible-exceptions/repos/testing-i686/



[arch-commits] Commit in haskell-utf8-string/repos (testing-i686)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:32:16
  Author: vesa
Revision: 62704

db-remove: haskell-utf8-string removed by vesa

Deleted:
  haskell-utf8-string/repos/testing-i686/



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:40:40
  Author: vesa
Revision: 62705

archrelease: new repo testing-x86_64

Added:
  haskell-zlib/repos/testing-x86_64/



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:40:54
  Author: vesa
Revision: 62706

Initialized merge tracking via svnmerge with revisions 1-62704 from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-zlib/trunk

Modified:
  haskell-zlib/repos/testing-x86_64/(properties)


Property changes on: haskell-zlib/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /haskell-zlib/trunk:1-62704



[arch-commits] Commit in haskell-hashed-storage/trunk (PKGBUILD)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:41:35
  Author: vesa
Revision: 62707

extensible-exceptions comes with ghc

Modified:
  haskell-hashed-storage/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 13:40:54 UTC (rev 62706)
+++ PKGBUILD2010-01-11 13:41:35 UTC (rev 62707)
@@ -2,14 +2,14 @@
 # Contributor: Arch Haskell Team arch-hask...@haskell.org
 # Package generated by cabal2arch 0.5.3
 pkgname=haskell-hashed-storage
-pkgrel=2
+pkgrel=3
 pkgver=0.3.9
 pkgdesc=Hashed file storage support code.
 url=http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hashed-storage;
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc=6.12.1' 'haskell-extensible-exceptions' 'haskell-mmap=0.4' 
'haskell-zlib'  'haskell-mtl' 'haskell-dataenc')
+depends=('ghc=6.12.1' 'haskell-mmap=0.4' 'haskell-zlib'  'haskell-mtl' 
'haskell-dataenc')
 options=('strip')
 
source=(http://hackage.haskell.org/packages/archive/hashed-storage/$pkgver/hashed-storage-$pkgver.tar.gz)
 install=haskell-hashed-storage.install



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:42:13
  Author: vesa
Revision: 62708

archrelease: new repo testing-x86_64

Added:
  haskell-dataenc/repos/testing-x86_64/



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:42:19
  Author: vesa
Revision: 62709

archrelease: new repo testing-x86_64

Added:
  haskell-mmap/repos/testing-x86_64/



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:42:26
  Author: vesa
Revision: 62710

Initialized merge tracking via svnmerge with revisions 1-62707 from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-dataenc/trunk

Modified:
  haskell-dataenc/repos/testing-x86_64/ (properties)


Property changes on: haskell-dataenc/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /haskell-dataenc/trunk:1-62707



[arch-commits] Commit in haskell-utf8-string/repos (testing-x86_64)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:45:57
  Author: vesa
Revision: 62712

archrelease: new repo testing-x86_64

Added:
  haskell-utf8-string/repos/testing-x86_64/



[arch-commits] Commit in haskell-utf8-string/repos (testing-x86_64)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:46:10
  Author: vesa
Revision: 62713

Initialized merge tracking via svnmerge with revisions 1-62711 from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-utf8-string/trunk

Modified:
  haskell-utf8-string/repos/testing-x86_64/ (properties)


Property changes on: haskell-utf8-string/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /haskell-utf8-string/trunk:1-62711



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:46:25
  Author: vesa
Revision: 62714

archrelease: new repo testing-x86_64

Added:
  haskell-mtl/repos/testing-x86_64/



[arch-commits] Commit in haskell-hashed-storage/repos (testing-x86_64)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:48:11
  Author: vesa
Revision: 62716

archrelease: new repo testing-x86_64

Added:
  haskell-hashed-storage/repos/testing-x86_64/



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:53:03
  Author: vesa
Revision: 62718

archrelease: new repo testing-x86_64

Added:
  haskell-html/repos/testing-x86_64/



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 08:53:16
  Author: vesa
Revision: 62719

Initialized merge tracking via svnmerge with revisions 1-62717 from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-html/trunk

Modified:
  haskell-html/repos/testing-x86_64/(properties)


Property changes on: haskell-html/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /haskell-html/trunk:1-62717



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 09:13:30
  Author: vesa
Revision: 62723

Initialized merge tracking via svnmerge with revisions 1-62721 from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-network/trunk

Modified:
  haskell-network/repos/testing-x86_64/ (properties)


Property changes on: haskell-network/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /haskell-network/trunk:1-62721



[arch-commits] Commit in haskell-regex-base/repos (testing-x86_64)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 09:14:05
  Author: vesa
Revision: 62724

archrelease: new repo testing-x86_64

Added:
  haskell-regex-base/repos/testing-x86_64/



[arch-commits] Commit in haskell-regex-base/repos (testing-x86_64)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 09:14:17
  Author: vesa
Revision: 62725

Initialized merge tracking via svnmerge with revisions 1-62723 from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-regex-base/trunk

Modified:
  haskell-regex-base/repos/testing-x86_64/  (properties)


Property changes on: haskell-regex-base/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /haskell-regex-base/trunk:1-62723



[arch-commits] Commit in haskell-regex-compat/repos (testing-x86_64)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 09:15:18
  Author: vesa
Revision: 62728

archrelease: new repo testing-x86_64

Added:
  haskell-regex-compat/repos/testing-x86_64/



[arch-commits] Commit in haskell-regex-compat/repos (testing-x86_64)

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 09:15:30
  Author: vesa
Revision: 62729

Initialized merge tracking via svnmerge with revisions 1-62727 from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-regex-compat/trunk

Modified:
  haskell-regex-compat/repos/testing-x86_64/(properties)


Property changes on: haskell-regex-compat/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /haskell-regex-compat/trunk:1-62727



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 09:21:04
  Author: vesa
Revision: 62730

remove dep that is in ghc

Modified:
  haskell-haskeline/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 14:15:30 UTC (rev 62729)
+++ PKGBUILD2010-01-11 14:21:04 UTC (rev 62730)
@@ -8,7 +8,7 @@
 url=http://hackage.haskell.org/cgi-bin/hackage-scripts/package/haskeline;
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=6.12.1' 'haskell-extensible-exceptions' 'haskell-utf8-string' sh)
+depends=('ghc=6.12.1' 'haskell-utf8-string' sh)
 options=('strip')
 
source=(http://hackage.haskell.org/packages/archive/haskeline/$pkgver/haskeline-$pkgver.tar.gz)
 install=haskell-haskeline.install



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 09:21:17
  Author: vesa
Revision: 62731

archrelease: new repo testing-x86_64

Added:
  haskell-haskeline/repos/testing-x86_64/



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Monday, January 11, 2010 @ 09:21:28
  Author: vesa
Revision: 62732

Initialized merge tracking via svnmerge with revisions 1-62730 from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-haskeline/trunk

Modified:
  haskell-haskeline/repos/testing-x86_64/   (properties)


Property changes on: haskell-haskeline/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /haskell-haskeline/trunk:1-62730



[arch-commits] Commit in virtuoso/kde-unstable (PKGBUILD)

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 09:56:36
  Author: pierre
Revision: 62733

fix build

Modified:
  virtuoso/kde-unstable/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 14:21:28 UTC (rev 62732)
+++ PKGBUILD2010-01-11 14:56:36 UTC (rev 62733)
@@ -4,19 +4,19 @@
 
 pkgname=virtuoso
 pkgver=6.0.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
-pkgdesc=A scalable cross-platform server that combines SQL/RDF/XML Data 
Management with Web Application Server and Web Services Platform functionality
-url=http://virtuoso.openlinksw.com/wiki/main/Main/;
+pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data 
Management with Web Application Server and Web Services Platform functionality'
+url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
-depends=('libxml2' 'zlib' 'libldap' 'readline' 'iodbc')
+depends=('libldap' 'iodbc')
 makedepends=('bison' 'flex')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/virtuoso/$pkgname-opensource-$pkgver.tar.gz;)
+source=(http://downloads.sourceforge.net/virtuoso/${pkgname}-opensource-${pkgver}.tar.gz;)
 md5sums=('39b68d6c958ad36622ba4476e1ea5fd0')
 
 build() {
-  cd $srcdir/$pkgname-opensource-$pkgver
+  cd $srcdir/${pkgname}-opensource-${pkgver}
 
   ./configure --prefix=/usr \
 --localstatedir=/var \
@@ -25,13 +25,14 @@
 --disable-hslookup \
 --disable-all-vads || return 1
   make || return 1
+}
 
+package() {
   # install server
-  cd ${srcdir}/${pkgbase}-${pkgver}/binsrc/virtuoso
-  install -D ${pkgdir}/usr/lib
+  cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/virtuoso
   make DESTDIR=${pkgdir} install || return 1
 
   # install driver
-  cd ${srcdir}/${pkgbase}-${pkgver}/binsrc/driver
+  cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/driver
   make DESTDIR=${pkgdir} install || return 1
 }



[arch-commits] Commit in gtk/trunk (PKGBUILD gtk.install)

2010-01-11 Thread Eric Bélanger
Date: Monday, January 11, 2010 @ 10:30:03
  Author: eric
Revision: 62734

upgpkg: gtk 1.2.10-10
Fixed info files handling (close FS#16284), Removed texinfo depends

Modified:
  gtk/trunk/PKGBUILD
  gtk/trunk/gtk.install

-+
 PKGBUILD|8 +++-
 gtk.install |   15 ---
 2 files changed, 11 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 14:56:36 UTC (rev 62733)
+++ PKGBUILD2010-01-11 15:30:03 UTC (rev 62734)
@@ -4,17 +4,16 @@
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=9
+pkgrel=10
 pkgdesc=The GTK+ toolkit
 arch=('i686' 'x86_64')
 url=http://www.gtk.org/;
 license=('LGPL')
-depends=('libxi' 'glib' 'sh' 'texinfo')
+depends=('libxi' 'glib' 'sh')
 makedepends=('libxt')
 options=('!libtool')
 install=gtk.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz
-   aclocal-fixes.patch)
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz aclocal-fixes.patch)
 md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' 'c59d4906602d99a7468f7334b6fc3b4e')
 sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' 
'b034e33efb85d27f3f3fb082c404e3b6ea79259f')
 
@@ -31,5 +30,4 @@
 --with-xinput=xfree || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
-  rm -f ${pkgdir}/usr/share/info/dir
 }

Modified: gtk.install
===
--- gtk.install 2010-01-11 14:56:36 UTC (rev 62733)
+++ gtk.install 2010-01-11 15:30:03 UTC (rev 62734)
@@ -1,10 +1,10 @@
-infofiles=gdk.info gtk.info gtk.info-1 gtk.info-2 gtk.info-3 gtk.info-4 
gtk.info-5 gtk.info-6
+infodir=/usr/share/info
+filelist=(gdk.info.gz gtk.info.gz)
 
-info_dir=/usr/share/info
-
 post_install() {
-  for inf in ${infofiles}; do
-install-info ${info_dir}/${inf} ${info_dir}/dir
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${fileli...@]}; do
+install-info $infodir/$file $infodir/dir 2 /dev/null
   done
 }
 
@@ -13,7 +13,8 @@
 }
 
 pre_remove() {
-  for inf in ${infofiles}; do
-install-info --delete ${info_dir}/${inf} ${info_dir}/dir
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${fileli...@]}; do
+install-info --delete $infodir/$file $infodir/dir 2 /dev/null
   done
 }



[arch-commits] Commit in gtk/repos (3 files)

2010-01-11 Thread Eric Bélanger
Date: Monday, January 11, 2010 @ 10:30:23
  Author: eric
Revision: 62735

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


  r62734 | eric | 2010-01-11 10:30:03 -0500 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: gtk 1.2.10-10
  Fixed info files handling (close FS#16284), Removed texinfo depends


Modified:
  gtk/repos/extra-i686/ (properties)
  gtk/repos/extra-i686/PKGBUILD
  gtk/repos/extra-i686/gtk.install

-+
 PKGBUILD|8 +++-
 gtk.install |   15 ---
 2 files changed, 11 insertions(+), 12 deletions(-)


Property changes on: gtk/repos/extra-i686
___
Modified: svnmerge-integrated
   - /gtk/trunk:1-41777
   + /gtk/trunk:1-62734

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-11 15:30:03 UTC (rev 62734)
+++ extra-i686/PKGBUILD 2010-01-11 15:30:23 UTC (rev 62735)
@@ -4,17 +4,16 @@
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=9
+pkgrel=10
 pkgdesc=The GTK+ toolkit
 arch=('i686' 'x86_64')
 url=http://www.gtk.org/;
 license=('LGPL')
-depends=('libxi' 'glib' 'sh' 'texinfo')
+depends=('libxi' 'glib' 'sh')
 makedepends=('libxt')
 options=('!libtool')
 install=gtk.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz
-   aclocal-fixes.patch)
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz aclocal-fixes.patch)
 md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' 'c59d4906602d99a7468f7334b6fc3b4e')
 sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' 
'b034e33efb85d27f3f3fb082c404e3b6ea79259f')
 
@@ -31,5 +30,4 @@
 --with-xinput=xfree || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
-  rm -f ${pkgdir}/usr/share/info/dir
 }

Modified: extra-i686/gtk.install
===
--- extra-i686/gtk.install  2010-01-11 15:30:03 UTC (rev 62734)
+++ extra-i686/gtk.install  2010-01-11 15:30:23 UTC (rev 62735)
@@ -1,10 +1,10 @@
-infofiles=gdk.info gtk.info gtk.info-1 gtk.info-2 gtk.info-3 gtk.info-4 
gtk.info-5 gtk.info-6
+infodir=/usr/share/info
+filelist=(gdk.info.gz gtk.info.gz)
 
-info_dir=/usr/share/info
-
 post_install() {
-  for inf in ${infofiles}; do
-install-info ${info_dir}/${inf} ${info_dir}/dir
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${fileli...@]}; do
+install-info $infodir/$file $infodir/dir 2 /dev/null
   done
 }
 
@@ -13,7 +13,8 @@
 }
 
 pre_remove() {
-  for inf in ${infofiles}; do
-install-info --delete ${info_dir}/${inf} ${info_dir}/dir
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${fileli...@]}; do
+install-info --delete $infodir/$file $infodir/dir 2 /dev/null
   done
 }



[arch-commits] Commit in gtk/repos (3 files)

2010-01-11 Thread Eric Bélanger
Date: Monday, January 11, 2010 @ 10:31:11
  Author: eric
Revision: 62736

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


  r62734 | eric | 2010-01-11 10:30:03 -0500 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: gtk 1.2.10-10
  Fixed info files handling (close FS#16284), Removed texinfo depends


Modified:
  gtk/repos/extra-x86_64/   (properties)
  gtk/repos/extra-x86_64/PKGBUILD
  gtk/repos/extra-x86_64/gtk.install

-+
 PKGBUILD|8 +++-
 gtk.install |   15 ---
 2 files changed, 11 insertions(+), 12 deletions(-)


Property changes on: gtk/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /gtk/trunk:1-41339
   + /gtk/trunk:1-62735

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 15:30:23 UTC (rev 62735)
+++ extra-x86_64/PKGBUILD   2010-01-11 15:31:11 UTC (rev 62736)
@@ -4,17 +4,16 @@
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=9
+pkgrel=10
 pkgdesc=The GTK+ toolkit
 arch=('i686' 'x86_64')
 url=http://www.gtk.org/;
 license=('LGPL')
-depends=('libxi' 'glib' 'sh' 'texinfo')
+depends=('libxi' 'glib' 'sh')
 makedepends=('libxt')
 options=('!libtool')
 install=gtk.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz
-   aclocal-fixes.patch)
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz aclocal-fixes.patch)
 md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' 'c59d4906602d99a7468f7334b6fc3b4e')
 sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' 
'b034e33efb85d27f3f3fb082c404e3b6ea79259f')
 
@@ -31,5 +30,4 @@
 --with-xinput=xfree || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
-  rm -f ${pkgdir}/usr/share/info/dir
 }

Modified: extra-x86_64/gtk.install
===
--- extra-x86_64/gtk.install2010-01-11 15:30:23 UTC (rev 62735)
+++ extra-x86_64/gtk.install2010-01-11 15:31:11 UTC (rev 62736)
@@ -1,10 +1,10 @@
-infofiles=gdk.info gtk.info gtk.info-1 gtk.info-2 gtk.info-3 gtk.info-4 
gtk.info-5 gtk.info-6
+infodir=/usr/share/info
+filelist=(gdk.info.gz gtk.info.gz)
 
-info_dir=/usr/share/info
-
 post_install() {
-  for inf in ${infofiles}; do
-install-info ${info_dir}/${inf} ${info_dir}/dir
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${fileli...@]}; do
+install-info $infodir/$file $infodir/dir 2 /dev/null
   done
 }
 
@@ -13,7 +13,8 @@
 }
 
 pre_remove() {
-  for inf in ${infofiles}; do
-install-info --delete ${info_dir}/${inf} ${info_dir}/dir
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${fileli...@]}; do
+install-info --delete $infodir/$file $infodir/dir 2 /dev/null
   done
 }



[arch-commits] Commit in xfig/repos (3 files)

2010-01-11 Thread Eric Bélanger
Date: Monday, January 11, 2010 @ 11:58:45
  Author: eric
Revision: 62740

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


  r62738 | eric | 2010-01-11 11:56:49 -0500 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: xfig 3.2.5b-2
  Added gsfonts depends (close FS#17200)


Modified:
  xfig/repos/extra-x86_64/  (properties)
  xfig/repos/extra-x86_64/ChangeLog
  xfig/repos/extra-x86_64/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)


Property changes on: xfig/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /xfig/trunk:1-49592
   + /xfig/trunk:1-62739

Modified: extra-x86_64/ChangeLog
===
--- extra-x86_64/ChangeLog  2010-01-11 16:57:07 UTC (rev 62739)
+++ extra-x86_64/ChangeLog  2010-01-11 16:58:45 UTC (rev 62740)
@@ -1,3 +1,8 @@
+2010-01-11  Eric Belanger  e...@archlinux.org
+
+   * xfig 3.2.5b-2
+   * Added gsfonts depends (close FS#17200)
+
 2009-08-13  Eric Belanger  e...@archlinux.org
 
* xfig 3.2.5b-1

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 16:57:07 UTC (rev 62739)
+++ extra-x86_64/PKGBUILD   2010-01-11 16:58:45 UTC (rev 62740)
@@ -4,12 +4,12 @@
 
 pkgname=xfig
 pkgver=3.2.5b
-pkgrel=1
+pkgrel=2
 pkgdesc=An interactive drawing tool
 arch=('i686' 'x86_64')
 url=http://www.xfig.org;
 license=('custom')
-depends=('libpng' 'libjpeg=7' 'xaw3d=1.5E' 'libxi' 'desktop-file-utils')
+depends=('libpng' 'libjpeg=7' 'xaw3d=1.5E' 'libxi' 'desktop-file-utils' 
'gsfonts')
 makedepends=('imake')
 optdepends=('transfig: to use the frontend to convert fig files')
 options=('!makeflags' '!emptydirs' 'force')



[arch-commits] Commit in (5 files)

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 12:18:05
  Author: pierre
Revision: 62741

adding libiodbc

Added:
  libiodbc/
  libiodbc/kde-unstable/
  libiodbc/kde-unstable/PKGBUILD
  libiodbc/repos/
  libiodbc/trunk/

--+
 PKGBUILD |   34 ++
 1 file changed, 34 insertions(+)

Added: libiodbc/kde-unstable/PKGBUILD
===
--- libiodbc/kde-unstable/PKGBUILD  (rev 0)
+++ libiodbc/kde-unstable/PKGBUILD  2010-01-11 17:18:05 UTC (rev 62741)
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 4453 2009-10-23 09:11:19Z spupykin $
+# Maintainer: Pierre Schmitz pie...@archlinux.de
+# Contributor: Sergej Pupykin pupykin.s+a...@gmail.com
+
+pkgname=libiodbc
+pkgver=3.52.7
+pkgrel=2
+pkgdesc='Independent Open DataBase Connectivity for Linux'
+arch=('i686' 'x86_64')
+url='http://www.iodbc.org'
+license=('LGPL')
+depends=('sh')
+replaces=('iodbc')
+conflicts=('iodbc')
+provides=(iodbc=${pkgver})
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/iodbc/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('ddbd274cb31d65be6a78da58fc09079a')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure --prefix=/usr \
+   --disable-static \
+   --includedir=/usr/include/libiodbc \
+   --disable-gui \
+   --disable-libodbc || return 1
+   make || return 1
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install || return 1
+   rm -rf ${pkgdir}/usr/share/libiodbc/
+}



[arch-commits] Commit in soprano/kde-unstable (PKGBUILD)

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 12:47:49
  Author: pierre
Revision: 62744

adjust deps

Modified:
  soprano/kde-unstable/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 17:40:55 UTC (rev 62743)
+++ PKGBUILD2010-01-11 17:47:49 UTC (rev 62744)
@@ -4,12 +4,12 @@
 
 pkgname=soprano
 pkgver=2.3.70
-pkgrel=2
+pkgrel=3
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 
framework for RDF data'
 arch=('i686' 'x86_64')
 url='http://soprano.sourceforge.net/'
 license=('GPL' 'LGPL')
-depends=('qt' 'clucene' 'redland' 'virtuoso')
+depends=('qt' 'clucene' 'redland' 'libiodbc' 'virtuoso')
 makedepends=('cmake')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
 md5sums=('de5cf230a95fc7218425aafdfb4a5e47')



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

2010-01-11 Thread Eric Bélanger
Date: Monday, January 11, 2010 @ 12:53:30
  Author: eric
Revision: 62745

upgpkg: transfig 3.2.5c-1
Upstream update, Removed force option

Modified:
  transfig/trunk/ChangeLog
  transfig/trunk/PKGBUILD

---+
 ChangeLog |6 ++
 PKGBUILD  |7 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-01-11 17:47:49 UTC (rev 62744)
+++ ChangeLog   2010-01-11 17:53:30 UTC (rev 62745)
@@ -1,3 +1,9 @@
+2010-01-11  Eric Belanger  e...@archlinux.org
+
+   * transfig 3.2.5c-1
+   * Upstream update
+   * Removed force option
+
 2009-08-12  Eric Belanger  e...@archlinux.org
 
* transfig 3.2.5a-1

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 17:47:49 UTC (rev 62744)
+++ PKGBUILD2010-01-11 17:53:30 UTC (rev 62745)
@@ -3,7 +3,7 @@
 # Contributor: J. Santiago Hirschfeld jsantia...@yahoo.com.ar
 
 pkgname=transfig
-pkgver=3.2.5a
+pkgver=3.2.5c
 pkgrel=1
 pkgdesc=Format conversion utility that can be used with xfig
 arch=('i686' 'x86_64')
@@ -11,10 +11,9 @@
 license=('custom')
 depends=('libpng' 'libxpm')
 makedepends=('imake')
-options=('force')
 source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz 
LICENSE)
-md5sums=('c3e4259d0b5b263baa2d8d5e811b2ef1' 'a0b2ea903821c46dbc77afefc06d1aa4')
-sha1sums=('65f772a51389be2b1cfebdb1354130aa71609739' 
'b8b712871615308b8b6add92f86d218437d652f2')
+md5sums=('0cc55ed6b4ae67a3e610e501acd694f9' 'a0b2ea903821c46dbc77afefc06d1aa4')
+sha1sums=('20013b350e81400943cd91744173445d7bd4d98e' 
'b8b712871615308b8b6add92f86d218437d652f2')
 
 build() {
   cd ${srcdir}/${pkgname}.${pkgver}



[arch-commits] Commit in transfig/repos (3 files)

2010-01-11 Thread Eric Bélanger
Date: Monday, January 11, 2010 @ 12:54:19
  Author: eric
Revision: 62747

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


  r62745 | eric | 2010-01-11 12:53:30 -0500 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: transfig 3.2.5c-1
  Upstream update, Removed force option


Modified:
  transfig/repos/extra-x86_64/  (properties)
  transfig/repos/extra-x86_64/ChangeLog
  transfig/repos/extra-x86_64/PKGBUILD

---+
 ChangeLog |6 ++
 PKGBUILD  |7 +++
 2 files changed, 9 insertions(+), 4 deletions(-)


Property changes on: transfig/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /transfig/trunk:1-49590
   + /transfig/trunk:1-62746

Modified: extra-x86_64/ChangeLog
===
--- extra-x86_64/ChangeLog  2010-01-11 17:53:50 UTC (rev 62746)
+++ extra-x86_64/ChangeLog  2010-01-11 17:54:19 UTC (rev 62747)
@@ -1,3 +1,9 @@
+2010-01-11  Eric Belanger  e...@archlinux.org
+
+   * transfig 3.2.5c-1
+   * Upstream update
+   * Removed force option
+
 2009-08-12  Eric Belanger  e...@archlinux.org
 
* transfig 3.2.5a-1

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 17:53:50 UTC (rev 62746)
+++ extra-x86_64/PKGBUILD   2010-01-11 17:54:19 UTC (rev 62747)
@@ -3,7 +3,7 @@
 # Contributor: J. Santiago Hirschfeld jsantia...@yahoo.com.ar
 
 pkgname=transfig
-pkgver=3.2.5a
+pkgver=3.2.5c
 pkgrel=1
 pkgdesc=Format conversion utility that can be used with xfig
 arch=('i686' 'x86_64')
@@ -11,10 +11,9 @@
 license=('custom')
 depends=('libpng' 'libxpm')
 makedepends=('imake')
-options=('force')
 source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz 
LICENSE)
-md5sums=('c3e4259d0b5b263baa2d8d5e811b2ef1' 'a0b2ea903821c46dbc77afefc06d1aa4')
-sha1sums=('65f772a51389be2b1cfebdb1354130aa71609739' 
'b8b712871615308b8b6add92f86d218437d652f2')
+md5sums=('0cc55ed6b4ae67a3e610e501acd694f9' 'a0b2ea903821c46dbc77afefc06d1aa4')
+sha1sums=('20013b350e81400943cd91744173445d7bd4d98e' 
'b8b712871615308b8b6add92f86d218437d652f2')
 
 build() {
   cd ${srcdir}/${pkgname}.${pkgver}



[arch-commits] Commit in kdebase-runtime/kde-unstable (PKGBUILD nepomukserverrc)

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 12:56:57
  Author: pierre
Revision: 62748

nepomuk can be enabled by default again as there is no dep to java anymore

Modified:
  kdebase-runtime/kde-unstable/PKGBUILD
Deleted:
  kdebase-runtime/kde-unstable/nepomukserverrc

-+
 PKGBUILD|7 ++-
 nepomukserverrc |2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 17:54:19 UTC (rev 62747)
+++ PKGBUILD2010-01-11 17:56:57 UTC (rev 62748)
@@ -14,10 +14,8 @@
 optdepends=('htdig: to build the search index'
 'gdb: drkonq crash handler')
 install='kdebase-runtime.install'
-source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-'nepomukserverrc')
-md5sums=('1aa49251d4951c36cc148a648442aa80'
- '6505676fcc075625733e4251e0ec9d43')
+source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('1aa49251d4951c36cc148a648442aa80')
 
 build() {
cd $srcdir
@@ -38,5 +36,4 @@
make DESTDIR=$pkgdir install
rm -f ${pkgdir}/usr/share/icons/hicolor/index.theme
ln -sf /usr/lib/kde4/libexec/kdesu ${pkgdir}/usr/bin/
-   install -D -m644 ${srcdir}/nepomukserverrc 
${pkgdir}/usr/share/config/nepomukserverrc
 }

Deleted: nepomukserverrc
===
--- nepomukserverrc 2010-01-11 17:54:19 UTC (rev 62747)
+++ nepomukserverrc 2010-01-11 17:56:57 UTC (rev 62748)
@@ -1,2 +0,0 @@
-[Service-nepomukstrigiservice]
-autostart=false



[arch-commits] Commit in cdrkit/trunk (PKGBUILD glibc-2.10.patch)

2010-01-11 Thread Andrea Scarpino
Date: Monday, January 11, 2010 @ 13:21:56
  Author: andrea
Revision: 62749

upgpkg: cdrkit 1.1.10-1
upstream release

Modified:
  cdrkit/trunk/PKGBUILD
Deleted:
  cdrkit/trunk/glibc-2.10.patch

--+
 PKGBUILD |   15 ++---
 glibc-2.10.patch |  143 -
 2 files changed, 6 insertions(+), 152 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 17:56:57 UTC (rev 62748)
+++ PKGBUILD2010-01-11 18:21:56 UTC (rev 62749)
@@ -1,27 +1,24 @@
 # $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
 # Contributor: Alexander Fehr pizzapunk gmail com
 
 pkgname=cdrkit
-pkgver=1.1.9
-pkgrel=2
+pkgver=1.1.10
+pkgrel=1
 pkgdesc=Suite of programs for CD/DVD recording, ISO image creation, and audio 
CD extraction
 arch=('i686' 'x86_64')
 url=http://cdrkit.org/;
 license=('GPL2')
-depends=('libcap' 'file' 'bzip2' 'perl')
+depends=('file' 'bzip2' 'perl')
 makedepends=('cmake')
 provides=('cdrtools')
 conflicts=('cdrtools')
-source=(http://cdrkit.org/releases/$pkgname-$pkgver.tar.gz
-   'glibc-2.10.patch')
-md5sums=('cbc0647e5d85f0e8fb3a692ba1d42edd'
- '2e2c74b6b99e3043054fc5943710f3fc')
+source=(http://cdrkit.org/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('3c25505d567113c269dc6e71640646d8')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  patch -Np1 -i ${srcdir}/glibc-2.10.patch 
-
   make || return 1
   make PREFIX=$pkgdir/usr install || return 1
 

Deleted: glibc-2.10.patch
===
--- glibc-2.10.patch2010-01-11 17:56:57 UTC (rev 62748)
+++ glibc-2.10.patch2010-01-11 18:21:56 UTC (rev 62749)
@@ -1,143 +0,0 @@
-diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h
 cdrkit-1.1.9.orig/include/schily.h 2006-11-25 01:20:20.0 +0100
-+++ cdrkit-1.1.9/include/schily.h  2009-03-11 20:31:53.0 +0100
-@@ -116,7 +116,7 @@ extern int fexecl(const char *, FILE *, 
- externint fexecle(const char *, FILE *, FILE *, FILE *, const 
char *, ...);
-   /* 6th arg not const, fexecv forces av[ac] = NULL */
- externint fexecv(const char *, FILE *, FILE *, FILE *, int, char 
**);
--externint fexecve(const char *, FILE *, FILE *, FILE *, char * 
const *, 
-+externint f_execve(const char *, FILE *, FILE *, FILE *, char * 
const *, 
- char * const *);
- externint fspawnv(FILE *, FILE *, FILE *, int, char * const *);
- externint fspawnl(FILE *, FILE *, FILE *, const char *, const 
char *, ...);
-@@ -190,7 +190,7 @@ extern int schily_error(const char *, ..
- externchar*fillbytes(void *, int, char);
- externchar*findbytes(const void *, int, char);
- externint findline(const char *, char, const char *, int, char 
**, int);
--externint getline(char *, int);
-+externint get_line(char *, int);
- externint getstr(char *, int);
- externint breakline(char *, char, char **, int);
- externint getallargs(int *, char * const**, const char *, ...);
-diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c
 cdrkit-1.1.9.orig/librols/fexec.c  2008-02-25 12:14:07.0 +0100
-+++ cdrkit-1.1.9/librols/fexec.c   2009-03-11 20:31:53.0 +0100
-@@ -170,7 +170,7 @@ fexecle(name, in, out, err, va_alist)
-   } while (p != NULL);
-   va_end(args);
- 
--  ret = fexecve(name, in, out, err, av, env);
-+  ret = f_execve(name, in, out, err, av, env);
-   if (av != xav)
-   free(av);
-   return (ret);
-@@ -184,11 +184,11 @@ fexecv(name, in, out, err, ac, av)
-   char *av[];
- {
-   av[ac] = NULL;  /*  force list to be null terminated */
--  return (fexecve(name, in, out, err, av, environ));
-+  return (f_execve(name, in, out, err, av, environ));
- }
- 
- EXPORT int
--fexecve(name, in, out, err, av, env)
-+f_execve(name, in, out, err, av, env)
-   const char *name;
-   FILE *in, *out, *err;
-   char * const av[], * const env[];
-diff -puNr cdrkit-1.1.9.orig/librols/stdio/fgetline.c 
cdrkit-1.1.9/librols/stdio/fgetline.c
 cdrkit-1.1.9.orig/librols/stdio/fgetline.c 2006-09-05 10:39:04.0 
+0200
-+++ cdrkit-1.1.9/librols/stdio/fgetline.c  2009-03-11 20:31:53.0 
+0100
-@@ -76,7 +76,7 @@ fgetline(f, buf, len)
- }
- 
- EXPORT int
--getline(buf, len)
-+get_line(buf, len)
-   char*buf;
-   int len;
- {
-diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c 
cdrkit-1.1.9/libusal/scsitransp.c
 cdrkit-1.1.9.orig/libusal/scsitransp.c 2008-02-25 12:14:07.0 
+0100
-+++ cdrkit-1.1.9/libusal/scsitransp.c  2009-03-11 20:31:53.0 +0100
-@@ -301,7 +301,7 @@ usal_yes(char *msg)
- 
-   printf(%s, 

[arch-commits] Commit in cdrkit/repos (3 files)

2010-01-11 Thread Andrea Scarpino
Date: Monday, January 11, 2010 @ 13:23:11
  Author: andrea
Revision: 62750

Merged revisions 58235,62749 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cdrkit/trunk


  r58235 | andrea | 2009-11-06 14:48:02 +0100 (Fri, 06 Nov 2009) | 1 line
  
  FS#17026

  r62749 | andrea | 2010-01-11 19:21:56 +0100 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: cdrkit 1.1.10-1
  upstream release


Modified:
  cdrkit/repos/extra-i686/  (properties)
  cdrkit/repos/extra-i686/PKGBUILD
Deleted:
  cdrkit/repos/extra-i686/ChangeLog

---+
 ChangeLog |   16 
 PKGBUILD  |   15 ---
 2 files changed, 8 insertions(+), 23 deletions(-)


Property changes on: cdrkit/repos/extra-i686
___
Modified: svnmerge-integrated
   - /cdrkit/trunk:1-29718
   + /cdrkit/trunk:1-62749

Deleted: extra-i686/ChangeLog
===
--- extra-i686/ChangeLog2010-01-11 18:21:56 UTC (rev 62749)
+++ extra-i686/ChangeLog2010-01-11 18:23:11 UTC (rev 62750)
@@ -1,16 +0,0 @@
-2008-11-26  Alexander Fehr  pizzapunk gmail com
-
-  * cdrkit-1.1.9-1:
-  New upstream release.
-  Added dependency on perl.
-
-2008-07-14  Alexander Fehr  pizzapunk gmail com
-
-  * cdrkit-1.1.8-1:
-  New upstream release.
-  New maintainer.
-  Changed license to GPL2.
-  Added dependency on bzip2.
-  Removed replaces cdrtools.
-  Cleaned up cdrtools compatibility symlinks.
-  Added ChangeLog.

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-11 18:21:56 UTC (rev 62749)
+++ extra-i686/PKGBUILD 2010-01-11 18:23:11 UTC (rev 62750)
@@ -1,22 +1,23 @@
 # $Id$
-# Maintainer: Alexander Fehr pizzapunk gmail com
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Alexander Fehr pizzapunk gmail com
 
 pkgname=cdrkit
-pkgver=1.1.9
-pkgrel=2
+pkgver=1.1.10
+pkgrel=1
 pkgdesc=Suite of programs for CD/DVD recording, ISO image creation, and audio 
CD extraction
 arch=('i686' 'x86_64')
 url=http://cdrkit.org/;
 license=('GPL2')
-depends=('libcap=2.16' 'file' 'bzip2' 'perl')
+depends=('file' 'bzip2' 'perl')
 makedepends=('cmake')
 provides=('cdrtools')
 conflicts=('cdrtools')
-source=(http://cdrkit.org/releases/cdrkit-$pkgver.tar.gz)
-md5sums=('cbc0647e5d85f0e8fb3a692ba1d42edd')
+source=(http://cdrkit.org/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('3c25505d567113c269dc6e71640646d8')
 
 build() {
-  cd $srcdir/cdrkit-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   make || return 1
   make PREFIX=$pkgdir/usr install || return 1



[arch-commits] Commit in cdrdao/repos (8 files)

2010-01-11 Thread Andrea Scarpino
Date: Monday, January 11, 2010 @ 13:32:51
  Author: andrea
Revision: 62752

Merged revisions 59914,62751 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cdrdao/trunk


  r59914 | andrea | 2009-11-29 18:28:52 +0100 (Sun, 29 Nov 2009) | 1 line
  
  cleanup

  r62751 | andrea | 2010-01-11 19:31:33 +0100 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: cdrdao 1.2.3-1
  upstream release


Added:
  cdrdao/repos/extra-i686/cdrdao-1.2.3-k3b.patch
(from rev 62751, cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
Modified:
  cdrdao/repos/extra-i686/  (properties)
  cdrdao/repos/extra-i686/PKGBUILD
Deleted:
  cdrdao/repos/extra-i686/cdrdao-1.2.3-gcc44.patch
  cdrdao/repos/extra-i686/cdrdao-1.2.3-k3b.patch
  cdrdao/repos/extra-i686/cdrdao-1.2.3-pkg-config.patch
  cdrdao/repos/extra-i686/cdrdao-1.2.3-toc2cue.patch
  cdrdao/repos/extra-i686/cdrdao-1.2.3-tocparser.patch

---+
 PKGBUILD  |   43 +++-
 cdrdao-1.2.3-gcc44.patch  |   23 -
 cdrdao-1.2.3-k3b.patch|   22 ++--
 cdrdao-1.2.3-pkg-config.patch |   15 -
 cdrdao-1.2.3-toc2cue.patch|   12 ---
 cdrdao-1.2.3-tocparser.patch  |   17 ---
 6 files changed, 28 insertions(+), 104 deletions(-)


Property changes on: cdrdao/repos/extra-i686
___
Modified: svnmerge-integrated
   - /cdrdao/trunk:1-49923
   + /cdrdao/trunk:1-62751

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-11 18:31:33 UTC (rev 62751)
+++ extra-i686/PKGBUILD 2010-01-11 18:32:51 UTC (rev 62752)
@@ -1,40 +1,31 @@
 # $Id$
-# Maintainer: dorphell dorph...@archlinux.org
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: dorphell dorph...@archlinux.org
+
 pkgname=cdrdao
-pkgver=1.2.3rc2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc=Records audio/data CD-Rs in disk-at-once (DAO) mode
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url=http://cdrdao.sourceforge.net/;
 depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
-source=(ftp://ftp.archlinux.org/other/cdrdao/${pkgname}-${pkgver}.tar.bz2
-cdrdao-1.2.3-autoconf-update.patch
-cdrdao-1.2.3-gcc44.patch
-cdrdao-1.2.3-k3b.patch
-cdrdao-1.2.3-pkg-config.patch
-cdrdao-1.2.3-toc2cue.patch
-cdrdao-1.2.3-tocparser.patch)
-md5sums=('862f35eeb1c148db8bea99abb4a643fc'
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+   cdrdao-1.2.3-autoconf-update.patch
+cdrdao-1.2.3-k3b.patch)
+md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
  '8e53dfc174f7c0882194caa05e68b85e'
- '0e09ec11d6804d8db2eccaeb539f3f83'
- '696f6ca01e1eeb9b6a5be88e535d9398'
- '829ff219a1c98a0fcccd9ab3ced0cbd1'
- '6982de2c8ae02169ef5756b5ca1d03a8'
- 'e4afe12b00f686562056b66b29a7e6e4')
+ '696f6ca01e1eeb9b6a5be88e535d9398')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
   patch -Np1 -i ${srcdir}/cdrdao-1.2.3-autoconf-update.patch || return 1
-  patch -Np1 -i ${srcdir}/cdrdao-1.2.3-gcc44.patch || return 1
   patch -Np1 -i ${srcdir}/cdrdao-1.2.3-k3b.patch || return 1
-  patch -Np1 -i ${srcdir}/cdrdao-1.2.3-pkg-config.patch || return 1
-  patch -Np1 -i ${srcdir}/cdrdao-1.2.3-toc2cue.patch || return 1
-  patch -Np1 -i ${srcdir}/cdrdao-1.2.3-tocparser.patch || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
-  ./configure --prefix=/usr --with-lame || return 1
+  
+  ./configure --prefix=/usr \
+--mandir=/usr/share/man \
+--without-xdao || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install || return 1
 }

Deleted: extra-i686/cdrdao-1.2.3-gcc44.patch
===
--- extra-i686/cdrdao-1.2.3-gcc44.patch 2010-01-11 18:31:33 UTC (rev 62751)
+++ extra-i686/cdrdao-1.2.3-gcc44.patch 2010-01-11 18:32:51 UTC (rev 62752)
@@ -1,23 +0,0 @@
 cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~2008-02-17 
14:05:05.0 +0100
-+++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc 2009-04-07 09:05:41.0 
+0200
-@@ -20,6 +20,7 @@
- #include TempFileManager.h
- #include log.h
- 
-+#include stdio.h
- #include sys/types.h
- #include sys/stat.h
- #include unistd.h
 cdrdao-1.2.3rc2/dao/CdrDriver.cc~  2009-02-21 11:01:32.0 +0100
-+++ cdrdao-1.2.3rc2/dao/CdrDriver.cc   2009-04-07 09:07:14.0 +0200
-@@ -2114,8 +2114,8 @@
-   ret = 1;
- }
- else {
--  if ((caps  CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0)
--  ret = 1;
-+  if ((caps  (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0)
-+ret = 1;
- }
- break;
- 

Deleted: extra-i686/cdrdao-1.2.3-k3b.patch

[arch-commits] Commit in nfs-utils/repos (core-i686)

2010-01-11 Thread Tobias Powalowski
Date: Monday, January 11, 2010 @ 13:52:23
  Author: tpowa
Revision: 62753

db-move: nfs-utils removed by tpowa for move to core

Deleted:
  nfs-utils/repos/core-i686/



[arch-commits] Commit in nfs-utils/repos (core-i686 testing-i686)

2010-01-11 Thread Tobias Powalowski
Date: Monday, January 11, 2010 @ 13:52:24
  Author: tpowa
Revision: 62754

db-move: moved nfs-utils from [testing] to [core] (i686)

Added:
  nfs-utils/repos/core-i686/
Deleted:
  nfs-utils/repos/testing-i686/



[arch-commits] Commit in nfs-utils/repos (core-x86_64)

2010-01-11 Thread Tobias Powalowski
Date: Monday, January 11, 2010 @ 13:52:37
  Author: tpowa
Revision: 62755

db-move: nfs-utils removed by tpowa for move to core

Deleted:
  nfs-utils/repos/core-x86_64/



[arch-commits] Commit in nfs-utils/repos (core-x86_64 testing-x86_64)

2010-01-11 Thread Tobias Powalowski
Date: Monday, January 11, 2010 @ 13:52:38
  Author: tpowa
Revision: 62756

db-move: moved nfs-utils from [testing] to [core] (x86_64)

Added:
  nfs-utils/repos/core-x86_64/
Deleted:
  nfs-utils/repos/testing-x86_64/



[arch-commits] Commit in (4 files)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 14:11:46
  Author: ibiru
Revision: 62757

initial upload. needed for deluge 1.2.0

Added:
  python-mako/
  python-mako/repos/
  python-mako/trunk/
  python-mako/trunk/PKGBUILD

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

Added: python-mako/trunk/PKGBUILD
===
--- python-mako/trunk/PKGBUILD  (rev 0)
+++ python-mako/trunk/PKGBUILD  2010-01-11 19:11:46 UTC (rev 62757)
@@ -0,0 +1,20 @@
+# $Id$
+# Maintainer : Ionut Biru io...@archlinux.ro
+# Contributor: Roberto Alsina rals...@kde.org
+pkgname=python-mako
+pkgver=0.2.5
+pkgrel=1
+pkgdesc=Hyperfast and lightweight templating for the Python platform.
+arch=('any')
+url=http://www.makotemplates.org/;
+license=('custom')
+depends=('python=2.6')
+makedepends=('setuptools')
+source=(http://www.makotemplates.org/downloads/Mako-$pkgver.tar.gz)
+md5sums=('d8ca783630dc5e93970a2075532fa643')
+
+build() {
+  cd $srcdir/Mako-$pkgver
+  python setup.py install --root=$pkgdir --optimize=1 || return 1
+  install -D LICENSE $pkgdir/usr/share/licenses/python-mako/COPYING || 
return 1
+}


Property changes on: python-mako/trunk/PKGBUILD
___
Added: svn:keywords
   + Id



[arch-commits] Commit in python-mako/repos (extra-any)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 14:12:57
  Author: ibiru
Revision: 62758

archrelease: new repo extra-any

Added:
  python-mako/repos/extra-any/



[arch-commits] Commit in python-mako/repos (extra-any)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 14:13:12
  Author: ibiru
Revision: 62759

Initialized merge tracking via svnmerge with revisions 1-62757 from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/python-mako/trunk

Modified:
  python-mako/repos/extra-any/  (properties)


Property changes on: python-mako/repos/extra-any
___
Added: svnmerge-integrated
   + /python-mako/trunk:1-62757



[arch-commits] Commit in deluge/trunk (PKGBUILD deluge.install deluged deluged.conf.d)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 14:32:49
  Author: ibiru
Revision: 62760

upgpkg: deluge 1.2.0-1
update to 1.2.0, fixed running deluged daemon with deluge user, added the 
possibility to change the user in /etc/conf.d/deluged, moved dependency that 
are needed for UIs on optdepends. FS#14142 FS#15949 FS#16772

Added:
  deluge/trunk/deluged.conf.d
Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install
  deluge/trunk/deluged

+
 PKGBUILD   |   34 +++---
 deluge.install |   15 +--
 deluged|3 ++-
 deluged.conf.d |1 +
 4 files changed, 31 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 19:13:12 UTC (rev 62759)
+++ PKGBUILD2010-01-11 19:32:49 UTC (rev 62760)
@@ -2,29 +2,33 @@
 # Maintainer: Hugo Doria h...@archlinux.org
 
 pkgname=deluge
-pkgver=1.1.9
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc=A bittorrent client written with python and pygtk
 arch=('i686' 'x86_64')
 url=http://deluge-torrent.org/;
 license=('GPL3')
-depends=('pygtk' 'pyxdg' 'dbus-python' 'librsvg' 'setuptools' 
'libtorrent-rasterbar=0.14.7')
-makedepends=('subversion' 'intltool')
-optdepends=('python-chardet: used to load non-UTF8 encoded torrents')
-source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged)
-md5sums=('38b9dbf255ed9620760d546dbb757882' '6e1585bdc79243b1cd22ed9423cc4ec2')
+depends=('pyxdg' 'dbus-python' 'setuptools' 'libtorrent-rasterbar=0.14.7' 
'twisted' 'pyopenssl' 'xdg-utils')
+makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
+optdepends=('python-notify: libnotify notifications'
+   'python-chardet: needed for UIs'
+   'pygtk: needed for gtk ui'
+   'librsvg: needed for gtk ui'
+   'python-mako: needed for web ui')
+source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d)
 install=deluge.install
-
+md5sums=('13ac84e9b5b0293eccb5d89a9fc49461'
+ 'a462fc27d283ecec9bbd52b840d27262'
+ '332d23fe0d21ce92b494efd73322856c')
 build() {
 
-  cd ${srcdir}/${pkgname}-${pkgver}/
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   python setup.py build || return 1
-  python setup.py install --prefix=/usr --root=${pkgdir} || return 1
+  python setup.py install --prefix=/usr --root=${pkgdir} || return 1
 
-  install -d -m755 ${pkgdir}/srv/deluge || return 1
-  install -D -m644 deluge/data/pixmaps/deluge.svg 
${pkgdir}/usr/share/pixmaps/deluge.svg || return 1
-  install -D -m755 ${srcdir}/deluged ${pkgdir}/etc/rc.d/deluged || return 1
-
+  install -d -m755 ${pkgdir}/srv/deluge || return 1
+  install -D -m644 deluge/data/pixmaps/deluge.svg 
${pkgdir}/usr/share/pixmaps/deluge.svg || return 1
+  install -D -m755 ${srcdir}/deluged ${pkgdir}/etc/rc.d/deluged || return 1
+  install -D -m644 ${srcdir}/deluged.conf.d ${pkgdir}/etc/conf.d/deluged 
|| return 1
 }
-

Modified: deluge.install
===
--- deluge.install  2010-01-11 19:13:12 UTC (rev 62759)
+++ deluge.install  2010-01-11 19:32:49 UTC (rev 62760)
@@ -1,14 +1,14 @@
 post_install() {
-  getent group deluge /dev/null || usr/sbin/groupadd -g 125 deluge
-  getent passwd deluge /dev/null || usr/sbin/useradd -c 'Deluge user' -u 125 
-g deluge -d /srv/deluge -s /bin/false deluge 
+  getent group deluge /dev/null 21 || usr/sbin/groupadd -g 125 deluge
+  getent passwd deluge /dev/null 21 || usr/sbin/useradd -c 'Deluge user' -u 
125 -g deluge -d /srv/deluge -s /bin/bash deluge
   usr/bin/passwd -l deluge /dev/null
 
   chown deluge.deluge srv/deluge -R
+  xdg-icon-resource forceupdate --theme hicolor  /dev/null
 
 cat  _EOF
-
- Deluge's daemon is running with the deluge user. The default download 
directory is /srv/deluge/
-
+ Deluge's daemon is running default with the deluge user. The default 
download directory is /srv/deluge/.
+You can change the user by editing /etc/conf.d/deluge
 _EOF
 }
 
@@ -17,6 +17,9 @@
 }
 
 pre_remove() {
-  usr/sbin/userdel deluge  /dev/null
+  getent passwd deluge /dev/null 21  userdel deluge
+  getent group deluge /dev/null 21  groupdel deluge
+
+  xdg-icon-resource forceupdate --theme hicolor  /dev/null
 }
 

Modified: deluged
===
--- deluged 2010-01-11 19:13:12 UTC (rev 62759)
+++ deluged 2010-01-11 19:32:49 UTC (rev 62760)
@@ -2,13 +2,14 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/deluged
 
 [[ -f /var/run/deluged.pid ]]  PID=`cat /var/run/deluged.pid`
 
 case $1 in
   start)
 stat_busy Starting Deluge Daemon
-[[ -z $PID ]]  /usr/bin/deluged 21
+[[ -z $PID ]]  su -l -c /usr/bin/deluged $DELUGE_USER
 if [ $? -gt 0 ]; then
   stat_fail
 else

Added: deluged.conf.d
===
--- deluged.conf.d   

[arch-commits] Commit in deluge/repos (5 files)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 14:33:38
  Author: ibiru
Revision: 62761

Merged revisions 61075,62760 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/deluge/trunk


  r61075 | ibiru | 2009-12-11 00:20:20 +0200 (Fri, 11 Dec 2009) | 1 line
  
  clean up dependency FS#17458

  r62760 | ibiru | 2010-01-11 21:32:49 +0200 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: deluge 1.2.0-1
  update to 1.2.0, fixed running deluged daemon with deluge user, added the 
possibility to change the user in /etc/conf.d/deluged, moved dependency that 
are needed for UIs on optdepends. FS#14142 FS#15949 FS#16772


Added:
  deluge/repos/extra-i686/deluged.conf.d
(from rev 62760, deluge/trunk/deluged.conf.d)
Modified:
  deluge/repos/extra-i686/  (properties)
  deluge/repos/extra-i686/PKGBUILD
  deluge/repos/extra-i686/deluge.install
  deluge/repos/extra-i686/deluged

+
 PKGBUILD   |   35 +++
 deluge.install |   15 +--
 deluged|3 ++-
 deluged.conf.d |1 +
 4 files changed, 31 insertions(+), 23 deletions(-)


Property changes on: deluge/repos/extra-i686
___
Modified: svnmerge-integrated
   - /deluge/trunk:1-60658
   + /deluge/trunk:1-62760

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-11 19:32:49 UTC (rev 62760)
+++ extra-i686/PKGBUILD 2010-01-11 19:33:38 UTC (rev 62761)
@@ -2,30 +2,33 @@
 # Maintainer: Hugo Doria h...@archlinux.org
 
 pkgname=deluge
-pkgver=1.1.9
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc=A bittorrent client written with python and pygtk
 arch=('i686' 'x86_64')
 url=http://deluge-torrent.org/;
 license=('GPL3')
-depends=('pygtk' 'boost=1.41.0' 'pyxdg' 'dbus-python' 'librsvg'
-'setuptools' 'libtorrent-rasterbar=0.14.7')
-makedepends=('subversion' 'intltool')
-optdepends=('python-chardet: used to load non-UTF8 encoded torrents')
-source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged)
-md5sums=('38b9dbf255ed9620760d546dbb757882' '6e1585bdc79243b1cd22ed9423cc4ec2')
+depends=('pyxdg' 'dbus-python' 'setuptools' 'libtorrent-rasterbar=0.14.7' 
'twisted' 'pyopenssl' 'xdg-utils')
+makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
+optdepends=('python-notify: libnotify notifications'
+   'python-chardet: needed for UIs'
+   'pygtk: needed for gtk ui'
+   'librsvg: needed for gtk ui'
+   'python-mako: needed for web ui')
+source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d)
 install=deluge.install
-
+md5sums=('13ac84e9b5b0293eccb5d89a9fc49461'
+ 'a462fc27d283ecec9bbd52b840d27262'
+ '332d23fe0d21ce92b494efd73322856c')
 build() {
 
-  cd ${srcdir}/${pkgname}-${pkgver}/
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   python setup.py build || return 1
-  python setup.py install --prefix=/usr --root=${pkgdir} || return 1
+  python setup.py install --prefix=/usr --root=${pkgdir} || return 1
 
-  install -d -m755 ${pkgdir}/srv/deluge || return 1
-  install -D -m644 deluge/data/pixmaps/deluge.svg 
${pkgdir}/usr/share/pixmaps/deluge.svg || return 1
-  install -D -m755 ${srcdir}/deluged ${pkgdir}/etc/rc.d/deluged || return 1
-
+  install -d -m755 ${pkgdir}/srv/deluge || return 1
+  install -D -m644 deluge/data/pixmaps/deluge.svg 
${pkgdir}/usr/share/pixmaps/deluge.svg || return 1
+  install -D -m755 ${srcdir}/deluged ${pkgdir}/etc/rc.d/deluged || return 1
+  install -D -m644 ${srcdir}/deluged.conf.d ${pkgdir}/etc/conf.d/deluged 
|| return 1
 }
-

Modified: extra-i686/deluge.install
===
--- extra-i686/deluge.install   2010-01-11 19:32:49 UTC (rev 62760)
+++ extra-i686/deluge.install   2010-01-11 19:33:38 UTC (rev 62761)
@@ -1,14 +1,14 @@
 post_install() {
-  getent group deluge /dev/null || usr/sbin/groupadd -g 125 deluge
-  getent passwd deluge /dev/null || usr/sbin/useradd -c 'Deluge user' -u 125 
-g deluge -d /srv/deluge -s /bin/false deluge 
+  getent group deluge /dev/null 21 || usr/sbin/groupadd -g 125 deluge
+  getent passwd deluge /dev/null 21 || usr/sbin/useradd -c 'Deluge user' -u 
125 -g deluge -d /srv/deluge -s /bin/bash deluge
   usr/bin/passwd -l deluge /dev/null
 
   chown deluge.deluge srv/deluge -R
+  xdg-icon-resource forceupdate --theme hicolor  /dev/null
 
 cat  _EOF
-
- Deluge's daemon is running with the deluge user. The default download 
directory is /srv/deluge/
-
+ Deluge's daemon is running default with the deluge user. The default 
download directory is /srv/deluge/.
+You can change the user by editing /etc/conf.d/deluge
 _EOF
 }
 
@@ -17,6 +17,9 @@
 }
 
 pre_remove() {
-  usr/sbin/userdel deluge  /dev/null
+  getent passwd deluge /dev/null 21  userdel deluge
+  getent group deluge /dev/null 21  groupdel deluge
+
+  

[arch-commits] Commit in deluge/repos (5 files)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 14:34:38
  Author: ibiru
Revision: 62762

Merged revisions 61075,62760 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/deluge/trunk


  r61075 | ibiru | 2009-12-11 00:20:20 +0200 (Fri, 11 Dec 2009) | 1 line
  
  clean up dependency FS#17458

  r62760 | ibiru | 2010-01-11 21:32:49 +0200 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: deluge 1.2.0-1
  update to 1.2.0, fixed running deluged daemon with deluge user, added the 
possibility to change the user in /etc/conf.d/deluged, moved dependency that 
are needed for UIs on optdepends. FS#14142 FS#15949 FS#16772


Added:
  deluge/repos/extra-x86_64/deluged.conf.d
(from rev 62760, deluge/trunk/deluged.conf.d)
Modified:
  deluge/repos/extra-x86_64/(properties)
  deluge/repos/extra-x86_64/PKGBUILD
  deluge/repos/extra-x86_64/deluge.install
  deluge/repos/extra-x86_64/deluged

+
 PKGBUILD   |   35 +++
 deluge.install |   15 +--
 deluged|3 ++-
 deluged.conf.d |1 +
 4 files changed, 31 insertions(+), 23 deletions(-)


Property changes on: deluge/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /deluge/trunk:1-60660
   + /deluge/trunk:1-62761

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 19:33:38 UTC (rev 62761)
+++ extra-x86_64/PKGBUILD   2010-01-11 19:34:38 UTC (rev 62762)
@@ -2,30 +2,33 @@
 # Maintainer: Hugo Doria h...@archlinux.org
 
 pkgname=deluge
-pkgver=1.1.9
-pkgrel=3
+pkgver=1.2.0
+pkgrel=1
 pkgdesc=A bittorrent client written with python and pygtk
 arch=('i686' 'x86_64')
 url=http://deluge-torrent.org/;
 license=('GPL3')
-depends=('pygtk' 'boost=1.41.0' 'pyxdg' 'dbus-python' 'librsvg'
-'setuptools' 'libtorrent-rasterbar=0.14.7')
-makedepends=('subversion' 'intltool')
-optdepends=('python-chardet: used to load non-UTF8 encoded torrents')
-source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged)
-md5sums=('38b9dbf255ed9620760d546dbb757882' '6e1585bdc79243b1cd22ed9423cc4ec2')
+depends=('pyxdg' 'dbus-python' 'setuptools' 'libtorrent-rasterbar=0.14.7' 
'twisted' 'pyopenssl' 'xdg-utils')
+makedepends=( 'intltool' 'pygtk' 'librsvg' 'python-mako')
+optdepends=('python-notify: libnotify notifications'
+   'python-chardet: needed for UIs'
+   'pygtk: needed for gtk ui'
+   'librsvg: needed for gtk ui'
+   'python-mako: needed for web ui')
+source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 
deluged deluged.conf.d)
 install=deluge.install
-
+md5sums=('13ac84e9b5b0293eccb5d89a9fc49461'
+ 'a462fc27d283ecec9bbd52b840d27262'
+ '332d23fe0d21ce92b494efd73322856c')
 build() {
 
-  cd ${srcdir}/${pkgname}-${pkgver}/
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   python setup.py build || return 1
-  python setup.py install --prefix=/usr --root=${pkgdir} || return 1
+  python setup.py install --prefix=/usr --root=${pkgdir} || return 1
 
-  install -d -m755 ${pkgdir}/srv/deluge || return 1
-  install -D -m644 deluge/data/pixmaps/deluge.svg 
${pkgdir}/usr/share/pixmaps/deluge.svg || return 1
-  install -D -m755 ${srcdir}/deluged ${pkgdir}/etc/rc.d/deluged || return 1
-
+  install -d -m755 ${pkgdir}/srv/deluge || return 1
+  install -D -m644 deluge/data/pixmaps/deluge.svg 
${pkgdir}/usr/share/pixmaps/deluge.svg || return 1
+  install -D -m755 ${srcdir}/deluged ${pkgdir}/etc/rc.d/deluged || return 1
+  install -D -m644 ${srcdir}/deluged.conf.d ${pkgdir}/etc/conf.d/deluged 
|| return 1
 }
-

Modified: extra-x86_64/deluge.install
===
--- extra-x86_64/deluge.install 2010-01-11 19:33:38 UTC (rev 62761)
+++ extra-x86_64/deluge.install 2010-01-11 19:34:38 UTC (rev 62762)
@@ -1,14 +1,14 @@
 post_install() {
-  getent group deluge /dev/null || usr/sbin/groupadd -g 125 deluge
-  getent passwd deluge /dev/null || usr/sbin/useradd -c 'Deluge user' -u 125 
-g deluge -d /srv/deluge -s /bin/false deluge 
+  getent group deluge /dev/null 21 || usr/sbin/groupadd -g 125 deluge
+  getent passwd deluge /dev/null 21 || usr/sbin/useradd -c 'Deluge user' -u 
125 -g deluge -d /srv/deluge -s /bin/bash deluge
   usr/bin/passwd -l deluge /dev/null
 
   chown deluge.deluge srv/deluge -R
+  xdg-icon-resource forceupdate --theme hicolor  /dev/null
 
 cat  _EOF
-
- Deluge's daemon is running with the deluge user. The default download 
directory is /srv/deluge/
-
+ Deluge's daemon is running default with the deluge user. The default 
download directory is /srv/deluge/.
+You can change the user by editing /etc/conf.d/deluge
 _EOF
 }
 
@@ -17,6 +17,9 @@
 }
 
 pre_remove() {
-  usr/sbin/userdel deluge  /dev/null
+  getent passwd deluge /dev/null 21  userdel deluge
+  getent group deluge /dev/null 21  

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

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 14:49:13
  Author: pierre
Revision: 62763

upgpkg: qtcurve-gtk2 1.0.1-1

Modified:
  qtcurve-gtk2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 19:34:38 UTC (rev 62762)
+++ PKGBUILD2010-01-11 19:49:13 UTC (rev 62763)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=qtcurve-gtk2
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -13,7 +13,7 @@
 depends=('gtk2')
 makedepends=('pkgconfig' 'cmake')
 options=('!libtool')
-md5sums=('cdbc25becfbee09cc3e5802aabe5b172')
+md5sums=('8c574b955851e79397805db95ed08b62')
 
 build() {
cd $srcdir



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

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 14:49:50
  Author: pierre
Revision: 62764

Merged revisions 62763 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/qtcurve-gtk2/trunk


  r62763 | pierre | 2010-01-11 20:49:13 +0100 (Mo, 11 Jan 2010) | 2 lines
  
  upgpkg: qtcurve-gtk2 1.0.1-1
   


Modified:
  qtcurve-gtk2/repos/extra-i686/(properties)
  qtcurve-gtk2/repos/extra-i686/PKGBUILD

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


Property changes on: qtcurve-gtk2/repos/extra-i686
___
Modified: svnmerge-integrated
   - /qtcurve-gtk2/trunk:1-62277
   + /qtcurve-gtk2/trunk:1-62763

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-11 19:49:13 UTC (rev 62763)
+++ extra-i686/PKGBUILD 2010-01-11 19:49:50 UTC (rev 62764)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=qtcurve-gtk2
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -13,7 +13,7 @@
 depends=('gtk2')
 makedepends=('pkgconfig' 'cmake')
 options=('!libtool')
-md5sums=('cdbc25becfbee09cc3e5802aabe5b172')
+md5sums=('8c574b955851e79397805db95ed08b62')
 
 build() {
cd $srcdir



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

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 14:50:37
  Author: pierre
Revision: 62765

Merged revisions 62763 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/qtcurve-gtk2/trunk


  r62763 | pierre | 2010-01-11 20:49:13 +0100 (Mo, 11 Jan 2010) | 2 lines
  
  upgpkg: qtcurve-gtk2 1.0.1-1
   


Modified:
  qtcurve-gtk2/repos/extra-x86_64/  (properties)
  qtcurve-gtk2/repos/extra-x86_64/PKGBUILD

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


Property changes on: qtcurve-gtk2/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /qtcurve-gtk2/trunk:1-62278
   + /qtcurve-gtk2/trunk:1-62764

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 19:49:50 UTC (rev 62764)
+++ extra-x86_64/PKGBUILD   2010-01-11 19:50:37 UTC (rev 62765)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=qtcurve-gtk2
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
@@ -13,7 +13,7 @@
 depends=('gtk2')
 makedepends=('pkgconfig' 'cmake')
 options=('!libtool')
-md5sums=('cdbc25becfbee09cc3e5802aabe5b172')
+md5sums=('8c574b955851e79397805db95ed08b62')
 
 build() {
cd $srcdir



[arch-commits] Commit in cdrkit/repos (3 files)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 14:54:36
  Author: ibiru
Revision: 62766

Merged revisions 58235,62749 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cdrkit/trunk


  r58235 | andrea | 2009-11-06 15:48:02 +0200 (Fri, 06 Nov 2009) | 1 line
  
  FS#17026

  r62749 | andrea | 2010-01-11 20:21:56 +0200 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: cdrkit 1.1.10-1
  upstream release


Modified:
  cdrkit/repos/extra-x86_64/(properties)
  cdrkit/repos/extra-x86_64/PKGBUILD
Deleted:
  cdrkit/repos/extra-x86_64/ChangeLog

---+
 ChangeLog |   16 
 PKGBUILD  |   15 ---
 2 files changed, 8 insertions(+), 23 deletions(-)


Property changes on: cdrkit/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /cdrkit/trunk:1-29931
   + /cdrkit/trunk:1-62765

Deleted: extra-x86_64/ChangeLog
===
--- extra-x86_64/ChangeLog  2010-01-11 19:50:37 UTC (rev 62765)
+++ extra-x86_64/ChangeLog  2010-01-11 19:54:36 UTC (rev 62766)
@@ -1,16 +0,0 @@
-2008-11-26  Alexander Fehr  pizzapunk gmail com
-
-  * cdrkit-1.1.9-1:
-  New upstream release.
-  Added dependency on perl.
-
-2008-07-14  Alexander Fehr  pizzapunk gmail com
-
-  * cdrkit-1.1.8-1:
-  New upstream release.
-  New maintainer.
-  Changed license to GPL2.
-  Added dependency on bzip2.
-  Removed replaces cdrtools.
-  Cleaned up cdrtools compatibility symlinks.
-  Added ChangeLog.

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 19:50:37 UTC (rev 62765)
+++ extra-x86_64/PKGBUILD   2010-01-11 19:54:36 UTC (rev 62766)
@@ -1,22 +1,23 @@
 # $Id$
-# Maintainer: Alexander Fehr pizzapunk gmail com
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Alexander Fehr pizzapunk gmail com
 
 pkgname=cdrkit
-pkgver=1.1.9
-pkgrel=2
+pkgver=1.1.10
+pkgrel=1
 pkgdesc=Suite of programs for CD/DVD recording, ISO image creation, and audio 
CD extraction
 arch=('i686' 'x86_64')
 url=http://cdrkit.org/;
 license=('GPL2')
-depends=('libcap=2.16' 'file' 'bzip2' 'perl')
+depends=('file' 'bzip2' 'perl')
 makedepends=('cmake')
 provides=('cdrtools')
 conflicts=('cdrtools')
-source=(http://cdrkit.org/releases/cdrkit-$pkgver.tar.gz)
-md5sums=('cbc0647e5d85f0e8fb3a692ba1d42edd')
+source=(http://cdrkit.org/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('3c25505d567113c269dc6e71640646d8')
 
 build() {
-  cd $srcdir/cdrkit-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   make || return 1
   make PREFIX=$pkgdir/usr install || return 1



[arch-commits] Commit in qtcurve-kde4/trunk (PKGBUILD build-fix.patch)

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 14:58:36
  Author: pierre
Revision: 62767

upgpkg: qtcurve-kde4 1.0.1-1

Modified:
  qtcurve-kde4/trunk/PKGBUILD
Deleted:
  qtcurve-kde4/trunk/build-fix.patch

-+
 PKGBUILD|   12 
 build-fix.patch |   11 ---
 2 files changed, 4 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 19:54:36 UTC (rev 62766)
+++ PKGBUILD2010-01-11 19:58:36 UTC (rev 62767)
@@ -2,24 +2,20 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=qtcurve-kde4
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
 license='GPL'
 pkgdesc='A configurable set of widget styles for KDE and Gtk'
 url='http://www.kde-look.org/content/show.php?content=40492'
-source=(http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2;
-'build-fix.patch')
+source=(http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2;)
 depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
-md5sums=('5552fa037d903b025309fa05fe635f8f'
- '4f6ad8d7ce2b51e4ae43a0408c4278b7')
+md5sums=('d60fff0f032bc86e6731468e37ba0226')
 
 build() {
-   cd $srcdir/QtCurve-KDE4-${pkgver}
-   patch -p1 -i $srcdir/build-fix.patch || return 1
-   cd ..
+   cd $srcdir
mkdir build
cd build
cmake ../QtCurve-KDE4-${pkgver} \

Deleted: build-fix.patch
===
--- build-fix.patch 2010-01-11 19:54:36 UTC (rev 62766)
+++ build-fix.patch 2010-01-11 19:58:36 UTC (rev 62767)
@@ -1,11 +0,0 @@
 QtCurve-KDE4-1.0.0/style/qtcurve.cpp   2010-01-04 19:19:24.0 
+0100
-+++ QtCurve-KDE4-1.0.0/style/qtcurve.cpp   2010-01-06 14:58:34.977943636 
+0100
-@@ -1113,8 +1113,6 @@
- // NOTE: This call will never actually happen, its only here so that the 
qtcurve.so
- // contains a kio link so that this is not removed by some 'optimisation' 
of the
- // link process.
--if((int)this==(int)itsHoverWidget)
--(void)KFileDialog::getSaveFileName();
- #endif
- }
- 



[arch-commits] Commit in qtcurve-kde4/repos (3 files)

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 14:59:14
  Author: pierre
Revision: 62768

Merged revisions 62767 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/qtcurve-kde4/trunk


  r62767 | pierre | 2010-01-11 20:58:36 +0100 (Mo, 11 Jan 2010) | 2 lines
  
  upgpkg: qtcurve-kde4 1.0.1-1
   


Modified:
  qtcurve-kde4/repos/extra-i686/(properties)
  qtcurve-kde4/repos/extra-i686/PKGBUILD
Deleted:
  qtcurve-kde4/repos/extra-i686/build-fix.patch

-+
 PKGBUILD|   12 
 build-fix.patch |   11 ---
 2 files changed, 4 insertions(+), 19 deletions(-)


Property changes on: qtcurve-kde4/repos/extra-i686
___
Modified: svnmerge-integrated
   - /qtcurve-kde4/trunk:1-62283
   + /qtcurve-kde4/trunk:1-62767

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-11 19:58:36 UTC (rev 62767)
+++ extra-i686/PKGBUILD 2010-01-11 19:59:14 UTC (rev 62768)
@@ -2,24 +2,20 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=qtcurve-kde4
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
 license='GPL'
 pkgdesc='A configurable set of widget styles for KDE and Gtk'
 url='http://www.kde-look.org/content/show.php?content=40492'
-source=(http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2;
-'build-fix.patch')
+source=(http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2;)
 depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
-md5sums=('5552fa037d903b025309fa05fe635f8f'
- '4f6ad8d7ce2b51e4ae43a0408c4278b7')
+md5sums=('d60fff0f032bc86e6731468e37ba0226')
 
 build() {
-   cd $srcdir/QtCurve-KDE4-${pkgver}
-   patch -p1 -i $srcdir/build-fix.patch || return 1
-   cd ..
+   cd $srcdir
mkdir build
cd build
cmake ../QtCurve-KDE4-${pkgver} \

Deleted: extra-i686/build-fix.patch
===
--- extra-i686/build-fix.patch  2010-01-11 19:58:36 UTC (rev 62767)
+++ extra-i686/build-fix.patch  2010-01-11 19:59:14 UTC (rev 62768)
@@ -1,11 +0,0 @@
 QtCurve-KDE4-1.0.0/style/qtcurve.cpp   2010-01-04 19:19:24.0 
+0100
-+++ QtCurve-KDE4-1.0.0/style/qtcurve.cpp   2010-01-06 14:58:34.977943636 
+0100
-@@ -1113,8 +1113,6 @@
- // NOTE: This call will never actually happen, its only here so that the 
qtcurve.so
- // contains a kio link so that this is not removed by some 'optimisation' 
of the
- // link process.
--if((int)this==(int)itsHoverWidget)
--(void)KFileDialog::getSaveFileName();
- #endif
- }
- 



[arch-commits] Commit in cdrdao/repos (8 files)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 14:59:25
  Author: ibiru
Revision: 62769

Merged revisions 59914,62751 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cdrdao/trunk


  r59914 | andrea | 2009-11-29 19:28:52 +0200 (Sun, 29 Nov 2009) | 1 line
  
  cleanup

  r62751 | andrea | 2010-01-11 20:31:33 +0200 (Mon, 11 Jan 2010) | 2 lines
  
  upgpkg: cdrdao 1.2.3-1
  upstream release


Added:
  cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch
(from rev 62751, cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
Modified:
  cdrdao/repos/extra-x86_64/(properties)
  cdrdao/repos/extra-x86_64/PKGBUILD
Deleted:
  cdrdao/repos/extra-x86_64/cdrdao-1.2.3-gcc44.patch
  cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch
  cdrdao/repos/extra-x86_64/cdrdao-1.2.3-pkg-config.patch
  cdrdao/repos/extra-x86_64/cdrdao-1.2.3-toc2cue.patch
  cdrdao/repos/extra-x86_64/cdrdao-1.2.3-tocparser.patch

---+
 PKGBUILD  |   43 +++-
 cdrdao-1.2.3-gcc44.patch  |   23 -
 cdrdao-1.2.3-k3b.patch|   22 ++--
 cdrdao-1.2.3-pkg-config.patch |   15 -
 cdrdao-1.2.3-toc2cue.patch|   12 ---
 cdrdao-1.2.3-tocparser.patch  |   17 ---
 6 files changed, 28 insertions(+), 104 deletions(-)


Property changes on: cdrdao/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /cdrdao/trunk:1-49838
   + /cdrdao/trunk:1-62767

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 19:59:14 UTC (rev 62768)
+++ extra-x86_64/PKGBUILD   2010-01-11 19:59:25 UTC (rev 62769)
@@ -1,40 +1,31 @@
 # $Id$
-# Maintainer: dorphell dorph...@archlinux.org
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: dorphell dorph...@archlinux.org
+
 pkgname=cdrdao
-pkgver=1.2.3rc2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc=Records audio/data CD-Rs in disk-at-once (DAO) mode
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url=http://cdrdao.sourceforge.net/;
 depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
-source=(ftp://ftp.archlinux.org/other/cdrdao/${pkgname}-${pkgver}.tar.bz2
-cdrdao-1.2.3-autoconf-update.patch
-cdrdao-1.2.3-gcc44.patch
-cdrdao-1.2.3-k3b.patch
-cdrdao-1.2.3-pkg-config.patch
-cdrdao-1.2.3-toc2cue.patch
-cdrdao-1.2.3-tocparser.patch)
-md5sums=('862f35eeb1c148db8bea99abb4a643fc'
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+   cdrdao-1.2.3-autoconf-update.patch
+cdrdao-1.2.3-k3b.patch)
+md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
  '8e53dfc174f7c0882194caa05e68b85e'
- '0e09ec11d6804d8db2eccaeb539f3f83'
- '696f6ca01e1eeb9b6a5be88e535d9398'
- '829ff219a1c98a0fcccd9ab3ced0cbd1'
- '6982de2c8ae02169ef5756b5ca1d03a8'
- 'e4afe12b00f686562056b66b29a7e6e4')
+ '696f6ca01e1eeb9b6a5be88e535d9398')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
   patch -Np1 -i ${srcdir}/cdrdao-1.2.3-autoconf-update.patch || return 1
-  patch -Np1 -i ${srcdir}/cdrdao-1.2.3-gcc44.patch || return 1
   patch -Np1 -i ${srcdir}/cdrdao-1.2.3-k3b.patch || return 1
-  patch -Np1 -i ${srcdir}/cdrdao-1.2.3-pkg-config.patch || return 1
-  patch -Np1 -i ${srcdir}/cdrdao-1.2.3-toc2cue.patch || return 1
-  patch -Np1 -i ${srcdir}/cdrdao-1.2.3-tocparser.patch || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
-  ./configure --prefix=/usr --with-lame || return 1
+  
+  ./configure --prefix=/usr \
+--mandir=/usr/share/man \
+--without-xdao || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install || return 1
 }

Deleted: extra-x86_64/cdrdao-1.2.3-gcc44.patch
===
--- extra-x86_64/cdrdao-1.2.3-gcc44.patch   2010-01-11 19:59:14 UTC (rev 
62768)
+++ extra-x86_64/cdrdao-1.2.3-gcc44.patch   2010-01-11 19:59:25 UTC (rev 
62769)
@@ -1,23 +0,0 @@
 cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~2008-02-17 
14:05:05.0 +0100
-+++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc 2009-04-07 09:05:41.0 
+0200
-@@ -20,6 +20,7 @@
- #include TempFileManager.h
- #include log.h
- 
-+#include stdio.h
- #include sys/types.h
- #include sys/stat.h
- #include unistd.h
 cdrdao-1.2.3rc2/dao/CdrDriver.cc~  2009-02-21 11:01:32.0 +0100
-+++ cdrdao-1.2.3rc2/dao/CdrDriver.cc   2009-04-07 09:07:14.0 +0200
-@@ -2114,8 +2114,8 @@
-   ret = 1;
- }
- else {
--  if ((caps  CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0)
--  ret = 1;
-+  if ((caps  (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0)
-+ret = 1;
- }
- 

[arch-commits] Commit in qtcurve-kde4/repos (3 files)

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 15:00:07
  Author: pierre
Revision: 62770

Merged revisions 62767 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/qtcurve-kde4/trunk


  r62767 | pierre | 2010-01-11 20:58:36 +0100 (Mo, 11 Jan 2010) | 2 lines
  
  upgpkg: qtcurve-kde4 1.0.1-1
   


Modified:
  qtcurve-kde4/repos/extra-x86_64/  (properties)
  qtcurve-kde4/repos/extra-x86_64/PKGBUILD
Deleted:
  qtcurve-kde4/repos/extra-x86_64/build-fix.patch

-+
 PKGBUILD|   12 
 build-fix.patch |   11 ---
 2 files changed, 4 insertions(+), 19 deletions(-)


Property changes on: qtcurve-kde4/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /qtcurve-kde4/trunk:1-62284
   + /qtcurve-kde4/trunk:1-62769

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 19:59:25 UTC (rev 62769)
+++ extra-x86_64/PKGBUILD   2010-01-11 20:00:07 UTC (rev 62770)
@@ -2,24 +2,20 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=qtcurve-kde4
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 arch=('i686' 'x86_64')
 groups=('qtcurve')
 license='GPL'
 pkgdesc='A configurable set of widget styles for KDE and Gtk'
 url='http://www.kde-look.org/content/show.php?content=40492'
-source=(http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2;
-'build-fix.patch')
+source=(http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2;)
 depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
-md5sums=('5552fa037d903b025309fa05fe635f8f'
- '4f6ad8d7ce2b51e4ae43a0408c4278b7')
+md5sums=('d60fff0f032bc86e6731468e37ba0226')
 
 build() {
-   cd $srcdir/QtCurve-KDE4-${pkgver}
-   patch -p1 -i $srcdir/build-fix.patch || return 1
-   cd ..
+   cd $srcdir
mkdir build
cd build
cmake ../QtCurve-KDE4-${pkgver} \

Deleted: extra-x86_64/build-fix.patch
===
--- extra-x86_64/build-fix.patch2010-01-11 19:59:25 UTC (rev 62769)
+++ extra-x86_64/build-fix.patch2010-01-11 20:00:07 UTC (rev 62770)
@@ -1,11 +0,0 @@
 QtCurve-KDE4-1.0.0/style/qtcurve.cpp   2010-01-04 19:19:24.0 
+0100
-+++ QtCurve-KDE4-1.0.0/style/qtcurve.cpp   2010-01-06 14:58:34.977943636 
+0100
-@@ -1113,8 +1113,6 @@
- // NOTE: This call will never actually happen, its only here so that the 
qtcurve.so
- // contains a kio link so that this is not removed by some 'optimisation' 
of the
- // link process.
--if((int)this==(int)itsHoverWidget)
--(void)KFileDialog::getSaveFileName();
- #endif
- }
- 



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

2010-01-11 Thread Andrea Scarpino
Date: Monday, January 11, 2010 @ 15:39:53
  Author: andrea
Revision: 62771

upgpkg: strigi 0.7.1-1
upstream release

Modified:
  strigi/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 20:00:07 UTC (rev 62770)
+++ PKGBUILD2010-01-11 20:39:53 UTC (rev 62771)
@@ -3,16 +3,16 @@
 # Contributor: Tobias Powalowski tp...@archlinux.org
 
 pkgname=strigi
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc=Fast crawling desktop search engine with Qt4 GUI
 arch=('i686' 'x86_64')
 url=http://www.vandenoever.info/software/strigi/;
 license=('GPL2')
-depends=('qt' 'clucene' 'bzip2' 'exiv2')
+depends=('qt' 'clucene' 'bzip2' 'exiv2' 'libxml2')
 makedepends=('cmake' 'pkgconfig')
 
source=(http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('6a6b939a70725d5c77bb69eca347889d')
+md5sums=('c60147f5acd53ac5102ed0c972b279fb')
 options=('!libtool')
 
 build() {



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

2010-01-11 Thread Andrea Scarpino
Date: Monday, January 11, 2010 @ 16:08:47
  Author: andrea
Revision: 62772

upstream release

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

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


Property changes on: strigi/repos/extra-i686
___
Deleted: svnmerge-integrated
   - /strigi/trunk:1-50452

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-11 20:39:53 UTC (rev 62771)
+++ extra-i686/PKGBUILD 2010-01-11 21:08:47 UTC (rev 62772)
@@ -3,16 +3,16 @@
 # Contributor: Tobias Powalowski tp...@archlinux.org
 
 pkgname=strigi
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc=Fast crawling desktop search engine with Qt4 GUI
 arch=('i686' 'x86_64')
 url=http://www.vandenoever.info/software/strigi/;
 license=('GPL2')
-depends=('qt' 'clucene' 'bzip2' 'exiv2')
+depends=('qt' 'clucene' 'bzip2' 'exiv2' 'libxml2')
 makedepends=('cmake' 'pkgconfig')
 
source=(http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('6a6b939a70725d5c77bb69eca347889d')
+md5sums=('c60147f5acd53ac5102ed0c972b279fb')
 options=('!libtool')
 
 build() {



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

2010-01-11 Thread Pierre Schmitz
Date: Monday, January 11, 2010 @ 17:14:12
  Author: pierre
Revision: 62773

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


  r62771 | andrea | 2010-01-11 21:39:53 +0100 (Mo, 11 Jan 2010) | 2 lines
  
  upgpkg: strigi 0.7.1-1
  upstream release


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

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


Property changes on: strigi/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /strigi/trunk:1-50809
   + /strigi/trunk:1-62772

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 21:08:47 UTC (rev 62772)
+++ extra-x86_64/PKGBUILD   2010-01-11 22:14:12 UTC (rev 62773)
@@ -3,16 +3,16 @@
 # Contributor: Tobias Powalowski tp...@archlinux.org
 
 pkgname=strigi
-pkgver=0.7.0
+pkgver=0.7.1
 pkgrel=1
 pkgdesc=Fast crawling desktop search engine with Qt4 GUI
 arch=('i686' 'x86_64')
 url=http://www.vandenoever.info/software/strigi/;
 license=('GPL2')
-depends=('qt' 'clucene' 'bzip2' 'exiv2')
+depends=('qt' 'clucene' 'bzip2' 'exiv2' 'libxml2')
 makedepends=('cmake' 'pkgconfig')
 
source=(http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('6a6b939a70725d5c77bb69eca347889d')
+md5sums=('c60147f5acd53ac5102ed0c972b279fb')
 options=('!libtool')
 
 build() {



[arch-commits] Commit in seamonkey/repos (3 files)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 17:15:15
  Author: ibiru
Revision: 62775

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


  r62774 | ibiru | 2010-01-12 00:14:39 +0200 (Tue, 12 Jan 2010) | 2 lines
  
  upgpkg: seamonkey 2.0.2-1
  update to 2.0.2 and fix do a proper version patch


Modified:
  seamonkey/repos/extra-i686/   (properties)
  seamonkey/repos/extra-i686/PKGBUILD
  seamonkey/repos/extra-i686/seamonkey-appversion.patch

+
 PKGBUILD   |8 
 seamonkey-appversion.patch |   22 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)


Property changes on: seamonkey/repos/extra-i686
___
Modified: svnmerge-integrated
   - /seamonkey/trunk:1-62142
   + /seamonkey/trunk:1-62774

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-11 22:14:39 UTC (rev 62774)
+++ extra-i686/PKGBUILD 2010-01-11 22:15:15 UTC (rev 62775)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
 pkgname=seamonkey
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.0.2
+pkgrel=1
 pkgdesc=SeaMonkey internet suite
 arch=('i686' 'x86_64')
 license=('MPL')
@@ -16,8 +16,8 @@
 seamonkey.desktop
seamonkey-appversion.patch
seamonkey-2.0-lang.patch)
-md5sums=('100c67f5dc351af5b9efb02bb375db50' '6f25f3af4506a3dfdd9da2d79181c0fd'
- '448848e65efcbf1b2be2873b66b6cd48' '788091fa626317c7e226717df869aa40'
+md5sums=('54961be4d7c8f66622ad76fbff7f73f6' '6f25f3af4506a3dfdd9da2d79181c0fd'
+ '448848e65efcbf1b2be2873b66b6cd48' 'a4275fc48361c80f676e96fdb28bd74e'
  '25b6fe16ac24cd5c852213e5c1adb272')
 
 build() {

Modified: extra-i686/seamonkey-appversion.patch
===
--- extra-i686/seamonkey-appversion.patch   2010-01-11 22:14:39 UTC (rev 
62774)
+++ extra-i686/seamonkey-appversion.patch   2010-01-11 22:15:15 UTC (rev 
62775)
@@ -1,12 +1,12 @@
-diff -Nur comm-1.9.1.orig/config/autoconf.mk.in 
comm-1.9.1/config/autoconf.mk.in
 comm-1.9.1.orig/config/autoconf.mk.in  2009-12-06 17:37:33.0 
+0200
-+++ comm-1.9.1/config/autoconf.mk.in   2009-12-16 16:40:05.477454406 +0200
-@@ -54,7 +54,7 @@
- MOZ_BUILD_APP = @MOZ_BUILD_APP@
- MOZ_APP_NAME  = @MOZ_APP_NAME@
- MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
--MOZ_APP_VERSION = @MOZ_APP_VERSION@
+diff -Nur comm-1.9.1.orig/suite/installer/Makefile.in 
comm-1.9.1/suite/installer/Makefile.in
+--- comm-1.9.1.orig/suite/installer/Makefile.in2010-01-04 
23:01:34.0 +0200
 comm-1.9.1/suite/installer/Makefile.in 2010-01-11 22:38:44.0 
+0200
+@@ -42,6 +42,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
 +MOZ_APP_VERSION=2.0
- MOZ_APP_VERSION_TXT = @MOZ_APP_VERSION_TXT@
- 
- MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
++
+ NO_PKG_FILES = \
+   $(MOZ_APP_NAME)-config \
+   xpcshell* \



[arch-commits] Commit in seamonkey/repos (3 files)

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 17:16:46
  Author: ibiru
Revision: 62776

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


  r62774 | ibiru | 2010-01-12 00:14:39 +0200 (Tue, 12 Jan 2010) | 2 lines
  
  upgpkg: seamonkey 2.0.2-1
  update to 2.0.2 and fix do a proper version patch


Modified:
  seamonkey/repos/extra-x86_64/ (properties)
  seamonkey/repos/extra-x86_64/PKGBUILD
  seamonkey/repos/extra-x86_64/seamonkey-appversion.patch

+
 PKGBUILD   |8 
 seamonkey-appversion.patch |   22 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)


Property changes on: seamonkey/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /seamonkey/trunk:1-62143
   + /seamonkey/trunk:1-62775

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-11 22:15:15 UTC (rev 62775)
+++ extra-x86_64/PKGBUILD   2010-01-11 22:16:46 UTC (rev 62776)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
 pkgname=seamonkey
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.0.2
+pkgrel=1
 pkgdesc=SeaMonkey internet suite
 arch=('i686' 'x86_64')
 license=('MPL')
@@ -16,8 +16,8 @@
 seamonkey.desktop
seamonkey-appversion.patch
seamonkey-2.0-lang.patch)
-md5sums=('100c67f5dc351af5b9efb02bb375db50' '6f25f3af4506a3dfdd9da2d79181c0fd'
- '448848e65efcbf1b2be2873b66b6cd48' '788091fa626317c7e226717df869aa40'
+md5sums=('54961be4d7c8f66622ad76fbff7f73f6' '6f25f3af4506a3dfdd9da2d79181c0fd'
+ '448848e65efcbf1b2be2873b66b6cd48' 'a4275fc48361c80f676e96fdb28bd74e'
  '25b6fe16ac24cd5c852213e5c1adb272')
 
 build() {

Modified: extra-x86_64/seamonkey-appversion.patch
===
--- extra-x86_64/seamonkey-appversion.patch 2010-01-11 22:15:15 UTC (rev 
62775)
+++ extra-x86_64/seamonkey-appversion.patch 2010-01-11 22:16:46 UTC (rev 
62776)
@@ -1,12 +1,12 @@
-diff -Nur comm-1.9.1.orig/config/autoconf.mk.in 
comm-1.9.1/config/autoconf.mk.in
 comm-1.9.1.orig/config/autoconf.mk.in  2009-12-06 17:37:33.0 
+0200
-+++ comm-1.9.1/config/autoconf.mk.in   2009-12-16 16:40:05.477454406 +0200
-@@ -54,7 +54,7 @@
- MOZ_BUILD_APP = @MOZ_BUILD_APP@
- MOZ_APP_NAME  = @MOZ_APP_NAME@
- MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
--MOZ_APP_VERSION = @MOZ_APP_VERSION@
+diff -Nur comm-1.9.1.orig/suite/installer/Makefile.in 
comm-1.9.1/suite/installer/Makefile.in
+--- comm-1.9.1.orig/suite/installer/Makefile.in2010-01-04 
23:01:34.0 +0200
 comm-1.9.1/suite/installer/Makefile.in 2010-01-11 22:38:44.0 
+0200
+@@ -42,6 +42,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
 +MOZ_APP_VERSION=2.0
- MOZ_APP_VERSION_TXT = @MOZ_APP_VERSION_TXT@
- 
- MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
++
+ NO_PKG_FILES = \
+   $(MOZ_APP_NAME)-config \
+   xpcshell* \



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

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 19:32:27
  Author: ibiru
Revision: 62777

upgpkg: live-media 2010.01.11-1
fix the location of headers and libraries. that is fixing FS#15936

Modified:
  live-media/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-11 22:16:46 UTC (rev 62776)
+++ PKGBUILD2010-01-12 00:32:27 UTC (rev 62777)
@@ -3,15 +3,15 @@
 # Contributor: Gilles CHAUVIN gcn...@gmail.com
 
 pkgname=live-media
-pkgver=2009.09.28
-pkgrel=2
+pkgver=2010.01.11
+pkgrel=1
 pkgdesc=A set of C++ libraries for multimedia streaming
 arch=('i686' 'x86_64')
 license=('LGPL')
 url=http://live555.com/liveMedia;
 depends=('gcc-libs')
 source=(ftp://ftp.archlinux.org/other/live-media/live.${pkgver}.tar.gz)
-md5sums=('2a605557bbcc168e27a70358a1324279')
+md5sums=('a7c84fdb957df5f053a3092d06bb4263')
 
 build()
 {
@@ -25,8 +25,8 @@
   make || return 1
 
   for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
-mkdir -p ${pkgdir}/usr/lib/${pkgname}/${dir}
-cp -r ${dir}/*.a ${dir}/include ${pkgdir}/usr/lib/${pkgname}/${dir}
+mkdir -p ${pkgdir}/usr/lib/live/${dir}
+cp -r ${dir}/*.a ${dir}/include ${pkgdir}/usr/lib/live/${dir}
   done
 
   mkdir -p ${pkgdir}/usr/bin



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

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 19:33:01
  Author: ibiru
Revision: 62778

Merged revisions 62777 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/live-media/trunk


  r62777 | ibiru | 2010-01-12 02:32:27 +0200 (Tue, 12 Jan 2010) | 2 lines
  
  upgpkg: live-media 2010.01.11-1
  fix the location of headers and libraries. that is fixing FS#15936


Modified:
  live-media/repos/extra-i686/  (properties)
  live-media/repos/extra-i686/PKGBUILD

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


Property changes on: live-media/repos/extra-i686
___
Modified: svnmerge-integrated
   - /live-media/trunk:1-56865
   + /live-media/trunk:1-62777

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-12 00:32:27 UTC (rev 62777)
+++ extra-i686/PKGBUILD 2010-01-12 00:33:01 UTC (rev 62778)
@@ -3,15 +3,15 @@
 # Contributor: Gilles CHAUVIN gcn...@gmail.com
 
 pkgname=live-media
-pkgver=2009.09.28
-pkgrel=2
+pkgver=2010.01.11
+pkgrel=1
 pkgdesc=A set of C++ libraries for multimedia streaming
 arch=('i686' 'x86_64')
 license=('LGPL')
 url=http://live555.com/liveMedia;
 depends=('gcc-libs')
 source=(ftp://ftp.archlinux.org/other/live-media/live.${pkgver}.tar.gz)
-md5sums=('2a605557bbcc168e27a70358a1324279')
+md5sums=('a7c84fdb957df5f053a3092d06bb4263')
 
 build()
 {
@@ -25,8 +25,8 @@
   make || return 1
 
   for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
-mkdir -p ${pkgdir}/usr/lib/${pkgname}/${dir}
-cp -r ${dir}/*.a ${dir}/include ${pkgdir}/usr/lib/${pkgname}/${dir}
+mkdir -p ${pkgdir}/usr/lib/live/${dir}
+cp -r ${dir}/*.a ${dir}/include ${pkgdir}/usr/lib/live/${dir}
   done
 
   mkdir -p ${pkgdir}/usr/bin



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

2010-01-11 Thread Ionut Biru
Date: Monday, January 11, 2010 @ 19:34:03
  Author: ibiru
Revision: 62779

Merged revisions 62777 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/live-media/trunk


  r62777 | ibiru | 2010-01-12 02:32:27 +0200 (Tue, 12 Jan 2010) | 2 lines
  
  upgpkg: live-media 2010.01.11-1
  fix the location of headers and libraries. that is fixing FS#15936


Modified:
  live-media/repos/extra-x86_64/(properties)
  live-media/repos/extra-x86_64/PKGBUILD

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


Property changes on: live-media/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /live-media/trunk:1-56864
   + /live-media/trunk:1-62778

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2010-01-12 00:33:01 UTC (rev 62778)
+++ extra-x86_64/PKGBUILD   2010-01-12 00:34:03 UTC (rev 62779)
@@ -3,15 +3,15 @@
 # Contributor: Gilles CHAUVIN gcn...@gmail.com
 
 pkgname=live-media
-pkgver=2009.09.28
-pkgrel=2
+pkgver=2010.01.11
+pkgrel=1
 pkgdesc=A set of C++ libraries for multimedia streaming
 arch=('i686' 'x86_64')
 license=('LGPL')
 url=http://live555.com/liveMedia;
 depends=('gcc-libs')
 source=(ftp://ftp.archlinux.org/other/live-media/live.${pkgver}.tar.gz)
-md5sums=('2a605557bbcc168e27a70358a1324279')
+md5sums=('a7c84fdb957df5f053a3092d06bb4263')
 
 build()
 {
@@ -25,8 +25,8 @@
   make || return 1
 
   for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
-mkdir -p ${pkgdir}/usr/lib/${pkgname}/${dir}
-cp -r ${dir}/*.a ${dir}/include ${pkgdir}/usr/lib/${pkgname}/${dir}
+mkdir -p ${pkgdir}/usr/lib/live/${dir}
+cp -r ${dir}/*.a ${dir}/include ${pkgdir}/usr/lib/live/${dir}
   done
 
   mkdir -p ${pkgdir}/usr/bin



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

2010-01-11 Thread Andrea Scarpino
Date: Monday, January 11, 2010 @ 19:46:51
  Author: andrea
Revision: 62780

upgpkg: amarok 2.2.2-1
upstream release; moved some depends as optional

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-12 00:34:03 UTC (rev 62779)
+++ PKGBUILD2010-01-12 00:46:51 UTC (rev 62780)
@@ -4,18 +4,20 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.2.1.90
+pkgver=2.2.2
 pkgrel=1
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
-depends=('mysql' 'kdebase-runtime' 'libmtp' 'libgpod' 'qtscriptgenerator'
-   'taglib-extras' 'liblastfm' 'loudmouth' 'qca')
-makedepends=('pkgconfig' 'automoc4' 'cmake')
-install=amarok.install
-source=(http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('0fb6c98618c91159a26e3f2e837ef132')
+depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' 
'liblastfm' 'qca')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth')
+optdepends=(libgpod: support Apple iPod audio devices
+   libmtp: support for portable media devices
+   loudmouth: backend needed by mp3tunes for syncing)
+install=${pkgname}.install
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('c2c4ae2f2ff7154a064b554cdee557a9')
 
 build() {
cd ${srcdir}



[arch-commits] Commit in amarok/repos (3 files)

2010-01-11 Thread Andrea Scarpino
Date: Monday, January 11, 2010 @ 19:47:41
  Author: andrea
Revision: 62781

Merged revisions 61491,62422-62423,62780 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/amarok/trunk


  r61491 | andrea | 2009-12-16 21:18:44 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  upgpkg: amarok 2.2.1.90-1
  upstream beta release

  r62422 | andrea | 2010-01-08 18:27:56 +0100 (Fri, 08 Jan 2010) | 1 line
  
  cleanup

  r62423 | andrea | 2010-01-08 18:29:45 +0100 (Fri, 08 Jan 2010) | 1 line
  
  undo. I hate SVN and my stupidity

  r62780 | andrea | 2010-01-12 01:46:51 +0100 (Tue, 12 Jan 2010) | 2 lines
  
  upgpkg: amarok 2.2.2-1
  upstream release; moved some depends as optional


Modified:
  amarok/repos/extra-i686/  (properties)
  amarok/repos/extra-i686/PKGBUILD
Deleted:
  amarok/repos/extra-i686/fix-random-with-repeat.patch

--+
 PKGBUILD |   24 +---
 fix-random-with-repeat.patch |  206 -
 2 files changed, 10 insertions(+), 220 deletions(-)


Property changes on: amarok/repos/extra-i686
___
Modified: svnmerge-integrated
   - /amarok/trunk:1-59141
   + /amarok/trunk:1-62780

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-12 00:46:51 UTC (rev 62780)
+++ extra-i686/PKGBUILD 2010-01-12 00:47:41 UTC (rev 62781)
@@ -4,26 +4,22 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=1
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
-depends=('mysql=5.1.41' 'kdebase-runtime=4.3' 'libmtp=0.3.7' 
'libgpod=0.7.2'
-   'qtscriptgenerator=0.1.0' 'taglib-extras=1.0.1' 'liblastfm=0.3.0'
-   'loudmouth=1.4.3' 'qca')
-makedepends=('pkgconfig' 'automoc4' 'cmake')
-install=amarok.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-   'fix-random-with-repeat.patch')
-md5sums=('4f6f45f0c25f85f2a2a1fff169ac7193'
- '4932796051747035e67a6ff68b4ea561')
+depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' 
'liblastfm' 'qca')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth')
+optdepends=(libgpod: support Apple iPod audio devices
+   libmtp: support for portable media devices
+   loudmouth: backend needed by mp3tunes for syncing)
+install=${pkgname}.install
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('c2c4ae2f2ff7154a064b554cdee557a9')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -Np1 -i ${srcdir}/fix-random-with-repeat.patch || return 1
-
cd ${srcdir}
mkdir build
cd build

Deleted: extra-i686/fix-random-with-repeat.patch
===
--- extra-i686/fix-random-with-repeat.patch 2010-01-12 00:46:51 UTC (rev 
62780)
+++ extra-i686/fix-random-with-repeat.patch 2010-01-12 00:47:41 UTC (rev 
62781)
@@ -1,206 +0,0 @@
 amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.cpp~ 
2009-11-11 22:09:13.0 +0100
-+++ amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.cpp  
2009-11-20 13:24:12.310019258 +0100
-@@ -33,13 +33,15 @@
- Playlist::RandomTrackNavigator::RandomTrackNavigator()
- {
- m_model = Playlist::ModelStack::instance()-top();
-+
-+reset();
-+
- connect( model(), SIGNAL( insertedIds( const QListquint64 ) ),
-  this, SLOT( recvInsertedIds( const QListquint64 ) ) );
- connect( model(), SIGNAL( removedIds( const QListquint64 ) ),
-  this, SLOT( recvRemovedIds( const QListquint64 ) ) );
--connect( model(), SIGNAL( layoutChanged() ), this, SLOT( 
modelLayoutChanged() ) );
--
--reset();
-+connect( model(), SIGNAL( activeTrackChanged( const quint64 ) ),
-+ this, SLOT( recvActiveTrackChanged( const quint64 ) ) );
- }
- 
- void
-@@ -51,12 +53,6 @@
- {
- m_unplayedRows.append( t );
- }
--else
--{
--// insert a new, but played, track at a random position
--int pos = KRandom::random() % m_playedRows.size();
--m_playedRows.insert( pos, t );
--}
- }
- 
- std::random_shuffle( m_unplayedRows.begin(), m_unplayedRows.end() );
-@@ -75,7 +71,11 @@
- void
- Playlist::RandomTrackNavigator::recvActiveTrackChanged( const quint64 id )
- {
--if ( m_unplayedRows.contains( id ) )
-+if( m_replayedRows.contains( id ) )
-+{
-+m_playedRows.prepend( m_replayedRows.takeAt( m_replayedRows.indexOf( 
id ) ) );
-+}
-+else if( m_unplayedRows.contains( id ) )
- {
- m_playedRows.prepend( m_unplayedRows.takeAt( m_unplayedRows.indexOf( 
id ) ) 

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

2010-01-11 Thread Andrea Scarpino
Date: Tuesday, January 12, 2010 @ 02:09:32
  Author: andrea
Revision: 62782

db-remove: amarok removed by andrea

Deleted:
  amarok/repos/testing-i686/



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

2010-01-11 Thread Andrea Scarpino
Date: Tuesday, January 12, 2010 @ 02:09:37
  Author: andrea
Revision: 62783

db-remove: amarok removed by andrea

Deleted:
  amarok/repos/testing-x86_64/



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

2010-01-11 Thread Vesa Kaihlavirta
Date: Tuesday, January 12, 2010 @ 02:17:07
  Author: vesa
Revision: 62784

Attempt at including ghc's libs as provides

Modified:
  ghc/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-01-12 07:09:37 UTC (rev 62783)
+++ PKGBUILD2010-01-12 07:17:07 UTC (rev 62784)
@@ -2,21 +2,59 @@
 # Maintainer: Vesa Kaihlavirta v...@archlinux.org
 pkgname=ghc
 pkgver=6.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc=The Glasgow Haskell Compiler
 arch=(i686 x86_64)
 url=http://www.haskell.org/ghc/;
 license=(custom)
 depends=(gmp perl)
 makedepends=(ghc happy perl)
-provides=(haskell-cabal)
-replaces=(haskell-cabal1.6.0.3)
+provides=(haskell-array=0.3.0.0
+  haskell-bytestring=0.9.1.5
+  haskell-cabal=1.8.0.2
+  haskell-containers=0.3.0.0
+  haskell-directory=1.0.1.0   
+  haskell-extensible-exceptions=0.1.1.1
+  haskell-filepath=1.1.0.3
+  haskell-haskell98=1.0.1.1
+  haskell-hpc=0.5.0.4
+  haskell-old-locale=1.0.0.2
+  haskell-old-time=1.0.0.3
+  haskell-pretty=1.0.1.1
+  haskell-process=1.0.1.2
+  haskell-random=1.0.0.2
+  haskell-syb=0.1.0.2
+  haskell-template-haskell=2.4.0.0
+  haskell-time=1.1.4
+  haskell-unix=2.4.0.0
+  haskell-utf8-string=0.3.4
+ )
+replaces=(haskell-array0.3.0.0 
+  haskell-bytestring0.9.1.5
+  haskell-cabal1.8.0.2
+  haskell-containers0.3.0.0
+  haskell-directory1.0.1.0
+  haskell-extensible-exceptions0.1.1.1
+  haskell-filepath1.1.0.3
+  haskell-haskell981.0.1.1
+  haskell-hpc0.5.0.4
+  haskell-old-locale1.0.0.2
+  haskell-old-time1.0.0.3
+  haskell-pretty1.0.1.1
+  haskell-process1.0.1.2
+  haskell-random1.0.0.2
+  haskell-syb0.1.0.2
+  haskell-template-haskell2.4.0.0
+  haskell-time1.1.4
+  haskell-unix2.4.0.0
+  haskell-utf8-string0.3.4
+ )
+
 backup=(usr/lib/ghc-6.12.1/package.conf)
 install=(ghc.install)
 
 source=(http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src.tar.bz2; 
\
-#
http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src-extralibs.tar.bz2;
- build.mk ghc.install)
+build.mk ghc.install)
 
 build() {
   cd $srcdir/$pkgname-$pkgver