From 1b9dbad8574e388eb7a98d70e9efd4de91f7b9cb Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Fri, 13 Oct 2023 02:52:15 +0100 Subject: [PATCH 01/11] Initial Debian build system --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control.in | 17 +++++++++++++++++ debian/copyright | 8 ++++++++ debian/pgversions | 5 +++++ debian/rules | 27 +++++++++++++++++++++++++++ 6 files changed, 63 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control.in create mode 100644 debian/copyright create mode 100644 debian/pgversions create mode 100755 debian/rules diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..efbad1f --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +pg_roaringbitmap (6.0.0-1) unstable; urgency=medium + + * Initial Debian package + + -- Thu, 12 Oct 2023 12:00:00 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control.in b/debian/control.in new file mode 100644 index 0000000..1790141 --- /dev/null +++ b/debian/control.in @@ -0,0 +1,17 @@ +Source: pg_roaringbitmap +Section: database +Priority: optional +Maintainer: Shane Michael Mathews +Build-Depends: debhelper (>= 9), postgresql-server-dev-all (>= 180) +Standards-Version: 3.9.8 +Homepage: https://github.com/BrandwatchLtd/pg_roaringbitmap +Vcs-Git: git@github.com:BrandwatchLtd/pg_roaringbitmap.git +Vcs-Browser: https://github.com/BrandwatchLtd/pg_roaringbitmap + +Package: postgresql-roaringbitmap-PGVERSION +Architecture: any +Depends: postgresql-PGVERSION, ${shlibs:Depends}, ${misc:Depends} +Description: Roaring bitmaps extension for PostgreSQL. + Compressed bitmaps for increased bitmap performance. + . + This package contains the server extension for PostgreSQL PGVERSION. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..b44ac4d --- /dev/null +++ b/debian/copyright @@ -0,0 +1,8 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: pg_roaringbitmap +Source: + +Files: * +Copyright: 2016-2022 The CRoaring Authors + Apache License 2.0 + . diff --git a/debian/pgversions b/debian/pgversions new file mode 100644 index 0000000..bb4edd7 --- /dev/null +++ b/debian/pgversions @@ -0,0 +1,5 @@ +11 +12 +13 +14 +15 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..9a50aa9 --- /dev/null +++ b/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + + +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +include /usr/share/postgresql-common/pgxs_debian_control.mk + +override_dh_auto_build: + +override_dh_auto_install: + +pg_buildext loop postgresql-roaringbitmap-%v + +override_dh_installdocs: + dh_installdocs --all README.md LICENSE + +%: + dh $@ From 15d07215ca1a8b5dafcfec7574ff9c6fc851ae14 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 14:42:59 +0100 Subject: [PATCH 02/11] Correct maintainer entry --- debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control.in b/debian/control.in index 1790141..92a5812 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,7 @@ Source: pg_roaringbitmap Section: database Priority: optional -Maintainer: Shane Michael Mathews +Maintainer: Aidan McMurray Build-Depends: debhelper (>= 9), postgresql-server-dev-all (>= 180) Standards-Version: 3.9.8 Homepage: https://github.com/BrandwatchLtd/pg_roaringbitmap From 0d6d24324b5b350e0bff78dd3b7f0ddf1d0d11f4 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 14:43:31 +0100 Subject: [PATCH 03/11] Add Postgres 16 to the build list --- debian/pgversions | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/pgversions b/debian/pgversions index bb4edd7..0e79dd3 100644 --- a/debian/pgversions +++ b/debian/pgversions @@ -3,3 +3,4 @@ 13 14 15 +16 From 46798c6dcd5e9181540d7232c177bfa52b219412 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 14:48:44 +0100 Subject: [PATCH 04/11] Change to the standard Debian package naming scheme --- debian/control.in | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control.in b/debian/control.in index 92a5812..dd37c8e 100644 --- a/debian/control.in +++ b/debian/control.in @@ -8,7 +8,7 @@ Homepage: https://github.com/BrandwatchLtd/pg_roaringbitmap Vcs-Git: git@github.com:BrandwatchLtd/pg_roaringbitmap.git Vcs-Browser: https://github.com/BrandwatchLtd/pg_roaringbitmap -Package: postgresql-roaringbitmap-PGVERSION +Package: postgresql-PGVERSION-roaringbitmap Architecture: any Depends: postgresql-PGVERSION, ${shlibs:Depends}, ${misc:Depends} Description: Roaring bitmaps extension for PostgreSQL. diff --git a/debian/rules b/debian/rules index 9a50aa9..57dfd2e 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ include /usr/share/postgresql-common/pgxs_debian_control.mk override_dh_auto_build: override_dh_auto_install: - +pg_buildext loop postgresql-roaringbitmap-%v + +pg_buildext loop postgresql-%v-roaringbitmap override_dh_installdocs: dh_installdocs --all README.md LICENSE From 558ef739adbab7e2c6217afc0105ab0910ae42d2 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 14:49:34 +0100 Subject: [PATCH 05/11] Bump compat version number to silence build warnings --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 From c4554f3bc721fa4fe21a7a3a36813b4666afe1f8 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 14:57:55 +0100 Subject: [PATCH 06/11] Add the Apache Licence boilerplate --- debian/copyright | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index b44ac4d..8f41624 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,5 +4,17 @@ Source: Files: * Copyright: 2016-2022 The CRoaring Authors - Apache License 2.0 +License: Apache License 2.0 +. +License: Apache License 2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From eea6c7e15487de7a442f40dd3e46c7a65fce88c0 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 15:01:43 +0100 Subject: [PATCH 07/11] Bump build number to ensure distinction from Kali's build --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index efbad1f..be4cff2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -pg_roaringbitmap (6.0.0-1) unstable; urgency=medium +roaringbitmap (6.0.0-2) unstable; urgency=medium + + * Tidy up the debian package metadata + * Build number bump + + -- Tue, 17 Oct 2023 15:00:00 +0100 + +roaringbitmap (6.0.0-1) unstable; urgency=medium * Initial Debian package From 4b03cc775f0eb693d3085beb13982f210a2964f7 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 15:12:02 +0100 Subject: [PATCH 08/11] Underscores aren't allowed in Debian package names --- debian/control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control.in b/debian/control.in index dd37c8e..11b5499 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,4 +1,4 @@ -Source: pg_roaringbitmap +Source: roaringbitmap Section: database Priority: optional Maintainer: Aidan McMurray From 8c3d40601d3f86e9509a92b6106f94ece282f7a2 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 15:12:20 +0100 Subject: [PATCH 09/11] Don't build for Postgres 16 The Postgres 16 build produces compile warnings. Remove it from the pgversions file, so that down the line we don't assume that it just works on PG16. --- debian/pgversions | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/pgversions b/debian/pgversions index 0e79dd3..bb4edd7 100644 --- a/debian/pgversions +++ b/debian/pgversions @@ -3,4 +3,3 @@ 13 14 15 -16 From 8b3fac75aa022b3c6a8106dac8c64c1902887441 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 15:24:57 +0100 Subject: [PATCH 10/11] Add Postgres 10 to the build list I'd left it out due to misremembering what I'd read in the README --- debian/pgversions | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/pgversions b/debian/pgversions index bb4edd7..7c78428 100644 --- a/debian/pgversions +++ b/debian/pgversions @@ -1,3 +1,4 @@ +10 11 12 13 From b18ee1669340d19e22a617bfc754cdd51dc27a31 Mon Sep 17 00:00:00 2001 From: Robert Cardell Date: Tue, 17 Oct 2023 15:45:59 +0100 Subject: [PATCH 11/11] Arg... version 0.6, not 6.0 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index be4cff2..3389a7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -roaringbitmap (6.0.0-2) unstable; urgency=medium +roaringbitmap (0.6.0-2) unstable; urgency=medium * Tidy up the debian package metadata * Build number bump -- Tue, 17 Oct 2023 15:00:00 +0100 -roaringbitmap (6.0.0-1) unstable; urgency=medium +roaringbitmap (0.6.0-1) unstable; urgency=medium * Initial Debian package