aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-03-06 20:28:50 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-03-06 20:28:50 +0000
commitc33c7e66074303dcf919095aa3bb3396459e2b34 (patch)
tree209807bb0eeca28dfaae41b51a142b8c2d5c39c6
parentREADME: add link to keyboard+mouse bindings issue (diff)
parentmeson/PKGBUILD/changelog: bump to 1.2.1 (diff)
Merge branch 'releases/1.2'
-rw-r--r--CHANGELOG.md5
-rw-r--r--PKGBUILD2
-rwxr-xr-xgenerate-version.sh2
-rw-r--r--meson.build2
4 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12666f5a..0e52a01f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,11 @@
### Fixed
### Security
+## 1.2.1
+
+### Fixed
+* Building AUR package
+
## 1.2.0
diff --git a/PKGBUILD b/PKGBUILD
index 527a8a38..44eeab8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=('foot' 'foot-terminfo')
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
arch=('x86_64')
url=https://codeberg.org/dnkl/foot
diff --git a/generate-version.sh b/generate-version.sh
index 89e1fa20..ecd0306f 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -10,7 +10,7 @@ out_file=${3}
# echo "source directory: ${src_dir}"
# echo "output file: ${out_file}"
-if command -v git > /dev/null && git rev-parse --is-inside-work-tree > /dev/null 2>&1 ; then
+if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then
workdir=$(pwd)
cd "${src_dir}"
git_version=$(git describe --always --tags)
diff --git a/meson.build b/meson.build
index 9de1bd88..8070bb04 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('foot', 'c',
- version: '1.2.0',
+ version: '1.2.1',
license: 'MIT',
meson_version: '>=0.47.0',
default_options: [