From 3b17fa1108321980f6fd82c7deb93fe3794bec5f Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageia.org>
Date: Mon, 21 Jan 2019 13:02:04 +0100
Subject: Manage version number from Makefile only

---
 Makefile | 11 ++++++++---
 setup.py |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8e43eb0..b266cac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE = mageiawelcome
-VERSION = 1.92
+VERSION = 1.93
 GITPATH = git://git.mageia.org/software/mageiawelcome
 
 TEXT_FILES = Makefile
@@ -10,7 +10,12 @@ FILES = $(TEXT_FILES) $(DIRS) LICENSE *.pro setup.py
 
 check:
 	/usr/bin/python3 -m pyflakes qml/*.py
-	
+
+version:
+	echo "version='$(VERSION)'" > version.py
+	echo "import QtQuick 2.0" >qml/Version.qml
+	echo "Item { property var version: '$(VERSION)';}" >>qml/Version.qml
+
 clean:
 	rm -f *~ \#*\#
 
@@ -30,4 +35,4 @@ tar: localcopy
 	tar cvYf $(PACKAGE)-$(VERSION).tar.xz $(PACKAGE)-$(VERSION)
 	rm -fr $(PACKAGE)-$(VERSION)
 
-dist: cleandist dir localcopy tar
+dist: cleandist version dir localcopy tar
diff --git a/setup.py b/setup.py
index b3bfe9b..c1b3cbd 100644
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,8 @@ from distutils.core import setup
 from distutils.command.build import build
 import os, glob
 
+from version import *
+
 class BuildQm(build):    
   for po in glob.glob('po/*.po'):
     os.system('lconvert {} -o i18n/mageiawelcome_{}.ts'.format(po, os.path.splitext(os.path.basename(po))[0]))
@@ -23,7 +25,7 @@ data_files = [("bin",["usr/bin/mageiawelcome","usr/bin/mageiawelcome-launcher"])
 
 setup(
         name = 'mageiawelcome',
-        version = '1.92',
+        version = version,
         license = 'GNU General Public License v3 (GPLv3)',
         url = 'http://gitweb.mageia.org/software/mageiawelcome',
         description = 'Welcome Screen shows important information of the Mageia distribution.',
-- 
cgit v1.2.1