Add cargo [community] as conflict

2 files changed, 3 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8de3ff4c4ab9..33ee966a176f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cargo-bin
 	pkgdesc = Cargo downloads your Rust project's dependencies and compiles your project.
-	pkgver = 20151023
+	pkgver = 20151025
 	pkgrel = 1
 	url = http://crates.io/
 	arch = x86_64
@@ -11,8 +11,7 @@ pkgbase = cargo-bin
 	depends = zlib
 	optdepends = rust: for rustc
 	provides = cargo
-	conflicts = cargo-git
-	replaces = cargo-git
+	conflicts = cargo
 	source = https://static.rust-lang.org/cargo-dist/cargo-nightly--unknown-linux-gnu.tar.gz
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f0b21f40c3e..4643f051889d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=cargo-bin
 pkgrel=1
-pkgver=20151023
+pkgver=20151025
 pkgdesc="Cargo downloads your Rust project's dependencies and compiles your project."
 url="http://crates.io/"
 conflicts=('cargo')
@@ -15,8 +15,6 @@ license=('APACHE' 'MIT')
 depends=('gcc-libs' 'zlib')
 optdepends=('rust: for rustc')
 makedepends=()
-conflicts=('cargo-git')
-replaces=('cargo-git')
 backup=()
 install=''
 source=("https://static.rust-lang.org/cargo-dist/cargo-nightly-${CARCH}-unknown-linux-gnu.tar.gz")