diff -Nru yapet-2.2/debian/changelog yapet-2.2/debian/changelog --- yapet-2.2/debian/changelog 2018-11-06 08:19:39.000000000 +0000 +++ yapet-2.2/debian/changelog 2018-12-28 22:41:06.000000000 +0000 @@ -1,3 +1,11 @@ +yapet (2.2-3) unstable; urgency=medium + + * Replace home-made GitLab CI with the standard Salsa pipeline + * Bump Debhelper compat level to 12 + * Declare compliance with Debian policy 4.3.0 + + -- Salvatore Bonaccorso Fri, 28 Dec 2018 23:41:06 +0100 + yapet (2.2-2) unstable; urgency=medium * Avoid remote fonts to avoid privacy breach diff -Nru yapet-2.2/debian/compat yapet-2.2/debian/compat --- yapet-2.2/debian/compat 2018-11-06 08:19:39.000000000 +0000 +++ yapet-2.2/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru yapet-2.2/debian/control yapet-2.2/debian/control --- yapet-2.2/debian/control 2018-11-06 08:19:39.000000000 +0000 +++ yapet-2.2/debian/control 2018-12-28 22:41:06.000000000 +0000 @@ -2,14 +2,14 @@ Section: utils Priority: optional Maintainer: Salvatore Bonaccorso -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper-compat (= 12), gettext, libargon2-dev, libcppunit-dev, libncurses5-dev, libssl-dev, pkg-config -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Homepage: https://yapet.guengel.ch/ Vcs-Browser: https://salsa.debian.org/carnil/yapet Vcs-Git: https://salsa.debian.org/carnil/yapet.git diff -Nru yapet-2.2/debian/.gitlab-ci.yml yapet-2.2/debian/.gitlab-ci.yml --- yapet-2.2/debian/.gitlab-ci.yml 2018-11-06 08:19:39.000000000 +0000 +++ yapet-2.2/debian/.gitlab-ci.yml 2018-12-28 22:41:06.000000000 +0000 @@ -1,55 +1,16 @@ -variables: - DEBFULLNAME: "Salsa Pipeline" - DEBEMAIL: "" - DEBIAN_FRONTEND: noninteractive - WORKING_DIR: ./debian/output +include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml -stages: - - build - - test +build: + extends: .build-unstable -image: debian:unstable +reprotest: + extends: .test-reprotest -build package: - stage: build - artifacts: - expire_in: 180 day - name: "$CI_BUILD_NAME" - paths: - - ${WORKING_DIR}/ - script: - - apt-get update - - apt-get -y install eatmydata - - eatmydata apt-get -y build-dep . - - eatmydata apt-get -y install git-buildpackage - - gbp pull --ignore-branch --pristine-tar --track-missing - - gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} -us -uc +lintian: + extends: .test-lintian -run autopkgtest: - stage: test - script: - - apt-get update - - apt-get -y --no-install-recommends install autopkgtest eatmydata - - eatmydata autopkgtest -U ${WORKING_DIR}/*.deb -- null || [ $? -eq 8 ] +autopkgtest: + extends: .test-autopkgtest -run lintian: - stage: test - script: - - apt-get update - - apt-get -y --no-install-recommends install lintian dpkg-dev - - lintian -iI ${WORKING_DIR}/*.changes - -run reprotest: - stage: test - image: registry.salsa.debian.org/salsa-ci-team/images/reprotest - artifacts: - name: "$CI_BUILD_NAME" - expire_in: 180 day - paths: - - ./reprotest.log - when: always - script: - - apt-get update - - eatmydata apt-get -y build-dep . - - export DEB_BUILD_OPTIONS=nocheck - - eatmydata reprotest --no-diffoscope --min-cpus $(nproc --all) . -- null &> reprotest.log +piuparts: + extends: .test-piuparts