[DRE-commits] [gitlab-workhorse] 01/02: Build using dh-golang; golang --> golang-any; Built-Using.

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch master
in repository gitlab-workhorse.

commit 6137a5d
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Mon Jul 18 06:41:02 2016

    Build using dh-golang; golang --> golang-any; Built-Using.
---
 debian/control |  8 +++++++-
 debian/rules   | 13 ++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 54ad987..21babc6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,12 @@ Section: httpd
 Priority: optional
 Maintainer: Pirate Praveen <praveen at debian.org>
 Build-Depends: debhelper (>= 9),
-               golang
+               dh-golang,
+               golang-any
+## tests:
+#    ,git
+#    ,curl
+#    ,unzip
 Standards-Version: 3.9.8
 Homepage: https://gitlab.com/gitlab-org/gitlab-workhorse/
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/gitlab-workhorse.git
@@ -11,6 +16,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/gitlab-workhorse.gi
 
 Package: gitlab-workhorse
 Architecture: any
+Built-Using: ${misc:Built-Using}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: unloads Git HTTP traffic from the GitLab Rails app (Unicorn)
diff --git a/debian/rules b/debian/rules
index 0fad2c4..f002a6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ 
+export DH_GOPKG = gitlab.com/gitlab-org/gitlab-workhorse
+#export DH_GOLANG_INSTALL_ALL := 1
+export DH_GOLANG_INSTALL_EXTRA = testdata
 
-override_dh_auto_install:
-	make -j1 install DESTDIR=debian/gitlab-workhorse \
-	AM_UPDATE_INFO_DIR=no PREFIX=/usr
+%:
+	dh $@ --buildsystem=golang --with=golang --builddirectory=_build
 
 override_dh_auto_test:
 	echo "Diasble tests, need internet to clone test files"
-
-
+#	-PATH="$(CURDIR)/_build/bin:$$PATH" dh_auto_test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab-workhorse.git