diff --git a/debian/changelog b/debian/changelog index 4de5c9ae6089af051b71b6cb2a15efa0ef47340d..c88af481266a7ed503a8eabc9a8c95d975e21264 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,18 @@ -mimeo (1.5.1-8) UNRELEASED; urgency=low +mimeo (1.5.1-8) unstable; urgency=low + [ Debian Janitor ] * Set upstream metadata fields: Bug-Database, Bug-Submit, Name, Repository, Repository-Browse. * Remove unnecessary XS-Testsuite field in debian/control. - -- Debian Janitor <janitor@jelmer.uk> Wed, 29 Jul 2020 20:51:06 -0000 + [ Christoph Berg ] + * Upload for PostgreSQL 13. + * Use dh --with pgxs_loop. + * DH 13. + * debian/tests: Use 'make' instead of postgresql-server-dev-all. + * debian/tests: Use installed-versions instead of supported-versions. + + -- Christoph Berg <myon@debian.org> Fri, 02 Oct 2020 11:43:04 +0200 mimeo (1.5.1-7) unstable; urgency=medium diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec635144f60048986bc560c5576355344005e6e7..0000000000000000000000000000000000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index 6f08eeaf3a660bf1277c740a812da5f89fa4ab45..9f5aad40010584fb4db3a5eaaef94db00ed5d7ad 100644 --- a/debian/control +++ b/debian/control @@ -3,16 +3,16 @@ Section: database Priority: optional Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Uploaders: Christoph Berg <myon@debian.org> -Build-Depends: debhelper (>= 9), postgresql-server-dev-all (>= 171~) -Standards-Version: 4.4.0 +Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~) +Standards-Version: 4.5.0 Homepage: https://github.com/omniti-labs/mimeo Vcs-Browser: https://salsa.debian.org/postgresql/mimeo Vcs-Git: https://salsa.debian.org/postgresql/mimeo.git -Package: postgresql-12-mimeo +Package: postgresql-13-mimeo Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, - postgresql-12, postgresql-contrib-12 + postgresql-13, postgresql-contrib-13 # run_refresh.py is optional Recommends: python3 Description: specialized, per-table replication between PostgreSQL instances diff --git a/debian/control.in b/debian/control.in index 90698c4a7b2756696b8b3a9cfc25e3c6321e57a9..ffc6d51223763b43786e2b98c0dae56630dc645d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,8 +3,8 @@ Section: database Priority: optional Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Uploaders: Christoph Berg <myon@debian.org> -Build-Depends: debhelper (>= 9), postgresql-server-dev-all (>= 171~) -Standards-Version: 4.4.0 +Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~) +Standards-Version: 4.5.0 Homepage: https://github.com/omniti-labs/mimeo Vcs-Browser: https://salsa.debian.org/postgresql/mimeo Vcs-Git: https://salsa.debian.org/postgresql/mimeo.git diff --git a/debian/rules b/debian/rules index 884275b95c4fc9454f4d9bac57580cb75b54f356..72ce2a544b29c5605e87912630809b2f054306f9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,11 @@ #!/usr/bin/make -f -include /usr/share/postgresql-common/pgxs_debian_control.mk - -override_dh_auto_build: - -override_dh_auto_test: - # nothing to do here, see debian/tests/* instead - -override_dh_auto_install: - +pg_buildext loop postgresql-%v-mimeo - rm -rf debian/postgresql-*-mimeo/usr/share/doc/postgresql-doc-* - override_dh_installdocs: dh_installdocs --all README.* doc/* + rm -rf debian/postgresql-*-mimeo/usr/share/doc/postgresql-doc-* + +override_dh_pgxs_test: + # defer testing to autopkgtest %: - dh $@ + dh $@ --with pgxs_loop diff --git a/debian/tests/control b/debian/tests/control index 8da1592abf29a41122f1ac5e26d770863e88aecb..14268d7f00b3824a13468d3f24340c04440b3fee 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ -Depends: @, libtap-parser-sourcehandler-pgtap-perl, postgresql-12-pgtap, postgresql-server-dev-all, newpid +Depends: @, libtap-parser-sourcehandler-pgtap-perl, postgresql-13-pgtap, make, newpid Tests: prove Restrictions: allow-stderr diff --git a/debian/tests/control.in b/debian/tests/control.in index 5211850d8bb8e3509af43009ce74f94aa5ca1656..97906151f488ba8b2bd311fe0996564665784d6a 100644 --- a/debian/tests/control.in +++ b/debian/tests/control.in @@ -1,3 +1,3 @@ -Depends: @, libtap-parser-sourcehandler-pgtap-perl, postgresql-PGVERSION-pgtap, postgresql-server-dev-all, newpid +Depends: @, libtap-parser-sourcehandler-pgtap-perl, postgresql-PGVERSION-pgtap, make, newpid Tests: prove Restrictions: allow-stderr diff --git a/debian/tests/prove b/debian/tests/prove index fb604dd3893a39322ecab08240944af5e62e3b63..2dc3a296dfd06c41df27d1f958e4b0cfba865f96 100755 --- a/debian/tests/prove +++ b/debian/tests/prove @@ -3,7 +3,7 @@ set -ex export TZ=UTC -for v in $(pg_buildext supported-versions); do +for v in $(pg_buildext installed-versions); do newnet pg_virtualenv -v $v -c '-p 5432' <<-EOF set -ex psql -Xc 'CREATE EXTENSION pgtap'