From 08107203ec2758452fa1076ef6c3aaf25782de3b Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 23 Mar 2019 10:13:48 +0000
Subject: [PATCH] Update repository URL and switch to default CI workflow

---
 .gitlab-ci.yml     | 38 +-------------------------------------
 debian/control     |  2 +-
 debian/copyright   |  2 +-
 debian/rules       |  8 ++++----
 vendor/vendor.json |  2 +-
 5 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1f481b..f9d4632 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,37 +1 @@
-
-stages:
-  - build_src
-  - build_pkg
-  - upload
-
-build:src:
-  stage: build_src
-  image: "ai/build:stretch"
-  script: "build-dsc"
-  artifacts:
-    paths:
-      - build-deb/
-  only:
-    - master
-
-build:pkg:
-  stage: build_pkg
-  image: "ai/build:stretch"
-  script: "build-deb"
-  dependencies:
-    - build:src
-  artifacts:
-    paths:
-      - output-deb/
-  only:
-    - master
-
-upload:pkg:
-  stage: upload
-  image: "ai/pkg:base"
-  script: "upload-packages -r ai3"
-  dependencies:
-    - build:pkg
-  only:
-    - master
-
+include: "https://git.autistici.org/ai3/build-deb/raw/master/ci-common.yml"
diff --git a/debian/control b/debian/control
index 2678b97..a58f114 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: audisp-json
 Section: admin
 Priority: extra
 Maintainer: Autistici/Inventati <debian@autistici.org>
-Build-Depends: debhelper (>= 8.0.0), golang-go, dh-golang, dh-systemd
+Build-Depends: debhelper (>= 8.0.0), golang-any, dh-golang, dh-systemd
 Standards-Version: 3.9.4
 
 Package: audisp-json
diff --git a/debian/copyright b/debian/copyright
index 54a3f74..3283e9b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: audisp-json
-Source: <https://git.autistici.org/ai3/audisp-json>
+Source: <https://git.autistici.org/ai3/tools/audisp-json>
 
 Files: *
 Copyright: 2018 Autistici/Inventati <debian@autistici.org>
diff --git a/debian/rules b/debian/rules
index 15fc421..88ff20b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,12 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-export DH_GOPKG = git.autistici.org/ai3/audisp-json
+export DH_GOPKG = git.autistici.org/ai3/tools/audisp-json
 export DH_GOLANG_EXCLUDES = vendor
 
 %:
 	dh $@ --with golang --with systemd --buildsystem golang
 
-override_dh_install:
-	rm -fr $(CURDIR)/debian/audisp-json/usr/share/gocode
-	dh_install
+override_dh_auto_install:
+	dh_auto_install
+	$(RM) -rv debian/audisp-json/usr/share/gocode
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 4b868cd..c522c15 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -33,5 +33,5 @@
 			"revisionTime": "2017-07-21T12:20:51Z"
 		}
 	],
-	"rootPath": "git.autistici.org/ai3/audisp-json"
+	"rootPath": "git.autistici.org/ai3/tools/audisp-json"
 }
-- 
GitLab