[pkg] commit the debian and helpers folder

. tag whitewhale for debugging
. add a gbp.conf
. > is deprecated, need to use either >> or >=

.gitlab-ci.yml

@@ -7,6 +7,8 @@ stages:
 
 .job_template: &job_definition
   stage: publish
+  tags:
+    - whitewhale
   # Only build packages for https://0xacab.org/leap/bitmask-dev, not
   # for forks
   image: "0xacab.org:4567/leap/gitlab-buildpackage:build_${DIST}_${ARCH}"
@@ -14,12 +16,14 @@ stages:
     - "pwd; git describe"
     - git checkout incoming
     - git checkout origin/master debian/ helpers/
-    #- build-build-package
+    - git add debian/* helpers/*
+    - git commit -m 'autocommit for debian folder'
+    - build-build-package
     # Test the package with lintian
-    #- build-test-lintian
-    #- upload-package
+    - build-test-lintian
+    - upload-package
     # sleep 1h to allow debugging of running container
-    - sleep 9999
+    #- sleep 9999
   artifacts:
     expire_in: 1w
     paths:
@@ -29,10 +33,24 @@ stages:
     - '*.deb'
     - 'results/*'
 
-package:amd64_stretch:
+#package:amd64_stretch:
+#  variables:
+#    ARCH: "amd64"
+#    DIST: "stretch"
+#    REPONAMES: "client"
+#    # need these because there are some go packages not in stretch
+#    # unfortunately, they aren't in stretch-backports either
+#    - echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list
+#    - echo 'deb-src http://deb.debian.org/debian stretch main' > /etc/apt/sources.list.d/sources.list
+#    # Default is to fail on warnings, we disable it here
+#    # unless all lintian warnings are fixed (#9033)
+#    LINTIAN_OPTS: "-X filename-length, --suppress-tags newer-standards-version"
+#  <<: *job_definition
+
+package:amd64_buster:
   variables:
     ARCH: "amd64"
-    DIST: "stretch"
+    DIST: "buster"
     REPONAMES: "client"
     # Default is to fail on warnings, we disable it here
     # unless all lintian warnings are fixed (#9033)

debian/control

@@ -2,7 +2,7 @@ Source: riseup-vpn
 Section: net
 Priority: extra
 Maintainer: LEAP Encryption Access Project <debian@leap.se>
-Build-Depends: debhelper (>= 10.0.0), dh-golang, golang-go (> 2:1.9),
+Build-Depends: debhelper (>= 10.0.0), dh-golang, golang-go (>> 2:1.9),
     golang-golang-x-text-dev (>= 0.3.0-2),
     libgtk-3-dev, libappindicator3-dev, pkg-config
 Standards-Version: 3.9.8

debian/gbp.conf

+[import-orig]
+pristine-tar=False
+
+[buildpackage]
+upstream-tree=SLOPPY
+debian-branch=incoming