diff --git a/debian/changelog b/debian/changelog index abd0e226..329c4802 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +aptly (1.2.0-5) UNRELEASED; urgency=medium + + * Team upload. + * Switch to dh-golang. (Closes: #902038) + * Fix vcs-field-not-canonical. + * Fix insecure-copyright-format-uri. + + -- Alexandre Viau Thu, 21 Jun 2018 14:55:25 -0400 + aptly (1.2.0-4) unstable; urgency=medium * Enable Built-Using in debian/control (thanks M. Staperberg) diff --git a/debian/control b/debian/control index 9824c84c..be899b44 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,17 @@ Source: aptly Section: utils Priority: optional Maintainer: Sebastien Delafond -Build-Depends: debhelper (>= 9.0.0), golang-any, golang-go.tools, bash-completion +Build-Depends: debhelper (>= 9.0.0), + dh-golang, + golang-any, + golang-go.tools, + bash-completion Standards-Version: 4.1.1 Homepage: http://www.aptly.info -Vcs-Git: https://salsa.debian.org/debian/aptly +Vcs-Git: https://salsa.debian.org/debian/aptly.git Vcs-Browser: https://salsa.debian.org/debian/aptly XS-Go-Import-Path: github.com/smira/aptly +Testsuite: autopkgtest-pkg-go Package: aptly Architecture: any diff --git a/debian/copyright b/debian/copyright index 4780f9e0..32590d55 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: aptly Source: http://www.aptly.info diff --git a/debian/rules b/debian/rules index 1b6f7fd3..772bac65 100755 --- a/debian/rules +++ b/debian/rules @@ -4,30 +4,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# DH_GOPKG is the upstream path which you would normally “go get”. -# Using it allows us to build applications without patching locations. -export DH_GOPKG := github.com/smira/aptly - -# our path -SOURCE_DIR := $(CURDIR) -DEST_DIR := $(CURDIR)/debian/aptly - -%: - dh $@ --sourcedirectory=$(SOURCE_DIR) - override_dh_auto_test: - # nothing for now - -override_dh_auto_clean: - rm -fr $(DEST_DIR) - -override_dh_auto_build: + # tests are failing for now and the pacakge vendors many libraries override_dh_auto_install: - mkdir -p $(CURDIR)/src/github.com/smira/ - ln -sf ../../../ $(CURDIR)/src/github.com/smira/aptly - ls -l $(CURDIR)/src/github.com/smira/aptly/ - GOBIN=$(CURDIR) GOPATH=$(CURDIR):$(SOURCE_DIR)/vendor go install -v $(SOURCE_DIR)/main.go - dh_bash-completion - mkdir -p $(DEST_DIR)/usr/bin - mv $(CURDIR)/main $(DEST_DIR)/usr/bin/aptly + dh_auto_install -- --no-source + +%: + dh $@ --buildsystem=golang --with=golang,bash-completion