makedeb


cbonsai-git 1b3ee97a2021.08.17-2


A bonsai tree generator, written in C using ncurses (git version)

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

Commit:


Hash: c633a3924febe657bf9c428408a067d2a7040630

Message: minor fix

Diff


diff --git a/.SRCINFO b/.SRCINFO
index 3f59c2c..b35dba3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
-generated-by = makedeb-makepkg
-
-pkgbase = cbonsai-git
-	pkgdesc = A bonsai tree generator, written in C using ncurses (git version)
-	pkgver = 1.3.1.2.gb3ee97a1212021.08.17
-	pkgrel = 1
-	url = https://gitlab.com/jallbrit/cbonsai
-	arch = aarch64
-	arch = arm
-	arch = armv6h
-	arch = armv7h
-	arch = i686
-	arch = pentium4
-	arch = x86_64
-	license = GPL3
-	makedepends = scdoc
-	depends = libncursesw5-dev
-	provides = cbonsai
-	conflicts = cbonsai
-	source = git+https://gitlab.com/jallbrit/cbonsai.git
-	md5sums = SKIP
-
+generated-by = makedeb
 pkgname = cbonsai-git
+pkgbase = cbonsai-git
+pkgdesc = A bonsai tree generator, written in C using ncurses (git version)
+pkgrel = 2
+pkgver = 1b3ee97a2021.08.17
+url = https://gitlab.com/jallbrit/cbonsai
+arch = aarch64
+arch = arm
+arch = armv6h
+arch = armv7h
+arch = i686
+arch = pentium4
+arch = amd64
+conflicts = cbonsai
+depends = libncursesw5-dev
+license = GPL3
+makedepends = scdoc
+provides = cbonsai
+source = cbonsai::git+https://gitlab.com/jallbrit/cbonsai.git
+md5sums = SKIP
+makedepends = scdoc
diff --git a/PKGBUILD b/PKGBUILD
index e2716df..2d19323 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,25 @@
 # Maintainer: only_vip <onlyme_vip@protonmail.com>
 pkgname=cbonsai-git
 _gitpkg=cbonsai
-pkgver=1.3.1.2.gb3ee97a1212021.08.17
-pkgrel=1
+pkgver=1b3ee97a2021.08.17
+pkgrel=2
 pkgdesc='A bonsai tree generator, written in C using ncurses (git version)'
-arch=('aarch64' 'arm' 'armv6h' 'armv7h' 'i686' 'pentium4' 'x86_64')
+arch=('aarch64' 'arm' 'armv6h' 'armv7h' 'i686' 'pentium4' 'amd64')
 url="https://gitlab.com/jallbrit/cbonsai"
 license=('GPL3')
 depends=('libncursesw5-dev')
 makedepends=('scdoc')
 provides=('cbonsai')
 conflicts=('cbonsai')
-source=('git+https://gitlab.com/jallbrit/cbonsai.git')
+source=("${_gitpkg}::git+https://gitlab.com/jallbrit/cbonsai.git")
 md5sums=(SKIP)
 
 pkgver() {
     cd "${srcdir}/${_gitpkg}"
-    _tag=$(git describe --tags | sed -e 's:-:.:g' -e 's:v::') # tag is mobile, and switches between numbers and letters, can't use it for versioning
+    _always=$(git describe --always | sed -e 's:-:.:g' -e 's:v::') # 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" "${_tag}" "${_commits}" "${_date}" | sed -e 's:-:.:g'  -e 's:_:.:g'
+    printf "%s%s%s\n" "${_commits}" "${_always}" "${_date}" | sed -e 's:-:.:g'  -e 's:_:.:g'
 }
 
 package() {