From 2acf369bae5106f4e684fbf8e5b41dfa9befd616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 24 Feb 2019 20:03:57 +0100
Subject: [PATCH 1/2] Fix versioning of the deb package, remove revision

Closes #3741
---
 Makefile                                 | 2 +-
 hack/jenkins/release_build_and_upload.sh | 2 +-
 hack/jenkins/release_github_page.sh      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c4a35e48e5..86ff6f01a1 100755
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ VERSION_BUILD ?= 1
 ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).0
 
 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
-DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD)
+DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
 BUILDROOT_BRANCH ?= 2018.05
 REGISTRY?=gcr.io/k8s-minikube
diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh
index c16dbdeedb..172ed43d05 100755
--- a/hack/jenkins/release_build_and_upload.sh
+++ b/hack/jenkins/release_build_and_upload.sh
@@ -27,7 +27,7 @@
 set -e
 
 export TAGNAME=v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
-export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}-${VERSION_BUILD}
+export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
 export GOPATH=~/go
 
 # Make sure the tag matches the Makefile
diff --git a/hack/jenkins/release_github_page.sh b/hack/jenkins/release_github_page.sh
index 282eee88ab..38ec5e601e 100755
--- a/hack/jenkins/release_github_page.sh
+++ b/hack/jenkins/release_github_page.sh
@@ -26,7 +26,7 @@
 
 set -e
 export TAGNAME=v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
-export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}-${VERSION_BUILD}
+export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
 
 export GITHUB_ORGANIZATION="kubernetes"
 export GITHUB_REPO="minikube"

From e793576760ddc8e6f8661b0aa037d50dc9bd9cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Sun, 24 Feb 2019 20:36:32 +0100
Subject: [PATCH 2/2] Run deb package build with fakeroot for file perms

Closes #3544
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 86ff6f01a1..dcff29b7fc 100755
--- a/Makefile
+++ b/Makefile
@@ -235,7 +235,7 @@ out/minikube_$(DEB_VERSION).deb: out/minikube-linux-amd64
 	sed -E -i 's/--VERSION--/'$(DEB_VERSION)'/g' out/minikube_$(DEB_VERSION)/DEBIAN/control
 	mkdir -p out/minikube_$(DEB_VERSION)/usr/bin
 	cp out/minikube-linux-amd64 out/minikube_$(DEB_VERSION)/usr/bin/minikube
-	dpkg-deb --build out/minikube_$(DEB_VERSION)
+	fakeroot dpkg-deb --build out/minikube_$(DEB_VERSION)
 	rm -rf out/minikube_$(DEB_VERSION)
 
 .SECONDEXPANSION: