From 9282bf61f4bac04b0fe1109c5e261d6fccc4199d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20Silkeb=C3=A6kken?= Date: Thu, 24 Jan 2013 08:00:18 +0100 Subject: [PATCH] Add package conflicts to Arch Linux PKGBUILDs --- packages/archlinux/python-powerline-git/PKGBUILD | 3 ++- packages/archlinux/python2-powerline-git/PKGBUILD | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/archlinux/python-powerline-git/PKGBUILD b/packages/archlinux/python-powerline-git/PKGBUILD index e847c816..cdf78f1e 100644 --- a/packages/archlinux/python-powerline-git/PKGBUILD +++ b/packages/archlinux/python-powerline-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Kim Silkebækken pkgname=python-powerline-git -pkgver=20130123 +pkgver=20130124 pkgrel=1 pkgdesc='The ultimate statusline/prompt utility.' url='https://github.com/Lokaltog/powerline' @@ -12,6 +12,7 @@ makedepends=('git' 'python-distribute') optdepends=('python-psutil: improved system information' 'python-pygit2: improved git support' 'zsh: better shell prompt') +conflicts=('powerline-git') install='powerline.install' source=() diff --git a/packages/archlinux/python2-powerline-git/PKGBUILD b/packages/archlinux/python2-powerline-git/PKGBUILD index 22f12170..386fafbc 100644 --- a/packages/archlinux/python2-powerline-git/PKGBUILD +++ b/packages/archlinux/python2-powerline-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Kim Silkebækken pkgname=python2-powerline-git -pkgver=20130123 +pkgver=20130124 pkgrel=1 pkgdesc='The ultimate statusline/prompt utility.' url='https://github.com/Lokaltog/powerline' @@ -13,6 +13,7 @@ optdepends=('python2-psutil: improved system information' 'python2-pygit2: improved git support' 'mercurial: improved mercurial support' 'zsh: better shell prompt') +conflicts=('powerline-git') install='powerline.install' source=()