summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Therning2015-06-09 18:23:22 +0200
committerMagnus Therning2015-06-09 18:23:22 +0200
commit0919428fef18c6bdf5dccf48eff49cdf8df5301f (patch)
treead317e55dc8287b776fb36582a918db8297eb582
downloadaur-0919428fef18c6bdf5dccf48eff49cdf8df5301f.tar.gz
Initial import.
Signed-off-by: Magnus Therning <magnus@therning.org>
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD29
-rw-r--r--git-imerge-git.changelog3
3 files changed, 48 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 00000000000..a250851d0ef
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,16 @@
+pkgbase = git-imerge-git
+ pkgdesc = Incremental merge for git
+ pkgver = 0
+ pkgrel = 1
+ url = https://github.com/mhagger/git-imerge
+ changelog = git-imerge-git.changelog
+ arch = any
+ license = GPL2
+ makedepends = git
+ depends = python2
+ depends = git
+ source = git://github.com/mhagger/git-imerge.git
+ sha256sums = SKIP
+
+pkgname = git-imerge-git
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 00000000000..a8ce68d3969
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Magnus Therning <magnus@therning.org>
+
+pkgname=git-imerge-git
+_pkgname=git-imerge
+pkgver=0
+pkgrel=1
+pkgdesc='Incremental merge for git'
+arch=('any')
+license='GPL2'
+url='https://github.com/mhagger/git-imerge'
+depends=('python2' 'git')
+makedepends=('git')
+changelog=${pkgname}.changelog
+source=('git://github.com/mhagger/git-imerge.git')
+sha256sums=('SKIP')
+
+pkgver() {
+ cd "${srcdir}/${_pkgname}"
+ git describe --long | sed -r '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
+}
diff --git a/git-imerge-git.changelog b/git-imerge-git.changelog
new file mode 100644
index 00000000000..2c8cd220d51
--- /dev/null
+++ b/git-imerge-git.changelog
@@ -0,0 +1,3 @@
+2014-04-27 Magnus Therning <magnus@therning.org>
+
+ * Fix $pkgver, it should be calculated instead of a constant date.