Merge branch 'fix-libevhtp' into devel

2 files changed, 5 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f8ce824c591..addeb968d900 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Dec  5 20:43:45 UTC 2015
+# Fri Dec 18 04:14:14 UTC 2015
 pkgbase = seafile-server
 	pkgdesc = Next-generation open source cloud storage with advanced features on privacy protection and teamwork. (Server components, without seahub)
 	pkgver = 5.0.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/haiwen/seafile/
 	install = seafile-server.install
 	arch = i686
@@ -21,7 +21,7 @@ pkgbase = seafile-server
 	depends = python2-virtualenv
 	depends = python2-flup
 	depends = python2-six
-	depends = libevhtp-seafile=1.2.10
+	depends = libevhtp-seafile=1.2.9
 	depends = git
 	conflicts = django
 	conflicts = django-rest-framework,
diff --git a/PKGBUILD b/PKGBUILD
index 5d031b058f4d..c9605de50c0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=seafile-server
 pkgver=5.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Next-generation open source cloud storage with advanced features on privacy protection and teamwork. (Server components, without seahub)"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/haiwen/seafile/"
 license=('GPL3')
-depends=('seafile-shared=5.0.2' 'python2-mako' 'python2-dateutil' 'python2-webpy' 'python2-pip' 'python2-virtualenv' 'python2-flup' 'python2-six' 'libevhtp-seafile=1.2.10' 'git')
+depends=('seafile-shared=5.0.2' 'python2-mako' 'python2-dateutil' 'python2-webpy' 'python2-pip' 'python2-virtualenv' 'python2-flup' 'python2-six' 'libevhtp-seafile=1.2.9' 'git')
 makedepends=('vala' 'intltool')
 conflicts=('django' 'django-rest-framework', 'seafile')
 options=('!libtool' '!emptydirs')