summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-08-09 15:21:09 +0300
committerLauri Ojansivu <x@xet7.org>2017-08-09 15:21:09 +0300
commit4586be46f7682fcf6251d17df21d0d05e25d6c71 (patch)
treedddbb32dd850914d0452c332c57f04c6d7ca43f4
parent719c5404f3c1a4116115f27bd5726e9e1620b0d4 (diff)
parent1f5d806a65291906b846751c27214f47845ead2c (diff)
downloadwekan-4586be46f7682fcf6251d17df21d0d05e25d6c71.tar.gz
wekan-4586be46f7682fcf6251d17df21d0d05e25d6c71.tar.bz2
wekan-4586be46f7682fcf6251d17df21d0d05e25d6c71.zip
Merge branch 'kubiko-devel' into devel
Ubuntu snap: Use version scriptlet. Thanks to kubiko !
-rw-r--r--CHANGELOG.md5
-rw-r--r--snapcraft.yaml3
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12aed4de..7e1c3ffd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,10 @@ This release adds the following new features:
* [Add Bounties and Commercial Support to wiki](https://github.com/wekan/wekan/wiki);
* [Add display Wekan version number and runtime
environment to Admin Panel](https://github.com/wekan/wekan/pull/1156);
-* [Change Email address](https://github.com/wekan/wekan/pull/1161).
+* [Change Email address](https://github.com/wekan/wekan/pull/1161);
+* [Ubuntu snap: Use version scriptlet](https://github.com/wekan/wekan/pull/1164).
-Thanks to GitHub users nztqa and xet7 for their contributions.
+Thanks to GitHub users kubiko, nztqa and xet7 for their contributions.
# v0.32 2017-07-30 Wekan release
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 19f50d42..5df6b1cd 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,6 @@
name: wekan
-version: "0.32-SNAPSHOT"
+version: 0
+version-script: git describe --dirty --tags | cut -c 2-
summary: The open-source Trello-like kanban
description: |
Wekan is an open-source and collaborative kanban board application.