Add package versions to the rpm and deb filenames

Author: Mikrz

build-packages.sh

@@ -1,13 +1,7 @@
 #!/bin/bash
-<<<<<<< Updated upstream
 TAG_VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
 OUT_VERSION=$(echo $TAG_VERSION | sed -E 's/([0-9]{4}\.[0-9]{1,2}\.[0-9]+-[0-9]+).*/\1/')
 echo $TAG_VERSION
-=======
-ORIG_VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
-OUT_VERSION=$(echo $ORIG_VERSION | sed -E 's/([0-9]{4}\.[0-9]{1,2}\.[0-9]+-[0-9]+).*/\1/')
-echo $ORIG_VERSION
->>>>>>> Stashed changes
 
 # Disable FIPS module in go-boring
 export GOEXPERIMENT=noboringcrypto