[arch-commits] Commit in haskell-zlib/repos (10 files)

Thomas Dziedzic tdziedzic at archlinux.org
Tue Oct 9 04:09:43 UTC 2012


    Date: Tuesday, October 9, 2012 @ 00:09:42
  Author: tdziedzic
Revision: 168351

db-move: moved haskell-zlib from [testing] to [extra] (i686, x86_64)

Added:
  haskell-zlib/repos/extra-i686/PKGBUILD
    (from rev 168342, haskell-zlib/repos/testing-i686/PKGBUILD)
  haskell-zlib/repos/extra-i686/haskell-zlib.install
    (from rev 168342, haskell-zlib/repos/testing-i686/haskell-zlib.install)
  haskell-zlib/repos/extra-x86_64/PKGBUILD
    (from rev 168342, haskell-zlib/repos/testing-x86_64/PKGBUILD)
  haskell-zlib/repos/extra-x86_64/haskell-zlib.install
    (from rev 168342, haskell-zlib/repos/testing-x86_64/haskell-zlib.install)
Deleted:
  haskell-zlib/repos/extra-i686/PKGBUILD
  haskell-zlib/repos/extra-i686/haskell-zlib.install
  haskell-zlib/repos/extra-x86_64/PKGBUILD
  haskell-zlib/repos/extra-x86_64/haskell-zlib.install
  haskell-zlib/repos/testing-i686/
  haskell-zlib/repos/testing-x86_64/

-----------------------------------+
 extra-i686/PKGBUILD               |   84 ++++++++++++++++++------------------
 extra-i686/haskell-zlib.install   |   36 +++++++--------
 extra-x86_64/PKGBUILD             |   84 ++++++++++++++++++------------------
 extra-x86_64/haskell-zlib.install |   36 +++++++--------
 4 files changed, 124 insertions(+), 116 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-10-09 04:09:36 UTC (rev 168350)
+++ extra-i686/PKGBUILD	2012-10-09 04:09:42 UTC (rev 168351)
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-# Package originally generated by cabal2arch 0.7.6
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.3.3
-pkgrel=4
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'zlib' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}

Copied: haskell-zlib/repos/extra-i686/PKGBUILD (from rev 168342, haskell-zlib/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-10-09 04:09:42 UTC (rev 168351)
@@ -0,0 +1,44 @@
+# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
+# Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+# Package originally generated by cabal2arch 0.7.6
+
+_hkgname=zlib
+pkgname=haskell-zlib
+pkgver=0.5.3.3
+pkgrel=5
+pkgdesc="Compression and decompression in the gzip and zlib formats"
+url="http://hackage.haskell.org/package/zlib"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.1-1' 'zlib' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install=${pkgname}.install
+md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+
+    # ghc 7.6 includes bytestring 0.10
+    sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
+
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}

Deleted: extra-i686/haskell-zlib.install
===================================================================
--- extra-i686/haskell-zlib.install	2012-10-09 04:09:36 UTC (rev 168350)
+++ extra-i686/haskell-zlib.install	2012-10-09 04:09:42 UTC (rev 168351)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}

Copied: haskell-zlib/repos/extra-i686/haskell-zlib.install (from rev 168342, haskell-zlib/repos/testing-i686/haskell-zlib.install)
===================================================================
--- extra-i686/haskell-zlib.install	                        (rev 0)
+++ extra-i686/haskell-zlib.install	2012-10-09 04:09:42 UTC (rev 168351)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-zlib
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-10-09 04:09:36 UTC (rev 168350)
+++ extra-x86_64/PKGBUILD	2012-10-09 04:09:42 UTC (rev 168351)
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-# Package originally generated by cabal2arch 0.7.6
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.3.3
-pkgrel=4
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'zlib' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}

Copied: haskell-zlib/repos/extra-x86_64/PKGBUILD (from rev 168342, haskell-zlib/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-10-09 04:09:42 UTC (rev 168351)
@@ -0,0 +1,44 @@
+# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
+# Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+# Package originally generated by cabal2arch 0.7.6
+
+_hkgname=zlib
+pkgname=haskell-zlib
+pkgver=0.5.3.3
+pkgrel=5
+pkgdesc="Compression and decompression in the gzip and zlib formats"
+url="http://hackage.haskell.org/package/zlib"
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.1-1' 'zlib' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+install=${pkgname}.install
+md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
+
+build() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+
+    # ghc 7.6 includes bytestring 0.10
+    sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
+
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/${_hkgname}-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+    runhaskell Setup copy --destdir=${pkgdir}
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+}

Deleted: extra-x86_64/haskell-zlib.install
===================================================================
--- extra-x86_64/haskell-zlib.install	2012-10-09 04:09:36 UTC (rev 168350)
+++ extra-x86_64/haskell-zlib.install	2012-10-09 04:09:42 UTC (rev 168351)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}

Copied: haskell-zlib/repos/extra-x86_64/haskell-zlib.install (from rev 168342, haskell-zlib/repos/testing-x86_64/haskell-zlib.install)
===================================================================
--- extra-x86_64/haskell-zlib.install	                        (rev 0)
+++ extra-x86_64/haskell-zlib.install	2012-10-09 04:09:42 UTC (rev 168351)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-zlib
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}




More information about the arch-commits mailing list