Merge branch 'master' into dev

This commit is contained in:
Mario Hüttel 2020-04-16 22:47:38 +02:00
commit 330285cc2f

View File

@ -1,7 +1,7 @@
# Maintainer: Mario Hüttel <mario (dot) huettel (!) gmx (dot) net> # Maintainer: Mario Hüttel <mario (dot) huettel (!) gmx (dot) net>
pkgname=gds-render pkgname=gds-render
pkgver=20191020.403.448de30 pkgver=v1.2_10_g00d02b8
pkgrel=1 pkgrel=1
pkgdesc="Conversion tool for converting GDS layout files into TikZ Code and PDF" pkgdesc="Conversion tool for converting GDS layout files into TikZ Code and PDF"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@ -15,8 +15,8 @@ sha1sums=('SKIP')
pkgver () { pkgver () {
_date=`date +"%Y%m%d"` _date=`date +"%Y%m%d"`
cd "${srcdir}/${pkgname}-git" cd "${srcdir}/${pkgname}-git/version"
echo "$_date.$(git rev-list --count master).$(git rev-parse --short master)" echo "$(echo "$(sh ./generate-version-string.sh)" | sed 's/-/_/g')"
} }
build () { build () {