[arch-commits] Commit in haskell-x11/repos (10 files)
Jelle van der Waa
jelle at nymeria.archlinux.org
Fri Mar 22 18:48:44 UTC 2013
Date: Friday, March 22, 2013 @ 19:48:43
Author: jelle
Revision: 86835
fix svn conflicts
Added:
haskell-x11/repos/community-staging-i686/
haskell-x11/repos/community-staging-i686/PKGBUILD
(from rev 86834, haskell-x11/trunk/PKGBUILD)
haskell-x11/repos/community-staging-i686/hsmod.install
(from rev 86834, haskell-x11/trunk/hsmod.install)
haskell-x11/repos/community-staging-x86_64/
haskell-x11/repos/community-staging-x86_64/PKGBUILD
(from rev 86834, haskell-x11/trunk/PKGBUILD)
haskell-x11/repos/community-staging-x86_64/hsmod.install
(from rev 86834, haskell-x11/trunk/hsmod.install)
Deleted:
haskell-x11/repos/community-staging-i686/PKGBUILD
haskell-x11/repos/community-staging-i686/hsmod.install
haskell-x11/repos/community-staging-x86_64/PKGBUILD
haskell-x11/repos/community-staging-x86_64/hsmod.install
----------------------------------------+
/PKGBUILD | 82 +++++++++++++++++++++++++++++++
/hsmod.install | 36 +++++++++++++
community-staging-i686/PKGBUILD | 41 ---------------
community-staging-i686/hsmod.install | 18 ------
community-staging-x86_64/PKGBUILD | 41 ---------------
community-staging-x86_64/hsmod.install | 18 ------
6 files changed, 118 insertions(+), 118 deletions(-)
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2013-03-11 21:29:43 UTC (rev 86070)
+++ community-staging-i686/PKGBUILD 2013-03-22 18:48:43 UTC (rev 86835)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: shild <sxp at bk.ru>
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
-
-_hkgname=X11
-pkgname=haskell-x11
-pkgver=1.6.1.1
-pkgrel=1
-pkgdesc="A Haskell binding to the X11 graphics library."
-arch=(i686 x86_64)
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
-license=('custom:BSD3')
-options=('strip')
-depends=("ghc=7.6.2-1" "haskell-syb=0.3.7-2" 'libx11' 'libxinerama' 'libxrandr' 'haskell-data-default')
-conflicts=(haskell-x11-extras)
-install=hsmod.install
-source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('80638b99238f72d4cc351b4fbd7274fc')
-
-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-x11/repos/community-staging-i686/PKGBUILD (from rev 86834, haskell-x11/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-03-22 18:48:43 UTC (rev 86835)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: shild <sxp at bk.ru>
+# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+
+_hkgname=X11
+pkgname=haskell-x11
+pkgver=1.6.1.1
+pkgrel=2
+pkgdesc="A Haskell binding to the X11 graphics library."
+arch=(i686 x86_64)
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
+license=('custom:BSD3')
+options=('strip')
+depends=("ghc=7.6.2-1" "libx11" "libxinerama" "libxrandr" "haskell-data-default")
+conflicts=(haskell-x11-extras)
+install=hsmod.install
+source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
+md5sums=('80638b99238f72d4cc351b4fbd7274fc')
+
+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
+}
Deleted: community-staging-i686/hsmod.install
===================================================================
--- community-staging-i686/hsmod.install 2013-03-11 21:29:43 UTC (rev 86070)
+++ community-staging-i686/hsmod.install 2013-03-22 18:48:43 UTC (rev 86835)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-x11
-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-x11/repos/community-staging-i686/hsmod.install (from rev 86834, haskell-x11/trunk/hsmod.install)
===================================================================
--- community-staging-i686/hsmod.install (rev 0)
+++ community-staging-i686/hsmod.install 2013-03-22 18:48:43 UTC (rev 86835)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-x11
+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: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD 2013-03-11 21:29:43 UTC (rev 86070)
+++ community-staging-x86_64/PKGBUILD 2013-03-22 18:48:43 UTC (rev 86835)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: shild <sxp at bk.ru>
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
-
-_hkgname=X11
-pkgname=haskell-x11
-pkgver=1.6.1.1
-pkgrel=1
-pkgdesc="A Haskell binding to the X11 graphics library."
-arch=(i686 x86_64)
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
-license=('custom:BSD3')
-options=('strip')
-depends=("ghc=7.6.2-1" "haskell-syb=0.3.7-2" 'libx11' 'libxinerama' 'libxrandr' 'haskell-data-default')
-conflicts=(haskell-x11-extras)
-install=hsmod.install
-source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('80638b99238f72d4cc351b4fbd7274fc')
-
-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-x11/repos/community-staging-x86_64/PKGBUILD (from rev 86834, haskell-x11/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-03-22 18:48:43 UTC (rev 86835)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: shild <sxp at bk.ru>
+# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+
+_hkgname=X11
+pkgname=haskell-x11
+pkgver=1.6.1.1
+pkgrel=2
+pkgdesc="A Haskell binding to the X11 graphics library."
+arch=(i686 x86_64)
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
+license=('custom:BSD3')
+options=('strip')
+depends=("ghc=7.6.2-1" "libx11" "libxinerama" "libxrandr" "haskell-data-default")
+conflicts=(haskell-x11-extras)
+install=hsmod.install
+source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
+md5sums=('80638b99238f72d4cc351b4fbd7274fc')
+
+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
+}
Deleted: community-staging-x86_64/hsmod.install
===================================================================
--- community-staging-x86_64/hsmod.install 2013-03-11 21:29:43 UTC (rev 86070)
+++ community-staging-x86_64/hsmod.install 2013-03-22 18:48:43 UTC (rev 86835)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-x11
-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-x11/repos/community-staging-x86_64/hsmod.install (from rev 86834, haskell-x11/trunk/hsmod.install)
===================================================================
--- community-staging-x86_64/hsmod.install (rev 0)
+++ community-staging-x86_64/hsmod.install 2013-03-22 18:48:43 UTC (rev 86835)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-x11
+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