From c5c5a5b1dcf4f0220321fb79927aa4bed5cdb047 Mon Sep 17 00:00:00 2001
From: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Wed, 23 Oct 2019 19:20:19 +1100
Subject: [PATCH] CI: new lintian job + minor corrections

---
 debian/.gitlab-ci.yml | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
index 1f3831f86e..837dfeac7f 100644
--- a/debian/.gitlab-ci.yml
+++ b/debian/.gitlab-ci.yml
@@ -2,20 +2,13 @@
 variables:
   GIT_DEPTH: 128
   PB_RESULT: '${CI_PROJECT_DIR}/../${CI_PROJECT_NAME}_${CI_BUILD_REF}_${CI_JOB_NAME}_${CI_JOB_ID}'
-  LINTIAN_CMD: eval lintian --no-tag-display-limit --info --display-info --color=auto --display-experimental --pedantic "${PB_RESULT}"/*.changes
+  LINTIAN_CMD: eval lintian --no-tag-display-limit --info --display-info --color=always --display-experimental --pedantic
 # PDEBUILD_CMD: eval pdebuild --use-pdebuild-internal --pbuildersatisfydepends "/usr/lib/pbuilder/pbuilder-satisfydepends-classic" --buildresult "${PB_RESULT}" --debbuildopts -sa
-  PDEBUILD_CMD: eval pdebuild --use-pdebuild-internal --buildresult "${PB_RESULT}" --debbuildopts -sa
+  PDEBUILD_CMD: eval pdebuild --debbuildopts "-sa" --use-pdebuild-internal --buildresult "${PB_RESULT}"
   EATMYDATA: "yes"
   AUTOCLEANAPTCACHE: "yes"
   USE_PDEBUILD_INTERNAL: "yes"
 
-.origtargz:
-  script: &origtargz |
-    origtargz --clean
-    origtargz --tar-only
-    rm -rf .git
-    debian/unpack-components.sh
-
 .pre_build:
   script: &pre_build |
     uname -a
@@ -24,6 +17,12 @@ variables:
     pwd
     mkdir -v -p "${PB_RESULT}"
 
+.origtargz:
+  script: &origtargz |
+    origtargz --clean && origtargz --tar-only
+    rm -rf .git
+    if [ -x "debian/unpack-components.sh" ]; then debian/unpack-components.sh; fi
+
 stages:
   - check
   - build
@@ -46,6 +45,21 @@ dpkg-copyright:
   script: |
     cme check dpkg-copyright
 
+lintian:
+  stage: check
+  tags:
+    - lintian
+  dependencies: []
+  allow_failure: false
+  before_script:
+    - *pre_build
+    - cp -r debian "${PB_RESULT}"/
+    - cd "${PB_RESULT}"
+  script:
+    - *origtargz
+    - dpkg-buildpackage -S -sa -uc -us --no-check-builddeps --no-pre-clean
+    - ${LINTIAN_CMD}
+
 yamllint:
   stage: check
   tags:
@@ -63,7 +77,6 @@ unstable-binary-indep:
     - pbuilder
     - amd64
   dependencies: []
-## https://bugs.debian.org/867822
   allow_failure: false
   before_script:
     - *pre_build
@@ -83,7 +96,6 @@ testing_unstable-amd64:
   script:
     - *origtargz
     - ${PDEBUILD_CMD} --architecture amd64 -- --basetgz /var/cache/pbuilder/testing_unstable-amd64.tgz
-    - ${LINTIAN_CMD}
 
 unstable-i386:
   stage: build
@@ -110,7 +122,7 @@ unstable-amd64:
   script:
     - *origtargz
     - ${PDEBUILD_CMD} --architecture amd64 -- --basetgz /var/cache/pbuilder/unstable-amd64.tgz
-    - ${LINTIAN_CMD}
+    - ${LINTIAN_CMD} "${PB_RESULT}"/*.changes
 
 experimental-amd64:
   stage: build