diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
| commit | 60f323f25d2c0addbce5832ffbda060b0410d14f (patch) | |
| tree | 644b9212e37f1a63dcef3977159033dee2f04392 /social/diaspora-git | |
| parent | 9e2eedaa4921b8d57c364fb3e2a8c9e2e96b8e69 (diff) | |
| parent | 817e58c278cb8ebee7743205877d0f67c431fcec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/inetutils/PKGBUILD
extra/audacious/PKGBUILD
extra/cvs/PKGBUILD
kde-unstable/libkipi/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/psutils-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
staging/kdebase-runtime/PKGBUILD
Diffstat (limited to 'social/diaspora-git')
| -rw-r--r-- | social/diaspora-git/PKGBUILD | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD index 1cf183cf7..77a11d701 100644 --- a/social/diaspora-git/PKGBUILD +++ b/social/diaspora-git/PKGBUILD @@ -7,7 +7,11 @@ pkgbase=diaspora-git pkgname=('diaspora-mysql-git' 'diaspora-postgresql-git' 'diaspora-sqlite-git') +<<<<<<< HEAD pkgver=20110623 +======= +pkgver=20111229 +>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c pkgrel=1 pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network" arch=('i686' 'x86_64') @@ -39,18 +43,22 @@ build() { if [[ -d $_gitname ]] ; then pushd $_gitname - git pull origin + $tsocks git pull origin msg "The local files are updated." popd else - git clone $_gitroot + $tsocks git clone $_gitroot msg "Git clone done." fi msg "Start making..." [[ -d $_gitname-build ]] && rm -fr $_gitname-build +<<<<<<< HEAD git clone $_gitname $_gitname-build +======= + $tsocks git clone $_gitname $_gitname-build +>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c # Include all gems export GEM_HOME="${PWD}/vendor" @@ -59,7 +67,11 @@ build() { cd ${srcdir}/${_gitname}-build +<<<<<<< HEAD gem install bundler +======= + $tsocks gem install bundler +>>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c } # Helper |