From 6e0993a54bdd963a76e05d74cf5ea1b208b52118 Mon Sep 17 00:00:00 2001
From: Oliver Giles <ohw.giles@gmail.com>
Date: Fri, 30 Aug 2019 10:59:57 +0300
Subject: [PATCH] use $tag-1~upstream-debian9 as debian package version

---
 docker-build-debian.sh        | 6 +++---
 docker-xbuild-debian-armhf.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-build-debian.sh b/docker-build-debian.sh
index de69d9f..0781bb9 100755
--- a/docker-build-debian.sh
+++ b/docker-build-debian.sh
@@ -4,7 +4,7 @@ OUTPUT_DIR=$PWD
 
 SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 
-VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
 
 DOCKER_TAG=$(docker build -q - <<EOS
 FROM debian:9-slim
@@ -45,7 +45,7 @@ make DESTDIR=laminar install/strip
 mkdir laminar/DEBIAN
 cat <<EOF > laminar/DEBIAN/control
 Package: laminar
-Version: $VERSION-1
+Version: $VERSION
 Section: 
 Priority: optional
 Architecture: amd64
@@ -63,5 +63,5 @@ EOF
 chmod +x laminar/DEBIAN/postinst
 
 dpkg-deb --build laminar
-mv laminar.deb /output/laminar_$VERSION-1_amd64.deb
+mv laminar.deb /output/laminar_$VERSION_amd64.deb
 EOS
diff --git a/docker-xbuild-debian-armhf.sh b/docker-xbuild-debian-armhf.sh
index c0f3d06..231040d 100755
--- a/docker-xbuild-debian-armhf.sh
+++ b/docker-xbuild-debian-armhf.sh
@@ -4,7 +4,7 @@ OUTPUT_DIR=$PWD
 
 SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 
-VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
 
 DOCKER_TAG=$(docker build -q - <<EOS
 FROM debian:9-slim
@@ -65,7 +65,7 @@ make DESTDIR=laminar install/strip
 mkdir laminar/DEBIAN
 cat <<EOF > laminar/DEBIAN/control
 Package: laminar
-Version: $VERSION-1
+Version: $VERSION
 Section: 
 Priority: optional
 Architecture: armhf
@@ -83,5 +83,5 @@ EOF
 chmod +x laminar/DEBIAN/postinst
 
 dpkg-deb --build laminar
-mv laminar.deb /output/laminar_$VERSION-1_armhf.deb
+mv laminar.deb /output/laminar_$VERSION_armhf.deb
 EOS