makedeb


sxhkd-git 1870.6.22020.08.02-2


A simple X hotkey daemon

Click here to go back to the commit logs for sxhkd-git.

Commit:


Hash: b7f126f461be1048c5a108085d157ebc1f20ed2e

Message: minor fix

Diff


diff --git a/.SRCINFO b/.SRCINFO
index 0c16161..691d55f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,27 @@
-generated-by = makedeb-makepkg
-
-pkgbase = sxhkd-git
-	pkgdesc = A simple X hotkey daemon
-	pkgver = 1870.6.22020.08.02
-	pkgrel = 1
-	url = https://github.com/baskerville/sxhkd
-	arch = i686
-	arch = x86_64
-	arch = armv7h
-	license = custom:BSD
-	makedepends = git
-	makedepends = libxcb-keysyms1-dev
-	makedepends = libxcb-util-dev
-	makedepends = libxcb-icccm4-dev
-	makedepends = libxcb-ewmh-dev
-	depends = libxcb1
-	depends = libxcb-keysyms1
-	provides = sxhkd
-	conflicts = sxhkd
-	source = git+https://github.com/baskerville/sxhkd.git
-	md5sums = SKIP
-
+generated-by = makedeb
 pkgname = sxhkd-git
+pkgbase = sxhkd-git
+pkgdesc = A simple X hotkey daemon
+pkgrel = 2
+pkgver = 1870.6.22020.08.02
+url = https://github.com/baskerville/sxhkd
+arch = i686
+arch = amd64
+arch = armv7h
+conflicts = sxhkd
+depends = libxcb1
+depends = libxcb-keysyms1
+license = custom:BSD
+makedepends = git
+makedepends = libxcb-keysyms1-dev
+makedepends = libxcb-util-dev
+makedepends = libxcb-icccm4-dev
+makedepends = libxcb-ewmh-dev
+provides = sxhkd
+source = sxhkd::git+https://github.com/baskerville/sxhkd.git
+md5sums = SKIP
+makedepends = git
+makedepends = libxcb-keysyms1-dev
+makedepends = libxcb-util-dev
+makedepends = libxcb-icccm4-dev
+makedepends = libxcb-ewmh-dev
diff --git a/PKGBUILD b/PKGBUILD
index f2695f3..f209bf4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,24 @@
 _pkgname=sxhkd
 pkgname=${_pkgname}-git
 pkgver=1870.6.22020.08.02
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple X hotkey daemon'
-arch=('i686' 'x86_64' 'armv7h')
+arch=('i686' 'amd64' 'armv7h')
 url="https://github.com/baskerville/${_pkgname}"
 license=('custom:BSD')
 depends=('libxcb1' 'libxcb-keysyms1')
 makedepends=('git' 'libxcb-keysyms1-dev' 'libxcb-util-dev' 'libxcb-icccm4-dev' 'libxcb-ewmh-dev')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("git+https://github.com/baskerville/${_pkgname}.git")
+source=("${_pkgname}::git+https://github.com/baskerville/${_pkgname}.git")
 md5sums=('SKIP')
 
 pkgver() {
     cd "${srcdir}/${_pkgname}"
-    _tag=$(git describe --tags | sed -e 's:-:.:g') # tag is mobile, and switches between numbers and letters, can't use it for versioning
+    _always=$(git describe --always | sed -e 's:-:.:g') # always is mobile, and switches between numbers and letters, can't use it for versioning
     _commits=$(git rev-list --count HEAD | sed 's:-:.:g') # total commits is the most sane way of getting incremental pkgver
     _date=$(git log -1 --date=short --pretty=format:%cd)
-    printf "%s%s%s\n" "${_commits}" "${_tag}" "${_date}" | sed -e 's:-:.:g'  -e 's:_:.:g'
+    printf "%s%s%s\n" "${_commits}" "${_always}" "${_date}" | sed -e 's:-:.:g'  -e 's:_:.:g'
 }
 
 build() {