[arch-commits] Commit in (4 files)

Rémy Oudompheng remy at archlinux.org
Tue Oct 26 12:22:29 UTC 2010


    Date: Tuesday, October 26, 2010 @ 08:22:29
  Author: remy
Revision: 97082

haskell-zlib, haskell-utf8-string: documentation rebuild.

Modified:
  haskell-utf8-string/trunk/PKGBUILD
  haskell-utf8-string/trunk/haskell-utf8-string.install
  haskell-zlib/trunk/PKGBUILD
  haskell-zlib/trunk/haskell-zlib.install

-------------------------------------------------------+
 haskell-utf8-string/trunk/PKGBUILD                    |   18 +++++++++-------
 haskell-utf8-string/trunk/haskell-utf8-string.install |    5 ++++
 haskell-zlib/trunk/PKGBUILD                           |   18 +++++++++-------
 haskell-zlib/trunk/haskell-zlib.install               |    8 +++++++
 4 files changed, 35 insertions(+), 14 deletions(-)

Modified: haskell-utf8-string/trunk/PKGBUILD
===================================================================
--- haskell-utf8-string/trunk/PKGBUILD	2010-10-26 10:32:45 UTC (rev 97081)
+++ haskell-utf8-string/trunk/PKGBUILD	2010-10-26 12:22:29 UTC (rev 97082)
@@ -1,22 +1,24 @@
 # Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-# Package generated by cabal2arch 0.4.1
+# Package generated by cabal2arch 0.7.6
 pkgname=haskell-utf8-string
 pkgver=0.3.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Support for reading and writing UTF8 Strings"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/utf8-string"
+url="http://hackage.haskell.org/package/utf8-string"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=('ghc=6.12.3' sh)
 options=('strip')
-install=haskell-utf8-string.install
-source=(http://hackage.haskell.org/packages/archive/utf8-string/$pkgver/utf8-string-$pkgver.tar.gz)
+source=(http://hackage.haskell.org/packages/archive/utf8-string/${pkgver}/utf8-string-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('be8c5ef52a0824babdc89d60c1e9b600')
 
 build() {
     cd ${srcdir}/utf8-string-$pkgver
-    runhaskell Setup configure -p --enable-split-objs --enable-shared --prefix=/usr
+    runhaskell Setup configure -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
     runhaskell Setup build
+    runhaskell Setup haddock
     runhaskell Setup register   --gen-script
     runhaskell Setup unregister --gen-script
 }
@@ -25,7 +27,9 @@
     cd ${srcdir}/utf8-string-$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/utf8-string
     runhaskell Setup copy --destdir=${pkgdir}
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-md5sums=('be8c5ef52a0824babdc89d60c1e9b600')

Modified: haskell-utf8-string/trunk/haskell-utf8-string.install
===================================================================
--- haskell-utf8-string/trunk/haskell-utf8-string.install	2010-10-26 10:32:45 UTC (rev 97081)
+++ haskell-utf8-string/trunk/haskell-utf8-string.install	2010-10-26 12:22:29 UTC (rev 97082)
@@ -1,16 +1,21 @@
 HS_DIR=/usr/share/haskell/haskell-utf8-string
 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)
+}
 op=$1
 shift
 $op $*

Modified: haskell-zlib/trunk/PKGBUILD
===================================================================
--- haskell-zlib/trunk/PKGBUILD	2010-10-26 10:32:45 UTC (rev 97081)
+++ haskell-zlib/trunk/PKGBUILD	2010-10-26 12:22:29 UTC (rev 97082)
@@ -1,22 +1,24 @@
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-# Package originally generated by cabal2arch 0.4.1
+# Package originally generated by cabal2arch 0.7.6
 pkgname=haskell-zlib
-pkgrel=4
 pkgver=0.5.2.0
+pkgrel=5
 pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/zlib"
+url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 depends=(ghc=6.12.3 'zlib' sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/zlib/$pkgver/zlib-$pkgver.tar.gz)
-install=haskell-zlib.install
+source=(http://hackage.haskell.org/packages/archive/zlib/${pkgver}/zlib-${pkgver}.tar.gz)
+install=${pkgname}.install
+md5sums=('19859e241dc18ef1501a5d44d8523507')
 
 build() {
     cd ${srcdir}/zlib-$pkgver
-    runhaskell Setup configure -p --enable-split-objs --enable-shared --prefix=/usr
+    runhaskell Setup configure -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
     runhaskell Setup build
+    runhaskell Setup haddock
     runhaskell Setup register   --gen-script
     runhaskell Setup unregister --gen-script
 }
@@ -25,7 +27,9 @@
     cd ${srcdir}/zlib-$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/zlib
     runhaskell Setup copy --destdir=${pkgdir}
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-md5sums=('19859e241dc18ef1501a5d44d8523507')

Modified: haskell-zlib/trunk/haskell-zlib.install
===================================================================
--- haskell-zlib/trunk/haskell-zlib.install	2010-10-26 10:32:45 UTC (rev 97081)
+++ haskell-zlib/trunk/haskell-zlib.install	2010-10-26 12:22:29 UTC (rev 97082)
@@ -1,13 +1,21 @@
 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)
+}
+op=$1
+shift
+$op $*




More information about the arch-commits mailing list