Merge remote-tracking branch 'origin'

.gitlab-ci.yml

@@ -22,8 +22,6 @@ stages:
     # Test the package with lintian
     - build-test-lintian
     - upload-package
-    # sleep 1h to allow debugging of running container
-    #- sleep 9999
   artifacts:
     expire_in: 1w
     paths:
@@ -33,20 +31,6 @@ stages:
     - '*.deb'
     - 'results/*'
 
-#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"
@@ -56,5 +40,3 @@ package:amd64_buster:
     # unless all lintian warnings are fixed (#9033)
     LINTIAN_OPTS: "-X filename-length, --suppress-tags newer-standards-version"
   <<: *job_definition
-
-

debian/copyright

@@ -22,4 +22,3 @@ License: GPL-3+
  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-