summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-31 17:28:59 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-31 17:28:59 -0300
commitcc1078d2a85da4e695d9e5478db03148b051871a (patch)
tree30a3478435c8af87dcd112426ba140083ba9217d /libre
parent5cc3b67373ae6e84346434f90bc900a13d2e3951 (diff)
downloadabslibre-cc1078d2a85da4e695d9e5478db03148b051871a.tar.gz
abslibre-cc1078d2a85da4e695d9e5478db03148b051871a.tar.bz2
abslibre-cc1078d2a85da4e695d9e5478db03148b051871a.zip
virtualbox-libre-modules: adding virtualbox-libre-source to conflict
Diffstat (limited to 'libre')
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index d1b6f5fae..dda262976 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules')
pkgver=4.1.18
-pkgrel=6
+pkgrel=6.1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -135,7 +135,7 @@ package_virtualbox-libre-modules(){
install=virtualbox-libre-modules.install
depends=('linux-libre>=3.5' 'linux-libre<3.6')
replaces=('virtualbox-modules')
- conflicts=('virtualbox-modules')
+ conflicts=('virtualbox-modules' 'virtualbox-libre-source')
provides=("virtualbox-modules=$pkgver")
source "$srcdir/VirtualBox-${pkgver}/env.sh"