Skip to content

Commit 81c3bf4

Browse files
committed
Debian: Modernize packaging using dh --with pgxs_loop
1 parent 9fbd834 commit 81c3bf4

File tree

6 files changed

+16
-24
lines changed

6 files changed

+16
-24
lines changed

debian/changelog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
pg-wait-sampling (1.1.2-2) unstable; urgency=medium
2+
3+
* Team upload.
4+
* Use dh --with pgxs_loop.
5+
* R³: no, DH 13.
6+
7+
-- Christoph Berg <[email protected]> Wed, 02 Dec 2020 15:49:35 +0100
8+
19
pg-wait-sampling (1.1.2-1) unstable; urgency=medium
210

311
* New upstream version compatible with PG13

debian/compat

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/control

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ Section: database
33
Priority: optional
44
Maintainer: Adrien Nayrat <[email protected]>
55
Standards-Version: 4.5.0
6-
Build-Depends: debhelper (>=9~), postgresql-server-dev-all (>= 141~)
6+
Rules-Requires-Root: no
7+
Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~)
78
Homepage: https://github.com/postgrespro/pg_wait_sampling
89
Vcs-Browser: https://github.com/postgrespro/pg_wait_sampling
910
Vcs-Git: https://github.com/postgrespro/pg_wait_sampling.git

debian/control.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ Section: database
33
Priority: optional
44
Maintainer: Adrien Nayrat <[email protected]>
55
Standards-Version: 4.5.0
6-
Build-Depends: debhelper (>=9~), postgresql-server-dev-all (>= 141~)
6+
Rules-Requires-Root: no
7+
Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~)
78
Homepage: https://github.com/postgrespro/pg_wait_sampling
89
Vcs-Browser: https://github.com/postgrespro/pg_wait_sampling
910
Vcs-Git: https://github.com/postgrespro/pg_wait_sampling.git

debian/rules

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,10 @@
11
#!/usr/bin/make -f
22

3-
PKGVER = $(shell dpkg-parsechangelog | awk -F '[:-]' '/^Version:/ { print substr($$2, 2) }')
4-
EXCLUDE = --exclude-vcs --exclude=debian
5-
6-
include /usr/share/postgresql-common/pgxs_debian_control.mk
7-
8-
override_dh_auto_build:
9-
# do nothing
10-
11-
override_dh_auto_test:
12-
# nothing to do here, upstream tests used, see debian/tests/*
13-
14-
override_dh_auto_install:
15-
# build all supported versions
16-
+pg_buildext loop postgresql-%v-pg-wait-sampling
17-
183
override_dh_installdocs:
194
dh_installdocs --all README.md
205

21-
override_dh_auto_clean:
22-
$(MAKE) clean USE_PGXS=1 PG_CONFIG=/usr/bin/pg_config
6+
override_dh_pgxs_test:
7+
pg_buildext -o "shared_preload_libraries=pg_wait_sampling" installcheck . . postgresql-%v-pg-wait-sampling
238

24-
orig: debian/control clean
25-
cd .. && tar czf pg-wait-sampling_$(PKGVER).orig.tar.gz $(EXCLUDE) pg_wait_sampling-$(PKGVER)
269
%:
27-
dh $@
10+
dh $@ --with pgxs_loop

debian/tests/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Depends: @, postgresql-server-dev-all
1+
Depends: @, make
22
Tests: installcheck
33
Restrictions: allow-stderr

0 commit comments

Comments
 (0)