From 5d31d4152ef58900874c9961a01f6125f3b125da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <github@stbuehler.de>
Date: Fri, 30 Aug 2019 19:32:48 +0200
Subject: [PATCH] fix debian package filename and contained version (#101)

The inner version should be the same as the one in the filename; the
filename pattern is "${name}_${version}_${arch}.deb".

Set the version suffix to avoid conflicts with a future Debian package
and include the Debian version this package was built against.
---
 docker-build-debian.sh        | 4 ++--
 docker-xbuild-debian-armhf.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-build-debian.sh b/docker-build-debian.sh
index 8010a80..2388951 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
@@ -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 ea2c71c..7b9fe0d 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
@@ -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