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

[Vesa Kaihlavirta]

    Date: Thursday, April 9, 2009 @ 07:13:24
  Author: vesa
Revision: 34436

Merged revisions 34169,34435 via svnmerge from 
svn+ssh://vesa@archlinux.org/srv/svn-packages/ghc/trunk

........
  r34169 | vesa | 2009-04-07 10:15:21 +0300 (Tue, 07 Apr 2009) | 2 lines
  
  deopionofy
........
  r34435 | vesa | 2009-04-09 14:12:44 +0300 (Thu, 09 Apr 2009) | 1 line
  
  upgpkg: ghc 6.10.2-2
........

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

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


Property changes on: ghc/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ghc/trunk:1-32954
   + /ghc/trunk:1-34435

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-04-09 11:12:44 UTC (rev 34435)
+++ testing-x86_64/PKGBUILD	2009-04-09 11:13:24 UTC (rev 34436)
@@ -2,22 +2,21 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 pkgname=ghc
 pkgver=6.10.2
-pkgrel=1
-pkgdesc="A state-of-the-art, open source, compiler and interactive environment for Haskell."
+pkgrel=2
+pkgdesc="The Glasgow Haskell Compiler"
 arch=(i686 x86_64)
 url="http://www.haskell.org/ghc/"
 license=("custom")
 depends=(gmp libedit)
 makedepends=(ghc happy perl)
 provides=(haskell-cabal)
+replaces=("haskell-cabal<1.6.0.3")
+install=(ghc.install)
+
 source=("http://www.haskell.org/ghc/dist/stable/dist/$pkgname-$pkgver-src.tar.bz2" \
     "http://www.haskell.org/ghc/dist/stable/dist/$pkgname-$pkgver-src-extralibs.tar.bz2"
-     build.mk)
+     build.mk ghc.install)
 
-md5sums=('243d5857e5aa5f2f86e5e4c4437973fb'
-         '9415604386ca69ebe15f1054653aefaf'
-         'a05681b982aad44cc6770bd021e35b67')
-
 build() {
   cd $startdir/src/$pkgname-$pkgver
 
@@ -29,3 +28,8 @@
 
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
 }
+
+md5sums=('243d5857e5aa5f2f86e5e4c4437973fb'
+         '9415604386ca69ebe15f1054653aefaf'
+         'a05681b982aad44cc6770bd021e35b67'
+         'd03bca6b591043c0fe996d72dd448919')