summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorrafasc2018-03-26 04:10:36 +0100
committerrafasc2018-03-26 04:23:15 +0100
commite0cf86fd6fb45f31899fd20108eb0cc179af5412 (patch)
tree102b17a14e040c7814462ba7d06cba1c3492baae
parent1f4a28cbf2ba7177b8c8c53af3019948e676537a (diff)
downloadaur-git-imerge-git.tar.gz
change source to https and remove no-op build()
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
2 files changed, 7 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4a66a41435b..77a7fc3c609 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Feb 21 20:59:53 UTC 2016
pkgbase = git-imerge-git
pkgdesc = Incremental merge for git
- pkgver = 0
+ pkgver = 1.1.0.r2.g269969e
pkgrel = 1
url = https://github.com/mhagger/git-imerge
changelog = git-imerge-git.changelog
@@ -11,7 +9,7 @@ pkgbase = git-imerge-git
makedepends = git
depends = python2
depends = git
- source = git://github.com/mhagger/git-imerge.git
+ source = git+https://github.com/mhagger/git-imerge.git
sha256sums = SKIP
pkgname = git-imerge-git
diff --git a/PKGBUILD b/PKGBUILD
index fb63cf583ab..2f97edd605b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
-# Maintainer: Magnus Therning <magnus@therning.org>
+# Maintainer: Rafael Ascensão <rafa dot almas at gmail dot com>
+# Contributor: Magnus Therning <magnus@therning.org>
pkgname=git-imerge-git
_pkgname=git-imerge
-pkgver=0
+pkgver=1.1.0.r2.g269969e
pkgrel=1
pkgdesc='Incremental merge for git'
arch=('any')
-license=('GPL2')
url='https://github.com/mhagger/git-imerge'
+license=('GPL2')
depends=('python2' 'git')
makedepends=('git')
changelog=${pkgname}.changelog
-source=('git://github.com/mhagger/git-imerge.git')
+source=('git+https://github.com/mhagger/git-imerge.git')
sha256sums=('SKIP')
pkgver() {
@@ -19,10 +20,6 @@ pkgver() {
git describe --long | sed -r 's/^v//; s/([^-]*-g)/r\1/; s/-/./g'
}
-build() {
- echo "nothing to build"
-}
-
package () {
cd "${srcdir}"/${_pkgname}
install -D -m755 git-imerge "${pkgdir}"/usr/bin/git-imerge