From d9d0a463d0f0fa44c3916818c5dbfea5c048cc38 Mon Sep 17 00:00:00 2001
From: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Wed, 2 Oct 2019 19:02:11 +1000
Subject: [PATCH] CI: minor update

---
 debian/.gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
index f4b9840e00..9e334c2647 100644
--- a/debian/.gitlab-ci.yml
+++ b/debian/.gitlab-ci.yml
@@ -3,7 +3,6 @@ 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
-  ORIGTAR_CMD: origtargz --tar-only
 # 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
   EATMYDATA: "yes"
@@ -12,7 +11,8 @@ variables:
 
 .origtargz:
   script: &origtargz |
-    ${ORIGTAR_CMD}
+    origtargz --clean
+    origtargz --tar-only
     rm -rf .git
 
 .pre_build:
@@ -34,7 +34,6 @@ dpkg-control:
   dependencies: []
   allow_failure: false
   script:
-    - wrap-and-sort --keep-first --trailing-comma # terrible way to fix "Cannot parse: ''" in "cme check dpkg-control".
     - cme check dpkg-control
 
 dpkg-copyright: