From 1386be23f496b31ec879a3d5136ebd1fc1a51018 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sun, 19 Sep 2021 13:43:20 +0200
Subject: [PATCH] Setup fixes post 1.5 release (#902)

* The main version must now always include the patch number
* Fix bug in pip build script
* Fix bug in debian sha256 function call
---
 novelwriter/__init__.py | 2 +-
 setup.py                | 3 ++-
 setup/make_pip.sh       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py
index db1893c4..304c5f79 100644
--- a/novelwriter/__init__.py
+++ b/novelwriter/__init__.py
@@ -61,7 +61,7 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "1.5"
+__version__    = "1.5.0"
 __hexversion__ = "0x010500f0"
 __date__       = "2021-09-19"
 __status__     = "Stable"
diff --git a/setup.py b/setup.py
index 262a5fc9..5c2943be 100755
--- a/setup.py
+++ b/setup.py
@@ -636,7 +636,8 @@ def makeDebianPackage(signKey=None, sourceBuild=False, distName="unstable", buil
         toUpload(f"{bldDir}/{bldPkg}.tar.xz")
     else:
         subprocess.call(["dpkg-buildpackage"] + signArgs, cwd=outDir)
-        toUpload(f"{bldDir}/{bldPkg}.tar.xz", f"{bldPkg}.debian.tar.xz")
+        shutil.copyfile(f"{bldDir}/{bldPkg}.tar.xz", f"{bldDir}/{bldPkg}.debian.tar.xz")
+        toUpload(f"{bldDir}/{bldPkg}.debian.tar.xz")
         toUpload(f"{bldDir}/{bldPkg}_all.deb")
 
         toUpload(makeCheckSum(f"{bldPkg}.debian.tar.xz", cwd=bldDir))
diff --git a/setup/make_pip.sh b/setup/make_pip.sh
index 63b559ee..9d6d71ef 100755
--- a/setup/make_pip.sh
+++ b/setup/make_pip.sh
@@ -10,6 +10,7 @@ echo ""
 echo " Building Packages"
 echo "================================================================================"
 echo ""
+python3 setup.py qtlrelease manual sample
 python3 setup.py sdist bdist_wheel
 mkdir -pv dist_upload
 cp -v dist/novelWriter-*.whl dist_upload/