diff -Nru prometheus-apache-exporter-0.5.0+ds/debian/changelog prometheus-apache-exporter-0.5.0+ds/debian/changelog --- prometheus-apache-exporter-0.5.0+ds/debian/changelog 2018-01-14 14:29:53.000000000 +0000 +++ prometheus-apache-exporter-0.5.0+ds/debian/changelog 2018-12-13 23:53:57.000000000 +0000 @@ -1,3 +1,25 @@ +prometheus-apache-exporter (0.5.0+ds-2) unstable; urgency=medium + + [ Alexandre Viau ] + * Point Vcs-* urls to salsa.debian.org. + + [ Raúl Benencia ] + * Fix long description. + * Update Standards-Version to 4.1.5. + + [ Fabian Weisshaar ] + * Add missing postinst script to create prometheus user + * Avoid recursive chown calls + * Update debhelper compat + + [ Martín Ferrari ] + * debian/gbp.conf: Update branches. + * debian/control: Add myself to Uploaders. + * debian/dirs: Add var/log/prometheus. + * Update Standards-Version with no changes. + + -- Martín Ferrari Thu, 13 Dec 2018 23:53:57 +0000 + prometheus-apache-exporter (0.5.0+ds-1) unstable; urgency=medium [ Martín Ferrari ] diff -Nru prometheus-apache-exporter-0.5.0+ds/debian/compat prometheus-apache-exporter-0.5.0+ds/debian/compat --- prometheus-apache-exporter-0.5.0+ds/debian/compat 2018-01-14 14:29:53.000000000 +0000 +++ prometheus-apache-exporter-0.5.0+ds/debian/compat 2018-12-13 23:53:57.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru prometheus-apache-exporter-0.5.0+ds/debian/control prometheus-apache-exporter-0.5.0+ds/debian/control --- prometheus-apache-exporter-0.5.0+ds/debian/control 2018-01-14 14:29:53.000000000 +0000 +++ prometheus-apache-exporter-0.5.0+ds/debian/control 2018-12-13 23:53:57.000000000 +0000 @@ -1,10 +1,11 @@ Source: prometheus-apache-exporter Maintainer: Debian Go Packaging Team Uploaders: Jelmer Vernooij , + Martín Ferrari , Section: net Testsuite: autopkgtest-pkg-go Priority: optional -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper (>= 11), dh-golang, golang-any, golang-github-beorn7-perks-dev, @@ -13,9 +14,9 @@ golang-github-sirupsen-logrus-dev, golang-goprotobuf-dev, golang-protobuf-extensions-dev, -Standards-Version: 4.1.3 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/prometheus-apache-exporter.git -Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/prometheus-apache-exporter.git +Standards-Version: 4.2.1 +Vcs-Browser: https://salsa.debian.org/go-team/packages/prometheus-apache-exporter +Vcs-Git: https://salsa.debian.org/go-team/packages/prometheus-apache-exporter.git Homepage: https://github.com/neezgee/apache_exporter/ XS-Go-Import-Path: github.com/neezgee/apache_exporter @@ -27,7 +28,7 @@ Enhances: apache2, Built-Using: ${misc:Built-Using}, Description: Prometheus exporter for Apache server metrics - Prometheus exporter for PostgreSQL server metrics, written in Go. + Prometheus exporter for Apache server metrics, written in Go. . This server reads Apache mod_status statistics and exports them via HTTP for consumption by Prometheus. diff -Nru prometheus-apache-exporter-0.5.0+ds/debian/dirs prometheus-apache-exporter-0.5.0+ds/debian/dirs --- prometheus-apache-exporter-0.5.0+ds/debian/dirs 2018-01-14 14:29:53.000000000 +0000 +++ prometheus-apache-exporter-0.5.0+ds/debian/dirs 2018-12-13 23:53:57.000000000 +0000 @@ -1 +1,2 @@ usr/bin +var/log/prometheus diff -Nru prometheus-apache-exporter-0.5.0+ds/debian/gbp.conf prometheus-apache-exporter-0.5.0+ds/debian/gbp.conf --- prometheus-apache-exporter-0.5.0+ds/debian/gbp.conf 2018-01-14 14:29:53.000000000 +0000 +++ prometheus-apache-exporter-0.5.0+ds/debian/gbp.conf 2018-12-13 23:53:57.000000000 +0000 @@ -1,3 +1,6 @@ [DEFAULT] -pristine-tar = False +debian-branch = debian/sid + +[buildpackage] +dist = DEP14 upstream-tag = upstream/%(version)s diff -Nru prometheus-apache-exporter-0.5.0+ds/debian/gitlab-ci.yml prometheus-apache-exporter-0.5.0+ds/debian/gitlab-ci.yml --- prometheus-apache-exporter-0.5.0+ds/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ prometheus-apache-exporter-0.5.0+ds/debian/gitlab-ci.yml 2018-12-13 23:53:57.000000000 +0000 @@ -0,0 +1,28 @@ + +# auto-generated, DO NOT MODIFY. +# The authoritative copy of this file lives at: +# https://salsa.debian.org/go-team/ci/blob/master/cmd/ci/gitlabciyml.go + +# TODO: publish under debian-go-team/ci +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" diff -Nru prometheus-apache-exporter-0.5.0+ds/debian/init prometheus-apache-exporter-0.5.0+ds/debian/init --- prometheus-apache-exporter-0.5.0+ds/debian/init 2018-01-14 14:29:53.000000000 +0000 +++ prometheus-apache-exporter-0.5.0+ds/debian/init 2018-12-13 23:53:57.000000000 +0000 @@ -35,8 +35,8 @@ do_start_prepare() { mkdir -p `dirname $PIDFILE` || true - chown -R $USER: `dirname $LOGFILE` || return 1 - chown -R $USER: `dirname $PIDFILE` || return 1 + chown $USER: `dirname $LOGFILE` || return 1 + chown $USER: `dirname $PIDFILE` || return 1 if test -z "$DATA_SOURCE_NAME"; then log_failure_msg 'missing $DATA_SOURCE_NAME' exit diff -Nru prometheus-apache-exporter-0.5.0+ds/debian/postinst prometheus-apache-exporter-0.5.0+ds/debian/postinst --- prometheus-apache-exporter-0.5.0+ds/debian/postinst 1970-01-01 00:00:00.000000000 +0000 +++ prometheus-apache-exporter-0.5.0+ds/debian/postinst 2018-12-13 23:53:57.000000000 +0000 @@ -0,0 +1,51 @@ +#!/bin/sh + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + # Add prometheus user + if ! getent passwd prometheus > /dev/null; then + adduser --quiet --system --home /var/lib/prometheus --no-create-home \ + --group --gecos "Prometheus daemon" prometheus || true + fi + + chown prometheus:prometheus /var/lib/prometheus || true + chown prometheus:prometheus /var/log/prometheus || true + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + : + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0