summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGFdevelop2018-03-27 15:33:42 +0200
committerGFdevelop2018-03-27 15:33:42 +0200
commitbcbf7ffd9d2d27f0f4a7715ff42915194264f5e2 (patch)
treec454ca21324acd2f23ae661b840583907e778f51
parente83e0a93084c3ac5234a4d45adb7e31190e094e5 (diff)
downloadaur-bcbf7ffd9d2d27f0f4a7715ff42915194264f5e2.tar.gz
managed conflict
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7123f4299c90..319c61ff81f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vdeplug4-git
pkgdesc = VDE: Virtual Distributed Ethernet. Plug your VM directly to the cloud
pkgver = 0.1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/rd235/vdeplug4
arch = any
groups = view-os
@@ -9,6 +9,7 @@ pkgbase = vdeplug4-git
depends = libs2argv-execs-git
provides = vdeplug4
conflicts = vdeplug4
+ conflicts = vde2
replaces = vdeplug4
source = git+https://github.com/rd235/vdeplug4.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a6bfabe2ae71..9174d7547844 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,17 @@ _pkgname="vdeplug4"
pkgname="$_pkgname-git"
pkgver=0.1
-pkgrel=1
+pkgrel=2
pkgdesc="VDE: Virtual Distributed Ethernet. Plug your VM directly to the cloud"
arch=(any)
-url="https://github.com/rd235/vdeplug4"
+url="https://github.com/rd235/$_pkgname"
license=('GPL2')
-groups=('view-os')
+groups=("view-os")
depends=('libs2argv-execs-git')
#makedepends=()
#optdepends=()
provides=("$_pkgname")
-conflicts=("$_pkgname")
+conflicts=("$_pkgname" 'vde2')
replaces=("$_pkgname")
#backup=()
#options=()