updated and fix conflicts with community package

2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9cecc1f2e9fb..eab26e018489 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mtd-tools-git
 	pkgdesc = MTD userspace tools
-	pkgver = 928.dcea43e
+	pkgver = 965.0e602bf
 	pkgrel = 1
 	url = http://www.linux-mtd.infradead.org/index.html
 	arch = i686
@@ -9,6 +9,8 @@ pkgbase = mtd-tools-git
 	makedepends = git
 	depends = util-linux
 	depends = lzo2
+	provides = mtd-uitls
+	replaces = mtd-utils
 	source = mtd-utils::git://git.infradead.org/mtd-utils.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 27108cfcd8a5..13f7fcb8f2cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: M0Rf30
 
 pkgname=mtd-tools-git
-pkgver=928.dcea43e
+pkgver=965.0e602bf
 pkgrel=1
 pkgdesc="MTD userspace tools"
 arch=('i686' 'x86_64')
@@ -9,6 +9,8 @@ url="http://www.linux-mtd.infradead.org/index.html"
 license=('GPL')
 depends=('util-linux' 'lzo2')
 makedepends=('git')
+provides=('mtd-uitls')
+replaces=('mtd-utils')
 source=("mtd-utils::git://git.infradead.org/mtd-utils.git")
 
 package ()