diff --git a/debian/changelog b/debian/changelog index 5463c1a..99e0fed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,18 @@ -pg-snakeoil (1.3-2) UNRELEASED; urgency=medium +pg-snakeoil (1.3-2) unstable; urgency=medium + [ Debian Janitor ] * Bump debhelper from deprecated 9 to 10. * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse. - -- Debian Janitor Tue, 28 Apr 2020 22:50:31 +0000 + [ Christoph Berg ] + * Upload for PostgreSQL 13. + * Use dh --with pgxs. + * R³: no. + * DH 13. + * debian/tests: Use 'make' instead of postgresql-server-dev-all. + + -- Christoph Berg Mon, 19 Oct 2020 11:45:56 +0200 pg-snakeoil (1.3-1) unstable; urgency=medium diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 759b9df..39f723c 100644 --- a/debian/control +++ b/debian/control @@ -4,17 +4,18 @@ Priority: optional Maintainer: Debian PostgreSQL Maintainers Uploaders: Christoph Berg Build-Depends: - debhelper (>= 10~), + debhelper-compat (= 13), libclamav-dev, - postgresql-server-dev-all (>= 153~), -Standards-Version: 4.2.1 + postgresql-all (>= 217~), +Standards-Version: 4.5.0 +Rules-Requires-Root: no Vcs-Browser: https://github.com/credativ/pg_snakeoil Vcs-Git: https://github.com/credativ/pg_snakeoil.git -Package: postgresql-12-snakeoil +Package: postgresql-13-snakeoil Architecture: any Depends: - postgresql-12, + postgresql-13, ${misc:Depends}, ${shlibs:Depends}, Recommends: diff --git a/debian/control.in b/debian/control.in index 5fc7a60..1f580e6 100644 --- a/debian/control.in +++ b/debian/control.in @@ -4,10 +4,11 @@ Priority: optional Maintainer: Debian PostgreSQL Maintainers Uploaders: Christoph Berg Build-Depends: - debhelper (>= 10~), + debhelper-compat (= 13), libclamav-dev, - postgresql-server-dev-all (>= 153~), -Standards-Version: 4.2.1 + postgresql-all (>= 217~), +Standards-Version: 4.5.0 +Rules-Requires-Root: no Vcs-Browser: https://github.com/credativ/pg_snakeoil Vcs-Git: https://github.com/credativ/pg_snakeoil.git diff --git a/debian/rules b/debian/rules index 9a69eda..9fc6700 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,10 @@ #!/usr/bin/make -f -include /usr/share/postgresql-common/pgxs_debian_control.mk - -override_dh_auto_build: - +pg_buildext build build-%v - -override_dh_auto_test: - # nothing to do here, see debian/tests/* instead - -override_dh_auto_install: - +pg_buildext install build-%v postgresql-%v-snakeoil - override_dh_installdocs: dh_installdocs --all README.* -override_dh_auto_clean: - +pg_buildext clean build-%v +override_dh_pgxs_test: + pg_buildext -o "pg_snakeoil.signature_dir=$(CURDIR)/testfiles" installcheck . . postgresql-%v-snakeoil %: - dh $@ + dh $@ --with pgxs diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides deleted file mode 100644 index 4076145..0000000 --- a/debian/source/lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# don't bug people uploading from @work -source: changelog-should-mention-nmu -source: source-nmu-has-incorrect-version-number diff --git a/debian/tests/control b/debian/tests/control index b0dc4e8..8af9907 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ -Depends: @, postgresql-server-dev-all +Depends: @, make Tests: installcheck Restrictions: allow-stderr