diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-21 14:44:37 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-21 14:44:37 -0300 |
| commit | 9d6dd0a34cb8bd599c4d06c54dbd247ede60267f (patch) | |
| tree | cc7662c9e2eda6f7e3b3b0fb3b7c094e4fa54d0b /community/couchdb | |
| parent | fe0996f2e8716b772785a0bf93c6a3f2d5dc22ff (diff) | |
| parent | 70b4878648fd376433739bd5c835503f6301a5b2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avifile/PKGBUILD
community/blackbox/PKGBUILD
community/blobby2/PKGBUILD
community/chmsee/PKGBUILD
community/extrema/PKGBUILD
community/floyd/PKGBUILD
community/gnash/PKGBUILD
community/gq/PKGBUILD
community/gsql/PKGBUILD
community/haddock/PKGBUILD
community/hashcash/PKGBUILD
community/kvpnc/PKGBUILD
community/uptimed/PKGBUILD
community/wol/PKGBUILD
core/jfsutils/PKGBUILD
core/reiserfsprogs/PKGBUILD
extra/gtk2/PKGBUILD
extra/libcroco/PKGBUILD
extra/libffado/PKGBUILD
extra/librsvg/PKGBUILD
extra/lua/PKGBUILD
extra/mesa/PKGBUILD
extra/valgrind/PKGBUILD
extra/xorg-server/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
Diffstat (limited to 'community/couchdb')
| -rw-r--r-- | community/couchdb/PKGBUILD | 12 | ||||
| -rw-r--r-- | community/couchdb/rc-script.patch | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 7b6b4faaa..2722803ac 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54987 2011-08-29 12:53:53Z spupykin $ +# $Id: PKGBUILD 58574 2011-11-15 15:35:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Previous Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb -pkgver=1.1.0 -pkgrel=1.svn20110829 +pkgver=1.2.0 +pkgrel=1git20111115 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" @@ -18,10 +18,10 @@ backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') #source=("http://www.apache.org/dist/$pkgname/$pkgver/apache-$pkgname-$pkgver.tar.gz" -source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.svn20110823.tar.gz" +source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.git20111115.tar.gz" "rc-script.patch") -md5sums=('b5a6e2dab45f19ef39f04a46ac146a0a' - '12171b097d2f98f4874e002bc1eabfc5') +md5sums=('b4236a36a473e3a1c81e7548de194c47' + '559b5e1483c3fb3e4327a9c58181a46c') build() { cd "$srcdir/apache-$pkgname-$pkgver" diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch index d7fd105c4..ef7be39df 100644 --- a/community/couchdb/rc-script.patch +++ b/community/couchdb/rc-script.patch @@ -1,5 +1,5 @@ ---- couchdb.orig 2011-08-23 13:13:45.000000000 +0400 -+++ couchdb 2011-08-23 13:34:20.000000000 +0400 +--- couchdb.orig 2011-11-15 19:06:16.000000000 +0400 ++++ couchdb 2011-11-15 19:08:24.000000000 +0400 @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/bash |