Rename package

Upstream’s previous URL now redirects to Peaker/git-mediate.

2 files changed, 20 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cef226dada0b..54bedd46cfb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Sat Jan 30 19:39:08 UTC 2016
-pkgbase = resolve-trivial-conflicts-git
+# Wed Mar  8 13:38:23 UTC 2017
+pkgbase = git-mediate-git
 	pkgdesc = Resolve trivial conflicts automatically when merging branches in git repositories.
-	pkgver = r70.84d10f2
+	pkgver = r94.07b1a7b
 	pkgrel = 1
-	url = https://github.com/ElastiLotem/resolve-trivial-conflicts
+	url = https://github.com/Peaker/git-mediate
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -12,10 +12,14 @@ pkgbase = resolve-trivial-conflicts-git
 	makedepends = cabal-install
 	makedepends = chrpath
 	depends = gmp
-	provides = resolve-trivial-conflicts
+	depends = libffi
+	provides = git-mediate
+	conflicts = git-mediate
 	conflicts = resolve-trivial-conflicts
-	source = git+https://github.com/ElastiLotem/resolve-trivial-conflicts
+	replaces = resolve-trivial-conflicts
+	replaces = resolve-trivial-conflicts-git
+	source = git+https://github.com/Peaker/git-mediate
 	md5sums = SKIP
 
-pkgname = resolve-trivial-conflicts-git
+pkgname = git-mediate-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c8adaba685fa..f8172ce6b860 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Sebastian Reuße <seb@wirrsal.net>
-pkgname=resolve-trivial-conflicts-git
-_gitname=resolve-trivial-conflicts
-pkgver=r70.84d10f2
+pkgname=git-mediate-git
+_gitname=git-mediate
+pkgver=r94.07b1a7b
 pkgrel=1
 pkgdesc="Resolve trivial conflicts automatically when merging branches in git repositories."
 arch=(i686 x86_64)
-url="https://github.com/ElastiLotem/resolve-trivial-conflicts"
+url="https://github.com/Peaker/git-mediate"
 license=(GPL)
-provides=(resolve-trivial-conflicts)
-conflicts=(resolve-trivial-conflicts)
+provides=(git-mediate)
+conflicts=(git-mediate resolve-trivial-conflicts)
+replaces=(resolve-trivial-conflicts resolve-trivial-conflicts-git)
 makedepends=(git cabal-install chrpath)
 depends=(gmp)
-source=(git+https://github.com/ElastiLotem/resolve-trivial-conflicts)
+source=(git+https://github.com/Peaker/git-mediate)
 md5sums=(SKIP)
 
 pkgver() {
@@ -38,6 +39,6 @@ package() {
     # RPATH, we kill them manually until Cabal 1.23 is released.
     find dist -type f -perm -+x -exec chrpath -d {} \;
     cabal copy --destdir "$pkgdir"
-    install -m644 -D README.md "$pkgdir"/usr/share/doc/resolve-trivial-conflicts/README.md
+    install -m644 -D README.md "$pkgdir"/usr/share/doc/git-mediate/README.md
 }