diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-18 12:31:40 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-18 12:31:40 +0200 |
commit | 63b47d2adad6c3c625196b2717bbd42283e9bb79 (patch) | |
tree | c337b068dad6577cc034d5857f7d1a4b0b4108c7 /community/nginx | |
parent | f86cb0311e96fae67e26edd6da00bda03f0c6160 (diff) | |
parent | 4e1091baf58d4d28f6bf3cc4fee8ea0bfd10a7a8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fish/PKGBUILD
community/python2-cchardet/PKGBUILD
extra/cpio/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
Diffstat (limited to 'community/nginx')
-rw-r--r-- | community/nginx/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index db780e77d..dda512b6a 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90389 2013-05-12 06:32:22Z bpiotrowski $ +# $Id: PKGBUILD 90996 2013-05-17 06:59:15Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.4.1 -pkgrel=2 +pkgrel=3 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl' 'geoip') |