Fix version and don't leak private tags to VERSION_STR

mvf · Jul 10, 2018 · 2b8ef78 · 2b8ef78
1 parent b3c9163
commit 2b8ef78
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-qolibri (2.0.1) UNRELEASED; urgency=medium
+qolibri (2.0.2) UNRELEASED; urgency=medium
 
   [ Ivan Kozik ]
   * Includes https://github.com/cybersphinx/qolibri improvements
@@ -7,4 +7,6 @@ qolibri (2.0.1) UNRELEASED; urgency=medium
 
   * Turn off the scan_clipboard behavior by default
 
- -- Ivan Kozik <ivan@ludios.org>  Sun, 20 May 2018 21:23:41 +0000
+  * Fix version string
+
+ -- Ivan Kozik <ivan@ludios.org>  Tue, 10 Jul 2018 11:42:41 +0000
diff --git a/qolibri.pro b/qolibri.pro
@@ -136,10 +136,10 @@ QMAKE_EXTRA_COMPILERS += updateqm
 # QOLIBRI_VERSION_STR     - Version name, e.g. 1.0.4-3-g4dead, or the hard-coded version number
 # QOLIBRI_WEBSITE         - The contents of the WEBSITE variable
 
-VERSION_STR = $$git(describe --always --tags)
+VERSION_STR = $$git(describe --tags --match '[0-9]*' --always)
 
 isEmpty(VERSION_STR) {
-    DEFINES += $$defStr(VERSION_STR, 1.0.4)
+    DEFINES += $$defStr(VERSION_STR, 2.0.2)
 } else {
     DEFINES += $$defStr(VERSION_STR, $$VERSION_STR)
 }