From 7c42baaf71857e9b26692bd49283d2b0fdb4531a Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Sun, 18 Oct 2020 22:28:25 +0200 Subject: [PATCH 1/4] Debian: Upload for PostgreSQL 13. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use dh --with pgxs_loop. * DH 13. * R³: no. * debian/tests: Use 'make' instead of postgresql-server-dev-all. --- debian/changelog | 10 +++++++++ debian/compat | 1 - debian/control | 50 +++++------------------------------------ debian/control.in | 5 +++-- debian/rules | 17 +++----------- debian/tests/control | 2 +- debian/tests/control.in | 2 +- 7 files changed, 23 insertions(+), 64 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 50d847d..10ca530 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +hypopg (1.1.4-2) unstable; urgency=medium + + * Team upload for PostgreSQL 13. + * Use dh --with pgxs_loop. + * DH 13. + * R³: no. + * debian/tests: Use 'make' instead of postgresql-server-dev-all. + + -- Christoph Berg Sun, 18 Oct 2020 22:16:44 +0200 + hypopg (1.1.4-1) unstable; urgency=medium * New upstream version with PG13 support. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index c8ea42a..f6b9163 100644 --- a/debian/control +++ b/debian/control @@ -2,59 +2,19 @@ Source: hypopg Section: database Priority: optional Maintainer: Julien Rouhaud -Standards-Version: 4.1.3 -Build-Depends: debhelper (>=9~), postgresql-server-dev-all (>= 141~) +Standards-Version: 4.5.0 +Rules-Requires-Root: no +Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~) Homepage: https://hypopg.readthedocs.io/ Vcs-Browser: https://github.com/hypopg/hypopg Vcs-Git: https://github.com/hypopg/hypopg.git -Package: postgresql-9.3-hypopg +Package: postgresql-13-hypopg Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-9.3 +Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-13 Description: PostgreSQL extension adding support for hypothetical indexes. An hypothetical, or virtual, index is an index that doesn't really exists, and thus doesn't cost CPU, disk or any resource to create. They're useful to know if specific indexes can increase performance for problematic queries, since you can know if PostgreSQL will use these indexes or not without having to spend resources to create them. - -Package: postgresql-9.4-hypopg -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-9.4 -Description: PostgreSQL extension adding support for hypothetical indexes. - An hypothetical, or virtual, index is an index that doesn't really exists, and - thus doesn't cost CPU, disk or any resource to create. They're useful to know - if specific indexes can increase performance for problematic queries, since - you can know if PostgreSQL will use these indexes or not without having to - spend resources to create them. - -Package: postgresql-9.5-hypopg -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-9.5 -Description: PostgreSQL extension adding support for hypothetical indexes. - An hypothetical, or virtual, index is an index that doesn't really exists, and - thus doesn't cost CPU, disk or any resource to create. They're useful to know - if specific indexes can increase performance for problematic queries, since - you can know if PostgreSQL will use these indexes or not without having to - spend resources to create them. - -Package: postgresql-9.6-hypopg -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-9.6 -Description: PostgreSQL extension adding support for hypothetical indexes. - An hypothetical, or virtual, index is an index that doesn't really exists, and - thus doesn't cost CPU, disk or any resource to create. They're useful to know - if specific indexes can increase performance for problematic queries, since - you can know if PostgreSQL will use these indexes or not without having to - spend resources to create them. - -Package: postgresql-10-hypopg -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-10 -Description: PostgreSQL extension adding support for hypothetical indexes. - An hypothetical, or virtual, index is an index that doesn't really exists, and - thus doesn't cost CPU, disk or any resource to create. They're useful to know - if specific indexes can increase performance for problematic queries, since - you can know if PostgreSQL will use these indexes or not without having to - spend resources to create them. - diff --git a/debian/control.in b/debian/control.in index 24fb783..0a80f54 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,8 +2,9 @@ Source: hypopg Section: database Priority: optional Maintainer: Julien Rouhaud -Standards-Version: 4.1.3 -Build-Depends: debhelper (>=9~), postgresql-server-dev-all (>= 141~) +Standards-Version: 4.5.0 +Rules-Requires-Root: no +Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~) Homepage: https://hypopg.readthedocs.io/ Vcs-Browser: https://github.com/hypopg/hypopg Vcs-Git: https://github.com/hypopg/hypopg.git diff --git a/debian/rules b/debian/rules index 0dd756b..3de2dd0 100755 --- a/debian/rules +++ b/debian/rules @@ -3,26 +3,15 @@ PKGVER = $(shell dpkg-parsechangelog | awk -F '[:-]' '/^Version:/ { print substr($$2, 2) }') EXCLUDE = --exclude-vcs --exclude=debian -include /usr/share/postgresql-common/pgxs_debian_control.mk - -override_dh_auto_build: - # do nothing - -override_dh_auto_test: - # nothing to do here, upstream tests used, see debian/tests/* - -override_dh_auto_install: - # build all supported versions - +pg_buildext loop postgresql-%v-hypopg - override_dh_installdocs: dh_installdocs --all CONTRIBUTORS.md README.md rm -rvf debian/*/usr/share/doc/postgresql-doc-* override_dh_installchangelogs: - dh_installchangelogs CHANGELOG.md upstream + dh_installchangelogs CHANGELOG.md orig: debian/control clean cd .. && tar czf hypopg_$(PKGVER).orig.tar.gz $(EXCLUDE) hypopg-$(PKGVER) + %: - dh $@ + dh $@ --with pgxs_loop diff --git a/debian/tests/control b/debian/tests/control index de2bd67..8749d12 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ -Depends: @, postgresql-server-dev-all, postgresql-contrib-9.3, postgresql-contrib-9.4, postgresql-contrib-9.5, postgresql-contrib-9.6, postgresql-contrib-10 +Depends: @, make, postgresql-contrib-13 Tests: installcheck Restrictions: allow-stderr diff --git a/debian/tests/control.in b/debian/tests/control.in index 6133138..9abbe52 100644 --- a/debian/tests/control.in +++ b/debian/tests/control.in @@ -1,3 +1,3 @@ -Depends: @, postgresql-server-dev-all, postgresql-contrib-PGVERSION +Depends: @, make, postgresql-contrib-PGVERSION Tests: installcheck Restrictions: allow-stderr From ba52a74f3452e5dcf64ff80d169e9b1d448ba921 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Sun, 18 Oct 2020 22:46:11 +0200 Subject: [PATCH 2/4] Debian: Use source format 3.0 (quilt). --- debian/changelog | 1 + debian/source/format | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 10ca530..16d03c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ hypopg (1.1.4-2) unstable; urgency=medium * Team upload for PostgreSQL 13. + * Use source format 3.0 (quilt). * Use dh --with pgxs_loop. * DH 13. * R³: no. diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) From 125970246fa94186ecc4c881b6269ad8e1ceeb8d Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Fri, 8 Oct 2021 10:43:47 +0200 Subject: [PATCH 3/4] Debian: Release 1.3.1-1 * New upstream version. * Fix github watch file. * Add myself to Uploaders. --- debian/changelog | 8 ++++++++ debian/control | 8 +++++--- debian/control.in | 4 +++- debian/tests/control | 2 +- debian/watch | 4 ++-- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40938de..11e097b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +hypopg (1.3.1-1) unstable; urgency=medium + + * New upstream version. + * Fix github watch file. + * Add myself to Uploaders. + + -- Christoph Berg Fri, 08 Oct 2021 10:40:57 +0200 + hypopg (1.2.0-1) unstable; urgency=medium * New upstream version. diff --git a/debian/control b/debian/control index f6b9163..ab0080c 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,18 @@ Source: hypopg Section: database Priority: optional Maintainer: Julien Rouhaud -Standards-Version: 4.5.0 +Uploaders: + Christoph Berg , +Standards-Version: 4.6.0 Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~) Homepage: https://hypopg.readthedocs.io/ Vcs-Browser: https://github.com/hypopg/hypopg Vcs-Git: https://github.com/hypopg/hypopg.git -Package: postgresql-13-hypopg +Package: postgresql-14-hypopg Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-13 +Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-14 Description: PostgreSQL extension adding support for hypothetical indexes. An hypothetical, or virtual, index is an index that doesn't really exists, and thus doesn't cost CPU, disk or any resource to create. They're useful to know diff --git a/debian/control.in b/debian/control.in index 0a80f54..a3b237b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,7 +2,9 @@ Source: hypopg Section: database Priority: optional Maintainer: Julien Rouhaud -Standards-Version: 4.5.0 +Uploaders: + Christoph Berg , +Standards-Version: 4.6.0 Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~) Homepage: https://hypopg.readthedocs.io/ diff --git a/debian/tests/control b/debian/tests/control index 8749d12..5b07fc6 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ -Depends: @, make, postgresql-contrib-13 +Depends: @, make, postgresql-contrib-14 Tests: installcheck Restrictions: allow-stderr diff --git a/debian/watch b/debian/watch index c84bb44..041cbf3 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ -version=3 -https://github.com/hypopg/hypopg/releases .*/archive/(.*).tar.gz +version=4 +https://github.com/hypopg/hypopg/releases .*/(.*).tar.gz From ef28424ae1fec54639eb3aece62473fbfca97e01 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Fri, 8 Oct 2021 10:54:34 +0200 Subject: [PATCH 4/4] Debian: Fix capitalization of Vcs URLs --- debian/control | 4 ++-- debian/control.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index ab0080c..96e0778 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Standards-Version: 4.6.0 Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~) Homepage: https://hypopg.readthedocs.io/ -Vcs-Browser: https://github.com/hypopg/hypopg -Vcs-Git: https://github.com/hypopg/hypopg.git +Vcs-Browser: https://github.com/HypoPG/hypopg +Vcs-Git: https://github.com/HypoPG/hypopg.git Package: postgresql-14-hypopg Architecture: any diff --git a/debian/control.in b/debian/control.in index a3b237b..b854d00 100644 --- a/debian/control.in +++ b/debian/control.in @@ -8,8 +8,8 @@ Standards-Version: 4.6.0 Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), postgresql-all (>= 217~) Homepage: https://hypopg.readthedocs.io/ -Vcs-Browser: https://github.com/hypopg/hypopg -Vcs-Git: https://github.com/hypopg/hypopg.git +Vcs-Browser: https://github.com/HypoPG/hypopg +Vcs-Git: https://github.com/HypoPG/hypopg.git Package: postgresql-PGVERSION-hypopg Architecture: any