Package building fixes (#887)

* Fix a couple of errors in make scripts * Fix snapshot versioning for launchpad
2021-09-11 14:30:58 +02:00
parent cbb527c464
commit 3263ce5669
3 changed files with 6 additions and 5 deletions
@@ -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,