Date: Friday, October 21, 2016 @ 08:16:03
Author: felixonmars
Revision: 192817
archrelease: copy trunk to community-i686, community-x86_64
Added:
stack/repos/community-i686/PKGBUILD
(from rev 192816, stack/trunk/PKGBUILD)
stack/repos/community-i686/stack.install
(from rev 192816, stack/trunk/stack.install)
stack/repos/community-x86_64/PKGBUILD
(from rev 192816, stack/trunk/PKGBUILD)
stack/repos/community-x86_64/stack.install
(from rev 192816, stack/trunk/stack.install)
Deleted:
stack/repos/community-i686/PKGBUILD
stack/repos/community-i686/stack.install
stack/repos/community-x86_64/PKGBUILD
stack/repos/community-x86_64/stack.install
--------------------------------+
/PKGBUILD | 160 +++++++++++++++++++++++++++++++++++++++
/stack.install | 8 +
community-i686/PKGBUILD | 80 -------------------
community-i686/stack.install | 4
community-x86_64/PKGBUILD | 80 -------------------
community-x86_64/stack.install | 4
6 files changed, 168 insertions(+), 168 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-10-21 08:15:35 UTC (rev 192816)
+++ community-i686/PKGBUILD 2016-10-21 08:16:03 UTC (rev 192817)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Arch Haskell Team <arch-hask...@haskell.org>
-
-pkgbase=stack
-pkgname=(stack haskell-stack)
-pkgver=1.2.0
-pkgrel=5
-pkgdesc="The Haskell Tool Stack"
-url="https://github.com/commercialhaskell/stack";
-license=("custom:BSD3")
-arch=('i686' 'x86_64')
-makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-annotated-wl-pprint"
"haskell-ansi-terminal"
- "haskell-async" "haskell-attoparsec" "haskell-base-compat"
"haskell-base16-bytestring"
- "haskell-base64-bytestring" "haskell-binary-tagged"
"haskell-blaze-builder"
- "haskell-byteable" "haskell-clock" "haskell-conduit"
"haskell-conduit-extra"
- "haskell-cryptohash" "haskell-cryptohash-conduit"
"haskell-edit-distance"
- "haskell-either" "haskell-enclosed-exceptions" "haskell-errors"
"haskell-exceptions"
- "haskell-extra" "haskell-fast-logger" "haskell-filelock"
"haskell-fsnotify"
- "haskell-generic-deriving" "haskell-gitrev" "haskell-hashable"
"haskell-hastache"
- "haskell-hit" "haskell-http-client" "haskell-http-client-tls"
"haskell-http-conduit"
- "haskell-http-types" "haskell-hpack" "haskell-lifted-async"
"haskell-lifted-base"
- "haskell-microlens" "haskell-monad-control" "haskell-monad-logger"
- "haskell-monad-unlift" "haskell-mtl" "haskell-open-browser"
- "haskell-optparse-applicative" "haskell-optparse-simple"
"haskell-path"
- "haskell-path-io" "haskell-persistent" "haskell-persistent-sqlite"
- "haskell-persistent-template" "haskell-project-template"
- "haskell-regex-applicative-text" "haskell-resourcet"
"haskell-retry" "haskell-safe"
- "haskell-semigroups" "haskell-split" "haskell-stm" "haskell-store"
- "haskell-streaming-commons" "haskell-tar" "haskell-temporary"
"haskell-text"
- "haskell-text-binary" "haskell-tls" "haskell-transformers-base"
- "haskell-unicode-transforms" "haskell-unix-compat"
"haskell-unordered-containers"
- "haskell-vector" "haskell-vector-binary-instances" "haskell-yaml"
- "haskell-zip-archive" "haskell-zlib")
-source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz";)
-sha256sums=('6a13a98413ea5f1a0642d9080892e6bcd996a17baa4d61521c0e0f3d9bb810b3')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- runhaskell Setup configure -O --enable-library-profiling --enable-shared \
- --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" \
- --libsubdir=\$compiler/site-local/\$pkgid \
- -f-disable-git-info -f-integration-tests -f-static
-f-hide-dependency-versions
- 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.*update[^ ]* |&'--force' |" register.sh
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package_stack() {
- depends=('gmp' 'libffi' 'zlib')
- optdepends=('ghc')
- install="stack.install"
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- runhaskell Setup copy --destdir="${pkgdir}"
- rm -r "$pkgdir"/usr/{lib,share/doc}
- install -D -m644 "LICENSE"
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack >
stack_completion_script
- install -Dm644 stack_completion_script
"${pkgdir}/usr/share/bash-completion/completions/stack"
-}
-
-package_haskell-stack() {
- pkgdesc="The Haskell Tool Stack (docs and libraries)"
- depends=("${makedepends[@]}" 'stack')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- install -D -m744 register.sh
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
- install -D -m744 unregister.sh
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.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/${pkgbase}"
- runhaskell Setup copy --destdir="${pkgdir}"
- rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
- rm -rf "${pkgdir}/usr/bin"
-}
Copied: stack/repos/community-i686/PKGBUILD (from rev 192816,
stack/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-10-21 08:16:03 UTC (rev 192817)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Arch Haskell Team <arch-hask...@haskell.org>
+
+pkgbase=stack
+pkgname=(stack haskell-stack)
+pkgver=1.2.0
+pkgrel=6
+pkgdesc="The Haskell Tool Stack"
+url="https://github.com/commercialhaskell/stack";
+license=("custom:BSD3")
+arch=('i686' 'x86_64')
+makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-annotated-wl-pprint"
"haskell-ansi-terminal"
+ "haskell-async" "haskell-attoparsec" "haskell-base-compat"
"haskell-base16-bytestring"
+ "haskell-base64-bytestring" "haskell-binary-tagged"
"haskell-blaze-builder"
+ "haskell-byteable" "haskell-clock" "haskell-conduit"
"haskell-conduit-extra"
+ "haskell-cryptohash" "haskell-cryptohash-conduit"
"haskell-edit-distance"
+ "haskell-either" "haskell-enclosed-exceptions" "haskell-errors"
"haskell-exceptions"
+ "haskell-extra" "haskell-fast-logger" "haskell-filelock"
"haskell-fsnotify"
+ "haskell-generic-deriving" "haskell-gitrev" "haskell-hashable"
"haskell-hastache"
+ "haskell-hit" "haskell-http-client" "haskell-http-client-tls"
"haskell-http-conduit"
+ "haskell-http-types" "haskell-hpack" "haskell-lifted-async"
"haskell-lifted-base"
+ "haskell-microlens" "haskell-monad-control" "haskell-monad-logger"
+ "haskell-monad-unlift" "haskell-mtl" "haskell-open-browser"
+ "haskell-optparse-applicative" "haskell-optparse-simple"
"haskell-path"
+ "haskell-path-io" "haskell-persistent" "haskell-persistent-sqlite"
+ "haskell-persistent-template" "haskell-project-template"
+ "haskell-regex-applicative-text" "haskell-resourcet"
"haskell-retry" "haskell-safe"
+ "haskell-semigroups" "haskell-split" "haskell-stm" "haskell-store"
+ "haskell-streaming-commons" "haskell-tar" "haskell-temporary"
"haskell-text"
+ "haskell-text-binary" "haskell-tls" "haskell-transformers-base"
+ "haskell-unicode-transforms" "haskell-unix-compat"
"haskell-unordered-containers"
+ "haskell-vector" "haskell-vector-binary-instances" "haskell-yaml"
+ "haskell-zip-archive" "haskell-zlib")
+source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz";)
+sha256sums=('6a13a98413ea5f1a0642d9080892e6bcd996a17baa4d61521c0e0f3d9bb810b3')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-disable-git-info -f-integration-tests -f-static
-f-hide-dependency-versions
+ 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.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package_stack() {
+ depends=('gmp' 'libffi' 'zlib')
+ optdepends=('ghc')
+ install="stack.install"
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+ install -D -m644 "LICENSE"
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack >
stack_completion_script
+ install -Dm644 stack_completion_script
"${pkgdir}/usr/share/bash-completion/completions/stack"
+}
+
+package_haskell-stack() {
+ pkgdesc="The Haskell Tool Stack (docs and libraries)"
+ depends=("${makedepends[@]}" 'stack')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ install -D -m744 register.sh
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.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/${pkgbase}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+ rm -rf "${pkgdir}/usr/bin"
+}
Deleted: community-i686/stack.install
===================================================================
--- community-i686/stack.install 2016-10-21 08:15:35 UTC (rev 192816)
+++ community-i686/stack.install 2016-10-21 08:16:03 UTC (rev 192817)
@@ -1,4 +0,0 @@
-post_install() {
- echo "You need to either 1) install latest stable ghc package from [extra]
or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed
by stack to work."
-}
-
Copied: stack/repos/community-i686/stack.install (from rev 192816,
stack/trunk/stack.install)
===================================================================
--- community-i686/stack.install (rev 0)
+++ community-i686/stack.install 2016-10-21 08:16:03 UTC (rev 192817)
@@ -0,0 +1,4 @@
+post_install() {
+ echo "You need to either 1) install latest stable ghc package from [extra]
or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed
by stack to work."
+}
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-10-21 08:15:35 UTC (rev 192816)
+++ community-x86_64/PKGBUILD 2016-10-21 08:16:03 UTC (rev 192817)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Arch Haskell Team <arch-hask...@haskell.org>
-
-pkgbase=stack
-pkgname=(stack haskell-stack)
-pkgver=1.2.0
-pkgrel=5
-pkgdesc="The Haskell Tool Stack"
-url="https://github.com/commercialhaskell/stack";
-license=("custom:BSD3")
-arch=('i686' 'x86_64')
-makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-annotated-wl-pprint"
"haskell-ansi-terminal"
- "haskell-async" "haskell-attoparsec" "haskell-base-compat"
"haskell-base16-bytestring"
- "haskell-base64-bytestring" "haskell-binary-tagged"
"haskell-blaze-builder"
- "haskell-byteable" "haskell-clock" "haskell-conduit"
"haskell-conduit-extra"
- "haskell-cryptohash" "haskell-cryptohash-conduit"
"haskell-edit-distance"
- "haskell-either" "haskell-enclosed-exceptions" "haskell-errors"
"haskell-exceptions"
- "haskell-extra" "haskell-fast-logger" "haskell-filelock"
"haskell-fsnotify"
- "haskell-generic-deriving" "haskell-gitrev" "haskell-hashable"
"haskell-hastache"
- "haskell-hit" "haskell-http-client" "haskell-http-client-tls"
"haskell-http-conduit"
- "haskell-http-types" "haskell-hpack" "haskell-lifted-async"
"haskell-lifted-base"
- "haskell-microlens" "haskell-monad-control" "haskell-monad-logger"
- "haskell-monad-unlift" "haskell-mtl" "haskell-open-browser"
- "haskell-optparse-applicative" "haskell-optparse-simple"
"haskell-path"
- "haskell-path-io" "haskell-persistent" "haskell-persistent-sqlite"
- "haskell-persistent-template" "haskell-project-template"
- "haskell-regex-applicative-text" "haskell-resourcet"
"haskell-retry" "haskell-safe"
- "haskell-semigroups" "haskell-split" "haskell-stm" "haskell-store"
- "haskell-streaming-commons" "haskell-tar" "haskell-temporary"
"haskell-text"
- "haskell-text-binary" "haskell-tls" "haskell-transformers-base"
- "haskell-unicode-transforms" "haskell-unix-compat"
"haskell-unordered-containers"
- "haskell-vector" "haskell-vector-binary-instances" "haskell-yaml"
- "haskell-zip-archive" "haskell-zlib")
-source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz";)
-sha256sums=('6a13a98413ea5f1a0642d9080892e6bcd996a17baa4d61521c0e0f3d9bb810b3')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- runhaskell Setup configure -O --enable-library-profiling --enable-shared \
- --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" \
- --libsubdir=\$compiler/site-local/\$pkgid \
- -f-disable-git-info -f-integration-tests -f-static
-f-hide-dependency-versions
- 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.*update[^ ]* |&'--force' |" register.sh
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package_stack() {
- depends=('gmp' 'libffi' 'zlib')
- optdepends=('ghc')
- install="stack.install"
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- runhaskell Setup copy --destdir="${pkgdir}"
- rm -r "$pkgdir"/usr/{lib,share/doc}
- install -D -m644 "LICENSE"
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack >
stack_completion_script
- install -Dm644 stack_completion_script
"${pkgdir}/usr/share/bash-completion/completions/stack"
-}
-
-package_haskell-stack() {
- pkgdesc="The Haskell Tool Stack (docs and libraries)"
- depends=("${makedepends[@]}" 'stack')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- install -D -m744 register.sh
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
- install -D -m744 unregister.sh
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.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/${pkgbase}"
- runhaskell Setup copy --destdir="${pkgdir}"
- rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
- rm -rf "${pkgdir}/usr/bin"
-}
Copied: stack/repos/community-x86_64/PKGBUILD (from rev 192816,
stack/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-10-21 08:16:03 UTC (rev 192817)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Arch Haskell Team <arch-hask...@haskell.org>
+
+pkgbase=stack
+pkgname=(stack haskell-stack)
+pkgver=1.2.0
+pkgrel=6
+pkgdesc="The Haskell Tool Stack"
+url="https://github.com/commercialhaskell/stack";
+license=("custom:BSD3")
+arch=('i686' 'x86_64')
+makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-annotated-wl-pprint"
"haskell-ansi-terminal"
+ "haskell-async" "haskell-attoparsec" "haskell-base-compat"
"haskell-base16-bytestring"
+ "haskell-base64-bytestring" "haskell-binary-tagged"
"haskell-blaze-builder"
+ "haskell-byteable" "haskell-clock" "haskell-conduit"
"haskell-conduit-extra"
+ "haskell-cryptohash" "haskell-cryptohash-conduit"
"haskell-edit-distance"
+ "haskell-either" "haskell-enclosed-exceptions" "haskell-errors"
"haskell-exceptions"
+ "haskell-extra" "haskell-fast-logger" "haskell-filelock"
"haskell-fsnotify"
+ "haskell-generic-deriving" "haskell-gitrev" "haskell-hashable"
"haskell-hastache"
+ "haskell-hit" "haskell-http-client" "haskell-http-client-tls"
"haskell-http-conduit"
+ "haskell-http-types" "haskell-hpack" "haskell-lifted-async"
"haskell-lifted-base"
+ "haskell-microlens" "haskell-monad-control" "haskell-monad-logger"
+ "haskell-monad-unlift" "haskell-mtl" "haskell-open-browser"
+ "haskell-optparse-applicative" "haskell-optparse-simple"
"haskell-path"
+ "haskell-path-io" "haskell-persistent" "haskell-persistent-sqlite"
+ "haskell-persistent-template" "haskell-project-template"
+ "haskell-regex-applicative-text" "haskell-resourcet"
"haskell-retry" "haskell-safe"
+ "haskell-semigroups" "haskell-split" "haskell-stm" "haskell-store"
+ "haskell-streaming-commons" "haskell-tar" "haskell-temporary"
"haskell-text"
+ "haskell-text-binary" "haskell-tls" "haskell-transformers-base"
+ "haskell-unicode-transforms" "haskell-unix-compat"
"haskell-unordered-containers"
+ "haskell-vector" "haskell-vector-binary-instances" "haskell-yaml"
+ "haskell-zip-archive" "haskell-zlib")
+source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz";)
+sha256sums=('6a13a98413ea5f1a0642d9080892e6bcd996a17baa4d61521c0e0f3d9bb810b3')
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-disable-git-info -f-integration-tests -f-static
-f-hide-dependency-versions
+ 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.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package_stack() {
+ depends=('gmp' 'libffi' 'zlib')
+ optdepends=('ghc')
+ install="stack.install"
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+ install -D -m644 "LICENSE"
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack >
stack_completion_script
+ install -Dm644 stack_completion_script
"${pkgdir}/usr/share/bash-completion/completions/stack"
+}
+
+package_haskell-stack() {
+ pkgdesc="The Haskell Tool Stack (docs and libraries)"
+ depends=("${makedepends[@]}" 'stack')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ install -D -m744 register.sh
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.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/${pkgbase}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+ rm -rf "${pkgdir}/usr/bin"
+}
Deleted: community-x86_64/stack.install
===================================================================
--- community-x86_64/stack.install 2016-10-21 08:15:35 UTC (rev 192816)
+++ community-x86_64/stack.install 2016-10-21 08:16:03 UTC (rev 192817)
@@ -1,4 +0,0 @@
-post_install() {
- echo "You need to either 1) install latest stable ghc package from [extra]
or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed
by stack to work."
-}
-
Copied: stack/repos/community-x86_64/stack.install (from rev 192816,
stack/trunk/stack.install)
===================================================================
--- community-x86_64/stack.install (rev 0)
+++ community-x86_64/stack.install 2016-10-21 08:16:03 UTC (rev 192817)
@@ -0,0 +1,4 @@
+post_install() {
+ echo "You need to either 1) install latest stable ghc package from [extra]
or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed
by stack to work."
+}
+
