From 3263ce5669bf3e909234188b56fe87641d13f3da Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 11 Sep 2021 14:30:58 +0200
Subject: [PATCH] Package building fixes (#887)

* Fix a couple of errors in make scripts
* Fix snapshot versioning for launchpad
---
 setup.py            | 6 +++---
 setup/make_clean.sh | 3 ++-
 setup/make_pip.sh   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 71bf6abb..262a5fc9 100755
--- a/setup.py
+++ b/setup.py
@@ -507,7 +507,7 @@ def makeDebianPackage(signKey=None, sourceBuild=False, distName="unstable", buil
     print("")
 
     if buildName:
-        pkgVers = f"{pkgVers}~{buildName}"
+        pkgVers = f"{pkgVers}{buildName}"
 
     # Set Up Folder
     # =============
@@ -705,9 +705,9 @@ def makeForLaunchpad(doSign=False, isFirst=False, isSnapshot=False):
     dputCmd = []
     for distNum, codeName in distLoop:
         if isSnapshot:
-            buildName = f"SNAPSHOT~{tStamp}~ubuntu{distNum}.0"
+            buildName = f"+SNAPSHOT~{tStamp}~ubuntu{distNum}.0"
         else:
-            buildName = f"ubuntu{distNum}.{bldNum}"
+            buildName = f"~ubuntu{distNum}.{bldNum}"
 
         dCmd = makeDebianPackage(
             signKey=signKey,
diff --git a/setup/make_clean.sh b/setup/make_clean.sh
index 28d715eb..0f8cd300 100755
--- a/setup/make_clean.sh
+++ b/setup/make_clean.sh
@@ -6,4 +6,5 @@ if [ ! -f setup.py ]; then
     exit 1
 fi
 
-python3 setup.py clean
+rm -rfv dist_upload
+python3 setup.py build-clean
diff --git a/setup/make_pip.sh b/setup/make_pip.sh
index df0a6a35..63b559ee 100755
--- a/setup/make_pip.sh
+++ b/setup/make_pip.sh
@@ -25,5 +25,5 @@ echo " Done!"
 echo "================================================================================"
 echo ""
 echo " To upload packages to PyPi, run:"
-echo " twine upload Source/dist/*"
+echo " twine upload dist/*"
 echo ""