diff -Nru prometheus-process-exporter-0.7.10/debian/changelog prometheus-process-exporter-0.7.10/debian/changelog --- prometheus-process-exporter-0.7.10/debian/changelog 2021-11-26 19:24:40.000000000 +0000 +++ prometheus-process-exporter-0.7.10/debian/changelog 2022-03-15 22:44:42.000000000 +0000 @@ -1,3 +1,13 @@ +prometheus-process-exporter (0.7.10-2) unstable; urgency=medium + + * Team upload. + * Update gbp.conf following latest Go Team workflow. + * Update debian/watch file. + * Fix typo in default file. + Spotted by Daniel Swarbrick . + + -- Guillem Jover Tue, 15 Mar 2022 23:44:42 +0100 + prometheus-process-exporter (0.7.10-1) unstable; urgency=medium * Team upload. diff -Nru prometheus-process-exporter-0.7.10/debian/default prometheus-process-exporter-0.7.10/debian/default --- prometheus-process-exporter-0.7.10/debian/default 2021-11-26 19:24:40.000000000 +0000 +++ prometheus-process-exporter-0.7.10/debian/default 2022-01-20 18:36:14.000000000 +0000 @@ -1,5 +1,5 @@ # Set the command-line arguments to pass to the server. -# Due to shell scaping, to pass backslashes for regexes, you need to double +# Due to shell escaping, to pass backslashes for regexes, you need to double # them (\\d for \d). If running under systemd, you need to double them again # (\\\\d to mean \d), and escape newlines too. ARGS="" diff -Nru prometheus-process-exporter-0.7.10/debian/gbp.conf prometheus-process-exporter-0.7.10/debian/gbp.conf --- prometheus-process-exporter-0.7.10/debian/gbp.conf 2021-11-26 19:17:30.000000000 +0000 +++ prometheus-process-exporter-0.7.10/debian/gbp.conf 2021-12-03 17:29:50.000000000 +0000 @@ -1,6 +1,3 @@ [DEFAULT] debian-branch = debian/sid - -[buildpackage] dist = DEP14 -upstream-tag = upstream/%(version)s diff -Nru prometheus-process-exporter-0.7.10/debian/gitlab-ci.yml prometheus-process-exporter-0.7.10/debian/gitlab-ci.yml --- prometheus-process-exporter-0.7.10/debian/gitlab-ci.yml 2021-11-26 19:17:30.000000000 +0000 +++ prometheus-process-exporter-0.7.10/debian/gitlab-ci.yml 2021-11-29 17:25:00.000000000 +0000 @@ -1,26 +1,6 @@ # auto-generated, DO NOT MODIFY. # The authoritative copy of this file lives at: -# https://salsa.debian.org/go-team/ci/blob/master/config/gitlabciyml.go - -image: stapelberg/ci2 - -test_the_archive: - artifacts: - paths: - - before-applying-commit.json - - after-applying-commit.json - script: - # Create an overlay to discard writes to /srv/gopath/src after the build: - - "rm -rf /cache/overlay/{upper,work}" - - "mkdir -p /cache/overlay/{upper,work}" - - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src" - - "export GOPATH=/srv/gopath" - - "export GOCACHE=/cache/go" - # Build the world as-is: - - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json" - # Copy this package into the overlay: - - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'" - - "pgt-gopath -dsc /tmp/export/*.dsc" - # Rebuild the world: - - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json" - - "ci-diff before-applying-commit.json after-applying-commit.json" +# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go +--- +include: + - https://salsa.debian.org/go-team/infra/pkg-go-tools/-/raw/master/pipeline/test-archive.yml diff -Nru prometheus-process-exporter-0.7.10/debian/watch prometheus-process-exporter-0.7.10/debian/watch --- prometheus-process-exporter-0.7.10/debian/watch 2021-11-26 19:18:41.000000000 +0000 +++ prometheus-process-exporter-0.7.10/debian/watch 2021-12-03 17:29:50.000000000 +0000 @@ -1,5 +1,5 @@ version=4 opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%,\ - uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/,\ + uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/$1~$2$3/,\ dversionmangle=s/\+ds\d*$//,repacksuffix=+ds1" \ https://github.com/ncabatoff/process-exporter/tags .*/v?(\d\S+)\.tar\.gz