From dba3da56dbe046bdb881e96c61752a49b5179784 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Tue, 19 Mar 2019 20:37:04 +0100 Subject: [pkg] fix debian file path --- Makefile | 2 +- debian/control | 2 +- docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a783e44..b877723 100755 --- a/Makefile +++ b/Makefile @@ -127,7 +127,7 @@ build_deb: tgz cd build && tar xzf $(APPNAME)_$(shell echo ${VERSION} | cut -d '-' -f 1-2).orig.tar.gz cp -r debian/ build/$(APPNAME)-$(VERSION)/ cd build/$(APPNAME)-$(VERSION) && debuild -us -uc - cp build/$(APPNAME)_$(shell dpkg-parsechangelog -SVersion)_*.deb dist/ + cp build/$(APPNAME)_$(shell echo ${VERSION} | cut -d '-' -f 1-2)_*.deb dist/ git checkout -- debian/changelog # ----------------------------------------------------------------------------- diff --git a/debian/control b/debian/control index 1b5f7c4..5341fa0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: extra Maintainer: LEAP Encryption Access Project Build-Depends: debhelper (>= 10.0.0), dh-golang, golang-go (> 2:1.9), - golang-golang-x-text-dev, + golang-golang-x-text-dev (>= 0.3.0-2), libgtk-3-dev, libappindicator3-dev, pkg-config Standards-Version: 3.9.8 diff --git a/docker/Dockerfile b/docker/Dockerfile index f2e3877..f97cc32 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ # An image to build and package the go binary for Bitmask Lite (RiseupVPN) # (c) LEAP Encryption Access Project 2018 -FROM ubuntu:18.04 +FROM ubuntu:disco MAINTAINER LEAP Encryption Access Project LABEL Description="An image to build Bitmask Lite" Vendor="LEAP" Version="1.0" -- cgit v1.2.3