[arch-commits] Commit in pandoc/repos (8 files)
Felix Yan
fyan at archlinux.org
Fri Apr 29 07:15:47 UTC 2016
Date: Friday, April 29, 2016 @ 09:15:47
Author: fyan
Revision: 172663
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
pandoc/repos/community-staging-i686/PKGBUILD
(from rev 172662, pandoc/trunk/PKGBUILD)
pandoc/repos/community-staging-i686/haskell-pandoc.install
(from rev 172662, pandoc/trunk/haskell-pandoc.install)
pandoc/repos/community-staging-x86_64/PKGBUILD
(from rev 172662, pandoc/trunk/PKGBUILD)
pandoc/repos/community-staging-x86_64/haskell-pandoc.install
(from rev 172662, pandoc/trunk/haskell-pandoc.install)
Deleted:
pandoc/repos/community-staging-i686/PKGBUILD
pandoc/repos/community-staging-i686/haskell-pandoc.install
pandoc/repos/community-staging-x86_64/PKGBUILD
pandoc/repos/community-staging-x86_64/haskell-pandoc.install
-------------------------------------------------+
/PKGBUILD | 144 ++++++++++++++++++++++
/haskell-pandoc.install | 36 +++++
community-staging-i686/PKGBUILD | 68 ----------
community-staging-i686/haskell-pandoc.install | 18 --
community-staging-x86_64/PKGBUILD | 68 ----------
community-staging-x86_64/haskell-pandoc.install | 18 --
6 files changed, 180 insertions(+), 172 deletions(-)
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2016-04-29 07:15:13 UTC (rev 172662)
+++ community-staging-i686/PKGBUILD 2016-04-29 07:15:47 UTC (rev 172663)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-pkgbase=pandoc
-pkgname=(pandoc haskell-pandoc)
-pkgver=1.17.0.3
-pkgrel=8
-pkgdesc="Conversion between markup formats"
-url="http://pandoc.org"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=("ghc=7.10.3" "haskell-http" "haskell-juicypixels" "haskell-sha" "haskell-aeson"
- "haskell-base64-bytestring" "haskell-blaze-html" "haskell-blaze-markup"
- "haskell-cmark" "haskell-data-default" "haskell-mtl" "haskell-extensible-exceptions"
- "haskell-filemanip" "haskell-haddock-library" "haskell-highlighting-kate"
- "haskell-hslua" "haskell-http-client" "haskell-syb" "haskell-http-client-tls"
- "haskell-http-types" "haskell-text" "haskell-texmath" "haskell-network"
- "haskell-old-time" "haskell-pandoc-types" "haskell-parsec" "haskell-random"
- "haskell-scientific" "haskell-tagsoup" "haskell-temporary" "haskell-network-uri"
- "haskell-unordered-containers" "haskell-zip-archive" "haskell-vector" "haskell-xml"
- "haskell-yaml" "haskell-zlib")
-options=('staticlibs')
-source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('7b14e1bcb78a7e2ad1e585f127be7efd20225c9f9b5131d507b376b62cd77e32')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- runhaskell Setup configure -O --enable-library-profiling --enable-shared \
- --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgname" \
- --libsubdir=\$compiler/site-local/\$pkgid \
- -f-old-locale -fnetwork-uri -fhttps -f-trypandoc -f-embed_data_files
- runhaskell Setup build
-
- runhaskell Setup haddock --hoogle --html
-
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package_pandoc() {
- depends=('gmp' 'libffi' 'zlib' 'pcre' 'cmark')
- optdepends=('pandoc-citeproc: for citation rendering with pandoc-citeproc filter'
- 'texlive-core: for pdf output')
- replaces=('pandoc-static')
- conflicts=('pandoc-static')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- runhaskell Setup copy --destdir="${pkgdir}"
- rm -r "$pkgdir"/usr/{lib,share/doc}
-}
-
-package_haskell-pandoc() {
- pkgdesc="Conversion between markup formats (docs and libraries)"
- depends=("${makedepends[@]}" 'pandoc')
- install="haskell-pandoc.install"
-
- cd "${srcdir}/${pkgbase}-${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/${pkgname}"
- runhaskell Setup copy --destdir="${pkgdir}"
- rm -r "$pkgdir"/usr/share/{pandoc,man} "$pkgdir"/usr/bin
- rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING"
-}
Copied: pandoc/repos/community-staging-i686/PKGBUILD (from rev 172662, pandoc/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-04-29 07:15:47 UTC (rev 172663)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgbase=pandoc
+pkgname=(pandoc haskell-pandoc)
+pkgver=1.17.0.3
+pkgrel=9
+pkgdesc="Conversion between markup formats"
+url="http://pandoc.org"
+license=("GPL")
+arch=('i686' 'x86_64')
+makedepends=("ghc=7.10.3" "haskell-http" "haskell-juicypixels" "haskell-sha" "haskell-aeson"
+ "haskell-base64-bytestring" "haskell-blaze-html" "haskell-blaze-markup"
+ "haskell-cmark" "haskell-data-default" "haskell-mtl" "haskell-extensible-exceptions"
+ "haskell-filemanip" "haskell-haddock-library" "haskell-highlighting-kate"
+ "haskell-hslua" "haskell-http-client" "haskell-syb" "haskell-http-client-tls"
+ "haskell-http-types" "haskell-text" "haskell-texmath" "haskell-network"
+ "haskell-old-time" "haskell-pandoc-types" "haskell-parsec" "haskell-random"
+ "haskell-scientific" "haskell-tagsoup" "haskell-temporary" "haskell-network-uri"
+ "haskell-unordered-containers" "haskell-zip-archive" "haskell-vector" "haskell-xml"
+ "haskell-yaml" "haskell-zlib")
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('7b14e1bcb78a7e2ad1e585f127be7efd20225c9f9b5131d507b376b62cd77e32')
+
+prepare() {
+ sed -i 's/data-default >= 0.4 && < 0.6,/data-default >= 0.4 \&\& < 0.7,/' ${pkgname}-${pkgver}/${pkgname}.cabal
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgname" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-old-locale -fnetwork-uri -fhttps -f-trypandoc -f-embed_data_files
+ runhaskell Setup build
+
+ runhaskell Setup haddock --hoogle --html
+
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package_pandoc() {
+ depends=('gmp' 'libffi' 'zlib' 'pcre' 'cmark')
+ optdepends=('pandoc-citeproc: for citation rendering with pandoc-citeproc filter'
+ 'texlive-core: for pdf output')
+ replaces=('pandoc-static')
+ conflicts=('pandoc-static')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+}
+
+package_haskell-pandoc() {
+ pkgdesc="Conversion between markup formats (docs and libraries)"
+ depends=("${makedepends[@]}" 'pandoc')
+ install="haskell-pandoc.install"
+
+ cd "${srcdir}/${pkgbase}-${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/${pkgname}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/share/{pandoc,man} "$pkgdir"/usr/bin
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING"
+}
Deleted: community-staging-i686/haskell-pandoc.install
===================================================================
--- community-staging-i686/haskell-pandoc.install 2016-04-29 07:15:13 UTC (rev 172662)
+++ community-staging-i686/haskell-pandoc.install 2016-04-29 07:15:47 UTC (rev 172663)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-pandoc
-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: pandoc/repos/community-staging-i686/haskell-pandoc.install (from rev 172662, pandoc/trunk/haskell-pandoc.install)
===================================================================
--- community-staging-i686/haskell-pandoc.install (rev 0)
+++ community-staging-i686/haskell-pandoc.install 2016-04-29 07:15:47 UTC (rev 172663)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-pandoc
+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 2016-04-29 07:15:13 UTC (rev 172662)
+++ community-staging-x86_64/PKGBUILD 2016-04-29 07:15:47 UTC (rev 172663)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-pkgbase=pandoc
-pkgname=(pandoc haskell-pandoc)
-pkgver=1.17.0.3
-pkgrel=8
-pkgdesc="Conversion between markup formats"
-url="http://pandoc.org"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=("ghc=7.10.3" "haskell-http" "haskell-juicypixels" "haskell-sha" "haskell-aeson"
- "haskell-base64-bytestring" "haskell-blaze-html" "haskell-blaze-markup"
- "haskell-cmark" "haskell-data-default" "haskell-mtl" "haskell-extensible-exceptions"
- "haskell-filemanip" "haskell-haddock-library" "haskell-highlighting-kate"
- "haskell-hslua" "haskell-http-client" "haskell-syb" "haskell-http-client-tls"
- "haskell-http-types" "haskell-text" "haskell-texmath" "haskell-network"
- "haskell-old-time" "haskell-pandoc-types" "haskell-parsec" "haskell-random"
- "haskell-scientific" "haskell-tagsoup" "haskell-temporary" "haskell-network-uri"
- "haskell-unordered-containers" "haskell-zip-archive" "haskell-vector" "haskell-xml"
- "haskell-yaml" "haskell-zlib")
-options=('staticlibs')
-source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('7b14e1bcb78a7e2ad1e585f127be7efd20225c9f9b5131d507b376b62cd77e32')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- runhaskell Setup configure -O --enable-library-profiling --enable-shared \
- --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgname" \
- --libsubdir=\$compiler/site-local/\$pkgid \
- -f-old-locale -fnetwork-uri -fhttps -f-trypandoc -f-embed_data_files
- runhaskell Setup build
-
- runhaskell Setup haddock --hoogle --html
-
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package_pandoc() {
- depends=('gmp' 'libffi' 'zlib' 'pcre' 'cmark')
- optdepends=('pandoc-citeproc: for citation rendering with pandoc-citeproc filter'
- 'texlive-core: for pdf output')
- replaces=('pandoc-static')
- conflicts=('pandoc-static')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- runhaskell Setup copy --destdir="${pkgdir}"
- rm -r "$pkgdir"/usr/{lib,share/doc}
-}
-
-package_haskell-pandoc() {
- pkgdesc="Conversion between markup formats (docs and libraries)"
- depends=("${makedepends[@]}" 'pandoc')
- install="haskell-pandoc.install"
-
- cd "${srcdir}/${pkgbase}-${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/${pkgname}"
- runhaskell Setup copy --destdir="${pkgdir}"
- rm -r "$pkgdir"/usr/share/{pandoc,man} "$pkgdir"/usr/bin
- rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING"
-}
Copied: pandoc/repos/community-staging-x86_64/PKGBUILD (from rev 172662, pandoc/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-04-29 07:15:47 UTC (rev 172663)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgbase=pandoc
+pkgname=(pandoc haskell-pandoc)
+pkgver=1.17.0.3
+pkgrel=9
+pkgdesc="Conversion between markup formats"
+url="http://pandoc.org"
+license=("GPL")
+arch=('i686' 'x86_64')
+makedepends=("ghc=7.10.3" "haskell-http" "haskell-juicypixels" "haskell-sha" "haskell-aeson"
+ "haskell-base64-bytestring" "haskell-blaze-html" "haskell-blaze-markup"
+ "haskell-cmark" "haskell-data-default" "haskell-mtl" "haskell-extensible-exceptions"
+ "haskell-filemanip" "haskell-haddock-library" "haskell-highlighting-kate"
+ "haskell-hslua" "haskell-http-client" "haskell-syb" "haskell-http-client-tls"
+ "haskell-http-types" "haskell-text" "haskell-texmath" "haskell-network"
+ "haskell-old-time" "haskell-pandoc-types" "haskell-parsec" "haskell-random"
+ "haskell-scientific" "haskell-tagsoup" "haskell-temporary" "haskell-network-uri"
+ "haskell-unordered-containers" "haskell-zip-archive" "haskell-vector" "haskell-xml"
+ "haskell-yaml" "haskell-zlib")
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('7b14e1bcb78a7e2ad1e585f127be7efd20225c9f9b5131d507b376b62cd77e32')
+
+prepare() {
+ sed -i 's/data-default >= 0.4 && < 0.6,/data-default >= 0.4 \&\& < 0.7,/' ${pkgname}-${pkgver}/${pkgname}.cabal
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgname" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-old-locale -fnetwork-uri -fhttps -f-trypandoc -f-embed_data_files
+ runhaskell Setup build
+
+ runhaskell Setup haddock --hoogle --html
+
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package_pandoc() {
+ depends=('gmp' 'libffi' 'zlib' 'pcre' 'cmark')
+ optdepends=('pandoc-citeproc: for citation rendering with pandoc-citeproc filter'
+ 'texlive-core: for pdf output')
+ replaces=('pandoc-static')
+ conflicts=('pandoc-static')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+}
+
+package_haskell-pandoc() {
+ pkgdesc="Conversion between markup formats (docs and libraries)"
+ depends=("${makedepends[@]}" 'pandoc')
+ install="haskell-pandoc.install"
+
+ cd "${srcdir}/${pkgbase}-${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/${pkgname}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/share/{pandoc,man} "$pkgdir"/usr/bin
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/COPYING"
+}
Deleted: community-staging-x86_64/haskell-pandoc.install
===================================================================
--- community-staging-x86_64/haskell-pandoc.install 2016-04-29 07:15:13 UTC (rev 172662)
+++ community-staging-x86_64/haskell-pandoc.install 2016-04-29 07:15:47 UTC (rev 172663)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-pandoc
-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: pandoc/repos/community-staging-x86_64/haskell-pandoc.install (from rev 172662, pandoc/trunk/haskell-pandoc.install)
===================================================================
--- community-staging-x86_64/haskell-pandoc.install (rev 0)
+++ community-staging-x86_64/haskell-pandoc.install 2016-04-29 07:15:47 UTC (rev 172663)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-pandoc
+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