From 2f2c8eddbbc20563be5ab0ba6f694177c2b77ea6 Mon Sep 17 00:00:00 2001 From: cippaciong <lacapannadelloziotom@gmail.com> Date: Thu, 21 Feb 2013 02:52:13 +0100 Subject: [PATCH 1/2] aur/owncloud 4.5.7-1 --- aur/owncloud/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/aur/owncloud/PKGBUILD b/aur/owncloud/PKGBUILD index 0c648221f..0ce48682c 100644 --- a/aur/owncloud/PKGBUILD +++ b/aur/owncloud/PKGBUILD @@ -1,8 +1,10 @@ # Maintainer: Antonio Rojas <nqn1976 @ gmail.com> # Based on owncloud-git PKGBUILD by Alexander Ovsyannikov +# ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom@gmail.com + pkgname=owncloud -pkgver=4.5.6 +pkgver=4.5.7 pkgrel=1 pkgdesc="A cloud server to store your files centrally on a hardware controlled by you" arch=('any') @@ -14,7 +16,7 @@ makedepends=() source=("http://owncloud.org/releases/$pkgname-$pkgver.tar.bz2" 'owncloud.conf') backup=('etc/httpd/conf/extra/owncloud.conf') install=owncloud.install -md5sums=('b494ce673c8d5a4061978d2e6cfbc401' +md5sums=('12b41fd8119c0fe48b62fcfe36999def' '7a08e1fee098615ea24fcdb1f4bd82d9') package() { From adc67967395e1789d52a9fba4544aa30a8429617 Mon Sep 17 00:00:00 2001 From: cippaciong <lacapannadelloziotom@gmail.com> Date: Thu, 21 Feb 2013 03:24:33 +0100 Subject: [PATCH 2/2] aur/owncloud 4.5.7-1 --- aur/owncloud/PKGBUILD | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aur/owncloud/PKGBUILD b/aur/owncloud/PKGBUILD index 688d79b3f..0ce48682c 100644 --- a/aur/owncloud/PKGBUILD +++ b/aur/owncloud/PKGBUILD @@ -1,11 +1,7 @@ # Maintainer: Antonio Rojas <nqn1976 @ gmail.com> # Based on owncloud-git PKGBUILD by Alexander Ovsyannikov -<<<<<<< HEAD # ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom@gmail.com -======= -# ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom@gmail.com> ->>>>>>> upstream/master pkgname=owncloud pkgver=4.5.7