diff --git a/debian/control b/debian/control index 311d06bc0f369b31994e161371006037fbdd8112..f8572565b2182b30083128adfe47c1ecf36ac7f7 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: liber Section: net Priority: extra Maintainer: ale <ale@incal.net> -Build-Depends: debhelper (>= 8.0.0), dh-systemd (>= 1.5) +Build-Depends: debhelper (>= 8.0.0), dh-systemd (>= 1.5), golang-go (>= 1.5) Standards-Version: 3.9.4 Homepage: https://git.autistici.org/ale/liber diff --git a/debian/rules b/debian/rules index 12af07b6e28ec8d18e276fb7ec7a360324a9cc2d..d17d4bbfe89af097765707de3f59a32e3d788ac4 100755 --- a/debian/rules +++ b/debian/rules @@ -16,12 +16,10 @@ PKGDIR = $(DEBDIR)/liber dh $@ --with systemd override_dh_install: - # Build the sources using your locally-installed Go version. - # NB: This is not an acceptable way to build a proper Debian package. install -m 755 -o root -g root -d $(PKGDIR)/usr/bin install -m 755 -o root -g root -d $(PKGDIR)/usr/share/liber -mkdir build - (export PATH=$$PATH:/usr/local/go/bin ; export GOPATH=$(CURDIR)/build ; mkdir -p build/src/$(shell dirname $(DH_GOPKG)) ; ln -s $(CURDIR) build/src/$(DH_GOPKG) ; cd build/src/$(DH_GOPKG) && go install -v ./...) + (export GOPATH=$(CURDIR)/build ; mkdir -p build/src/$(shell dirname $(DH_GOPKG)) ; ln -s $(CURDIR) build/src/$(DH_GOPKG) ; cd build/src/$(DH_GOPKG) && go install -v ./...) (for f in liber liberdbtool ; do \ install -m 755 -o root -g root build/bin/$$f $(PKGDIR)/usr/bin/$$f ; done) (umask 022; cp -R --preserve=timestamps htdocs $(PKGDIR)/usr/share/liber/htdocs)