diff --git a/ChangeLog b/ChangeLog index 8387e83..f1c15dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2017-03-25 master +2017-03-26 0.14 - Enhancements: - New plugin: button. diff --git a/README.md b/README.md index 3a82513..5fd3b79 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Latest stable release: 0.13.3 -Changes: https://gitlab.com/o9000/tint2/blob/0.13.3/ChangeLog +# Latest stable release: 0.14 +Changes: https://gitlab.com/o9000/tint2/blob/0.14/ChangeLog Documentation: [doc/tint2.md](doc/tint2.md) @@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t ``` git clone https://gitlab.com/o9000/tint2.git cd tint2 -git checkout 0.13.3 +git checkout 0.14 mkdir build cd build cmake .. diff --git a/doc/readme.html b/doc/readme.html index 2f39270..e23b9cd 100644 --- a/doc/readme.html +++ b/doc/readme.html @@ -199,9 +199,9 @@ pre { -

Latest stable release: 0.13.3

Changes: https://gitlab.com/o9000/tint2/blob/0.13.3/ChangeLog

Documentation: manual.html

Compile it with (after you install the dependencies):

git clone https://gitlab.com/o9000/tint2.git
+
Latest stable release: 0.14
Changes: https://gitlab.com/o9000/tint2/blob/0.14/ChangeLog
Documentation: manual.html
Compile it with (after you install the dependencies):
git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.13.3
+git checkout 0.14
 mkdir build
 cd build
 cmake ..
diff --git a/doc/tint2.1 b/doc/tint2.1
index e8be17e..1db95ca 100644
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -1,4 +1,4 @@
-.TH TINT2 1 "2017\-03\-12" 0.13.3
+.TH TINT2 1 "2017\-03\-26" 0.14
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
diff --git a/doc/tint2.md b/doc/tint2.md
index f1dddba..e55c264 100644
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -1,4 +1,4 @@
-# TINT2 1 "2017-03-12" 0.13.3
+# TINT2 1 "2017-03-26" 0.14
 
 ## NAME
 tint2 - lightweight panel/taskbar
diff --git a/get_version.sh b/get_version.sh
index 6da3e6f..8eb3649 100755
--- a/get_version.sh
+++ b/get_version.sh
@@ -1,46 +1,9 @@
 #!/bin/sh
 
-MAJOR=0.13
+MAJOR=0.14
 DIRTY=""
 
-if git status 1>/dev/null 2>/dev/null
-then
-    git update-index -q --ignore-submodules --refresh
-    # Disallow unstaged changes in the working tree
-    if ! git diff-files --quiet --ignore-submodules --
-    then
-        if [ "$1" = "--strict" ]
-        then
-            echo >&2 "Error: there are unstaged changes."
-            git diff-files --name-status -r --ignore-submodules -- >&2
-            exit 1
-        else
-            DIRTY="-dirty"
-        fi
-    fi
-
-    # Disallow uncommitted changes in the index
-    if ! git diff-index --cached --quiet HEAD --ignore-submodules --
-    then
-        if [ "$1" = "--strict" ]
-        then
-            echo >&2 "Error: there are uncommitted changes."
-            git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
-            exit 1
-        else
-            DIRTY="-dirty"
-        fi
-    fi
-    VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY
-else
-    VERSION=$(head -n 1 ChangeLog | cut -d ' ' -f 2)
-    if [ $VERSION = "master" ]
-    then
-        VERSION=$VERSION-$(head -n 1 ChangeLog | cut -d ' ' -f 1)
-    fi
-fi
-
-VERSION=$(echo "$VERSION" | sed 's/^v//')
+VERSION=0.14
 
 echo '#define VERSION_STRING "'$VERSION'"' > version.h
 echo $VERSION