From 107697dc952f8196337b0fd89dbc45fce1728249 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 26 Mar 2016 19:19:05 -0400
Subject: [PATCH 1/2] Clone proper sigil tag for packaging

[ci skip]
---
 deb.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deb.mk b/deb.mk
index 5b6b2d925..578661c86 100644
--- a/deb.mk
+++ b/deb.mk
@@ -163,7 +163,7 @@ deb-sigil: deb-setup golang
 	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/local/bin
 
 	@echo "-> Cloning repository"
-	git clone -q "https://github.com/$(SIGIL_REPO_NAME).git" /tmp/tmp/sigil > /dev/null
+	git clone -q -b v$(SIGIL_VERSION) "https://github.com/$(SIGIL_REPO_NAME).git" /tmp/tmp/sigil > /dev/null
 	rm -rf /tmp/tmp/sigil/.git /tmp/tmp/sigil/.gitignore
 
 	@echo "-> Copying files into place"

From cdd62b09d3b9f75b3e1e2cee0f8308cb16944a66 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 26 Mar 2016 19:19:32 -0400
Subject: [PATCH 2/2] Correctly build sigil using the sigil makefile

[ci skip]
---
 deb.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/deb.mk b/deb.mk
index 578661c86..45e3f9b1d 100644
--- a/deb.mk
+++ b/deb.mk
@@ -169,8 +169,9 @@ deb-sigil: deb-setup golang
 	@echo "-> Copying files into place"
 	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/sigil && go get github.com/gliderlabs/sigil
 	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/sigil && cd /home/vagrant/gocode/src/github.com/gliderlabs/sigil && make deps
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/sigil && cd /home/vagrant/gocode/src/github.com/gliderlabs/sigil && rm -f sigil && go build -o sigil
-	mv /home/vagrant/gocode/src/github.com/gliderlabs/sigil/sigil /tmp/build/usr/local/bin/sigil
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/sigil && cd /home/vagrant/gocode/src/github.com/gliderlabs/sigil && make build
+	cp /home/vagrant/gocode/src/github.com/gliderlabs/sigil/build/Linux/sigil /tmp/build/usr/local/bin/sigil
+	chmod +x /tmp/build/usr/local/bin/sigil
 
 	@echo "-> Creating $(SIGIL_PACKAGE_NAME)"
 	sudo fpm -t deb -s dir -C /tmp/build -n sigil -v $(SIGIL_VERSION) -a $(SIGIL_ARCHITECTURE) -p $(SIGIL_PACKAGE_NAME) --url "https://github.com/$(SIGIL_REPO_NAME)" --description $(SIGIL_DESCRIPTION) --license 'MIT License' .