Merge remote-tracking branch 'salsa/dh-golang' into debian/master

debian/changelog

@@ -1,3 +1,12 @@
+aptly (1.3.0-2) unstable; urgency=medium
+
+  * Team upload, many thanks to Alexandre Viau for this work
+  * Switch to dh-golang. (Closes: #902038)
+  * Fix vcs-field-not-canonical.
+  * Fix insecure-copyright-format-uri.
+
+ -- Sebastien Delafond <seb@debian.org>  Fri, 22 Jun 2018 13:53:11 +0200
+
 aptly (1.3.0-1) unstable; urgency=medium
 
   * Fix copyright

debian/control

@@ -2,12 +2,17 @@ Source: aptly
 Section: utils
 Priority: optional
 Maintainer: Sebastien Delafond <seb@debian.org>
-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.3
 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/aptly-dev/aptly
+Testsuite: autopkgtest-pkg-go
 
 Package: aptly
 Architecture: any

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
 

debian/rules

@@ -4,30 +4,12 @@
 # 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/aptly-dev/aptly
-
-# our path
-SOURCE_DIR := $(CURDIR)
-DEST_DIR := $(CURDIR)/debian/aptly
-
-%:
-	dh $@ --sourcedirectory=$(SOURCE_DIR)
-
 override_dh_auto_test:
-	# nothing for now
+	# tests are failing for now and the pacakge vendors many libraries
-
-override_dh_auto_clean:
-	rm -fr $(DEST_DIR)
-
-override_dh_auto_build:
 
 override_dh_auto_install:
-	mkdir -p $(CURDIR)/src/github.com/aptly-dev
+	dh_auto_install -- --no-source
-	ln -sf ../../../ $(CURDIR)/src/github.com/aptly-dev/aptly
+
-	ls -l $(CURDIR)/src/github.com/aptly-dev/aptly/
+%:
-	GOBIN=$(CURDIR) GOPATH=$(CURDIR):$(SOURCE_DIR)/vendor go install -v $(SOURCE_DIR)/main.go
+	dh $@ --buildsystem=golang --with=golang,bash-completion
-	dh_bash-completion
+
-	mkdir -p $(DEST_DIR)/usr/bin
-	mv $(CURDIR)/main $(DEST_DIR)/usr/bin/aptly