From f7502d63691f6d6164a54123f097d95afc6d9601 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 17 Jan 2020 15:33:33 -0500
Subject: [PATCH] Update mkDebian9.sh to pull version information from source
 code.

This may require a tweak to look in the right directory for the
source code, but it will automatically format the version number
appropriately for Debian packaging.

The iteration number is now the only optional argument, defaulting
to 1.
---
 Building/Linux/mkDebian9.sh | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/Building/Linux/mkDebian9.sh b/Building/Linux/mkDebian9.sh
index 364383e9..a57bab7c 100755
--- a/Building/Linux/mkDebian9.sh
+++ b/Building/Linux/mkDebian9.sh
@@ -1,7 +1,26 @@
 #! /bin/bash
-# First parameter is version number - (ex: 1.0.0)
-# Second parametr is build or release status - (ex: beta or release)
 #
+# First (optional) parameter is package version (ex: "1") 
+#
+# This generally should start at 1 for each VERSION and increment any time the
+# package needs to be updated.
+#
+# see https://serverfault.com/questions/604541/debian-packages-version-convention
+
+ITERATION=$1
+[[ ${ITERATION} == ""] && ITERATION="1"
+
+SRC=./OSCAR-code
+
+VERSION=`awk '/#define VERSION / { gsub(/"/, "", $3); print $3 }' ${SRC}/VERSION
+if [[ VERSION == *-* ]]; then
+    # Use ~ for prerelease information so that it sorts correctly compared to release
+    # versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
+    IFS="-" read -r VERSION PRERELEASE <<< ${VERSION}
+    VERSION="${VERSION}~${PRERELEASE}"
+fi
+GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h`
+
 rm -r tempDir
 mkdir tempDir
 cp build/oscar/OSCAR tempDir
@@ -16,7 +35,7 @@ fpm --input-type dir --output-type deb  \
     --prefix /opt                   \
     --after-install ln_usrlocalbin.sh   \
     --before-remove rm_usrlocalbin.sh   \
-    --name oscar --version $1 --iteration $2 \
+    --name oscar --version ${VERSION} --iteration ${ITERATION} \
     --category Other                \
     --maintainer oscar@nightowlsoftwre.ca   \
     --license GPL-v3                \