[Git][debian-gis-team/postgis][experimental] 6 commits: Drop tzdata build dependency, no longer required.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Mon Aug 14 09:06:24 BST 2023
Bas Couwenberg pushed to branch experimental at Debian GIS Project / postgis
Commits:
9539269b by Bas Couwenberg at 2023-08-13T12:09:27+02:00
Drop tzdata build dependency, no longer required.
Revert "Require tzdata >= 2023c-9 for UTC timezone."
This reverts commit 7c42b954cfc39b08cd286f77636a25686e137643.
- - - - -
e1268ed5 by Bas Couwenberg at 2023-08-14T08:22:13+02:00
New upstream version 3.4.0~rc3+dfsg
- - - - -
3c358201 by Bas Couwenberg at 2023-08-14T08:22:36+02:00
Update upstream source from tag 'upstream/3.4.0_rc3+dfsg'
Update to upstream version '3.4.0~rc3+dfsg'
with Debian dir 4c4ed28cd4ce0ec0ee2c2b6f8ef135fa6dd6add2
- - - - -
4491f01d by Bas Couwenberg at 2023-08-14T08:22:52+02:00
New upstream release candidate.
- - - - -
e5d5b465 by Bas Couwenberg at 2023-08-14T09:47:29+02:00
Add patch to fix distclean target. (closes: #1047320)
- - - - -
a9c949ef by Bas Couwenberg at 2023-08-14T09:47:49+02:00
Set distribution to experimental.
- - - - -
19 changed files:
- ChangeLog
- NEWS
- README.md
- Version.config
- debian/changelog
- debian/control
- debian/control.in
- + debian/patches/distclean.patch
- debian/patches/series
- doc/Makefile.in
- doc/release_notes.xml
- extensions/address_standardizer/Makefile
- extensions/address_standardizer/Makefile.in
- extensions/postgis/Makefile.in
- extensions/postgis_raster/Makefile.in
- extensions/postgis_sfcgal/Makefile.in
- extensions/postgis_tiger_geocoder/Makefile.in
- extensions/postgis_topology/Makefile.in
- postgis_revision.h
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,46 @@
+2023-08-14 Regina Obe <lr at pcorp.us>
+
+ * README.md: Update ci statuses to follow 3.4 ci branches
+
+2023-08-13 Regina Obe <lr at pcorp.us>
+
+ * extensions/address_standardizer/Makefile.in,
+ extensions/postgis/Makefile.in,
+ extensions/postgis_raster/Makefile.in,
+ extensions/postgis_sfcgal/Makefile.in,
+ extensions/postgis_tiger_geocoder/Makefile.in,
+ extensions/postgis_topology/Makefile.in: Wrong syntax for ifdef in
+ prior commit References #5476 References #5469 Closes
+ https://git.osgeo.org/gitea/postgis/postgis/pulls/137
+
+2023-08-13 Regina Obe <lr at pcorp.us>
+
+ * extensions/address_standardizer/Makefile.in,
+ extensions/postgis/Makefile.in,
+ extensions/postgis_raster/Makefile.in,
+ extensions/postgis_sfcgal/Makefile.in,
+ extensions/postgis_tiger_geocoder/Makefile.in,
+ extensions/postgis_topology/Makefile.in: MKDIR_P only override if
+ it's not empty Closes #5469 for PostGIS 3.4.0rc3 Closes #5476 for PostGIS 3.4.0rc3
+
+2023-08-13 Regina Obe <lr at pcorp.us>
+
+ * NEWS, doc/release_notes.xml: Put in news the two new configure
+ switches - --disable-extension-upgrades-install - --without-pgconfig
+
+2023-08-13 Regina Obe <lr at pcorp.us>
+
+ * ci/winnie/build_postgis.sh, ci/winnie/winnie_common.sh: Winnie
+ build changes: - Standardize on 0 or 1 for INCLUDE_MINOR_LIB - Set tagged builds to always be INCLUDE_MINOR_LIB=0 Others will default to INCLUDE_MINOR_LIB=1 or can be overwritten
+
+2023-08-13 Regina Obe <lr at pcorp.us>
+
+ * Version.config: Prep for PostGIS 3.4.0rc3
+
+2023-08-13 Sandro Santilli <strk at kbt.io>
+
+ * doc/Makefile.in: Install man pages on `make install` Closes #5475 in 3.4 branch
+
2023-08-12 Regina Obe <lr at pcorp.us>
* raster/Makefile.in: Prevent infinite loop when building
@@ -82,47 +125,5 @@
2023-08-08 Sandro Santilli <strk at kbt.io>
- * .woodpecker/docs.yml, .woodpecker/update-docs-localized.sh:
- [woodie] Regenerated docs.yml with update-docs-localized.sh Writes subset of languages to be built in the script
-
-2023-08-08 Sandro Santilli <strk at kbt.io>
-
- * extensions/address_standardizer/Makefile.in,
- extensions/postgis/Makefile.in,
- extensions/postgis_raster/Makefile.in,
- extensions/postgis_sfcgal/Makefile.in,
- extensions/postgis_tiger_geocoder/Makefile.in,
- extensions/postgis_topology/Makefile.in: Make MKDIR_P variable
- available in extension Makefiles Closes #5469
-
-2023-08-08 Sandro Santilli <strk at kbt.io>
-
- * raster/Makefile.in: Control order in which raster subtargets are
- built References #5467
-
-2023-08-07 Teramoto Ikuhiro <yellow at affrc.go.jp>
-
- * doc/po/ja/xsl-config.xml.po: Translated xsl-config using Weblate
- (Japanese) Currently translated at 100.0% (24 of 24 strings) Translation: postgis/xsl-config Translate-URL:
- https://weblate.osgeo.org/projects/postgis/xsl-config/ja/
-
-2023-08-07 Teramoto Ikuhiro <yellow at affrc.go.jp>
-
- * doc/po/ja/reference_coverage.xml.po: Translated reference_coverage
- using Weblate (Japanese) Currently translated at 100.0% (33 of 33 strings) Translation: postgis/reference_coverage Translate-URL:
- https://weblate.osgeo.org/projects/postgis/reference_coverage/ja/
-
-2023-08-07 Teramoto Ikuhiro <yellow at affrc.go.jp>
-
- * doc/po/ja/release_notes.xml.po: Translated using Weblate
- (Japanese) Currently translated at 100.0% (46 of 46 strings) Translation: postgis/release_notes.xml Translate-URL:
- https://weblate.osgeo.org/projects/postgis/release_notesxml/ja/
-
-2023-08-05 Regina Obe <lr at pcorp.us>
-
- * .woodpecker/docs.yml: Remove more language builds not being translated References #5466 for PostGIS 3.4.0
-
-2023-08-05 Regina Obe <lr at pcorp.us>
-
- * Flip back to dev
+ * [woodie] Regenerated docs.yml with update-docs-localized.sh Writes subset of languages to be built in the script
=====================================
NEWS
=====================================
@@ -10,6 +10,11 @@ Many thanks to our translation teams, in particular:
Teramoto Ikuhiro (Japanese Team)
Vincent Bre (French Team)
+There are 2 new ./configure switches:
+
+ - --disable-extension-upgrades-install, will skip installing all the extension upgrade scripts except for the ANY--currentversion. If you use this, you can install select upgrades using the postgis commandline tool
+ - --without-pgconfig, will build just the commandline tools
+ raster2pgsql and shp2pgsql even if PostgreSQL is not installed
* New Features *
- #5055, complete manual internationalization (Sandro Santilli)
=====================================
README.md
=====================================
@@ -3,13 +3,14 @@
| **Debbie** | **Winnie** | **Dronie** |
| --------- | ---------- | --------- |
-| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_trunk/) | [](https://winnie.postgis.net/view/PostGIS/job/PostGIS_trunk/) | [](https://dronie.osgeo.org/postgis/postgis?branch=master) ||
+| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_3.3/) | [](https://winnie.postgis.net/view/PostGIS/job/PostGIS_3.3/) | [](https://dronie.osgeo.org/postgis/postgis?branch=stable-3.4) ||
| **Bessie** | **Bessie32** | **Cirrus-CI** |
-| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie/) | [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32/) | [](http://cirrus-ci.com/github/postgis/postgis) |
+| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie/) | [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32/) | [](http://cirrus-ci.com/github/postgis/postgis) |
| **Berrie** | **Berrie64** |
-| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie/) | [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie64/) | ||
-| **GitHub** | **Woodie** | **GitLab**
-| [](https://github.com/postgis/postgis/actions?query=branch%3Amaster) | [](https://woodie.osgeo.org/postgis/postgis/branches/master) | [](https://gitlab.com/postgis/postgis/commits/master) | ||
+| [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie/) | [](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie64/) | ||
+| **GitHub** | **GitLab** |
+| [](https://github.com/postgis/postgis/actions?query=branch%3Astable-3.4) | [](https://gitlab.com/postgis/postgis/commits/stable-3.4) ||
+
This file is here to play nicely with modern code repository facilities.
Actual readme is [here](README.postgis).
=====================================
Version.config
=====================================
@@ -5,7 +5,7 @@
POSTGIS_MAJOR_VERSION=3
POSTGIS_MINOR_VERSION=4
-POSTGIS_MICRO_VERSION=0rc2
+POSTGIS_MICRO_VERSION=0rc3
# Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
# when changing POSTGIS_MINOR_VERSION
=====================================
debian/changelog
=====================================
@@ -1,8 +1,12 @@
-postgis (3.4.0~rc2+dfsg-1~exp3) UNRELEASED; urgency=medium
+postgis (3.4.0~rc3+dfsg-1~exp1) experimental; urgency=medium
+ * New upstream release candidate.
* Use execute_before instead of override in rules file.
+ * Drop tzdata build dependency, no longer required.
+ * Add patch to fix distclean target.
+ (closes: #1047320)
- -- Bas Couwenberg <sebastic at debian.org> Sun, 13 Aug 2023 09:17:44 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 14 Aug 2023 09:47:30 +0200
postgis (3.4.0~rc2+dfsg-1~exp2) experimental; urgency=medium
=====================================
debian/control
=====================================
@@ -34,7 +34,6 @@ Build-Depends: bison,
postgresql-server-dev-all,
protobuf-c-compiler,
rdfind,
- tzdata (>= 2023c-9),
xsltproc
Build-Conflicts: graphicsmagick-imagemagick-compat
Standards-Version: 4.6.2
=====================================
debian/control.in
=====================================
@@ -34,7 +34,6 @@ Build-Depends: bison,
postgresql-server-dev-all,
protobuf-c-compiler,
rdfind,
- tzdata (>= 2023c-9),
xsltproc
Build-Conflicts: graphicsmagick-imagemagick-compat
Standards-Version: 4.6.2
=====================================
debian/patches/distclean.patch
=====================================
@@ -0,0 +1,26 @@
+Description: Fix distclean target, execute clean target first.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://trac.osgeo.org/postgis/ticket/5477
+Bug-Debian: https://bugs.debian.org/1047320
+
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -432,6 +432,7 @@ images images-install images-uninstall i
+ $(MAKE) -C $(images_builddir) $@
+
+ html-clean:
++ rm -f $(html_builddir)/docbook.css
+ rm -f $(html_builddir)/postgis$(DOCSUFFIX).html
+ rm -rf $(html_builddir)/postgis$(DOCSUFFIX)/
+ rm -rf $(html_builddir)/postgis-web$(DOCSUFFIX)/
+@@ -461,8 +462,9 @@ clean: images-clean html-clean pdf-clean
+ rm -f *.tmp
+ $(MAKE) clean-localized
+
+-distclean: clean distclean-localized
++distclean: clean
+ $(MAKE) -C $(images_builddir) distclean
++ $(MAKE) distclean-localized
+ rm -f Makefile Makefile.comments
+
+ maintainer-clean: distclean
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
relax-test-timing-constraints.patch
chaikin
incorrect-path-for-interpreter.patch
+distclean.patch
=====================================
doc/Makefile.in
=====================================
@@ -548,9 +548,9 @@ docs-install: html-install html-assets-install
docs-uninstall: html-uninstall html-assets-uninstall
rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
-install: comments-install
+install: comments-install man-install
-uninstall: comments-uninstall
+uninstall: comments-uninstall man-uninstall
ifeq ($(XSLTPROC),)
garden: requirements_not_met_xsltproc
=====================================
doc/release_notes.xml
=====================================
@@ -4,7 +4,7 @@
<subtitle>Release Notes</subtitle>
<sect1>
<title>PostGIS 3.4.0</title>
- <para>2023/08/13</para>
+ <para>2023/08/15</para>
<para>This version requires PostgreSQL 12 or higher, GEOS 3.6 or higher, and Proj 6.1+.
To take advantage of all features, GEOS 3.12+ is needed.
To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.</para>
@@ -13,6 +13,11 @@
<para>Teramoto Ikuhiro (Japanese Team)</para>
<para>Vincent Bre (French Team)</para>
+ <para>There are 2 new ./configure switches:</para>
+ <itemizedlist><listitem><para>--disable-extension-upgrades-install, will skip installing all the extension upgrade scripts except for the ANY--currentversion. If you use this, you can install select upgrades using the postgis commandline tool</para></listitem>
+ <listitem><para>--without-pgconfig, will build just the commandline tools raster2pgsql and shp2pgsql even if PostgreSQL is not installed</para></listitem>
+ </itemizedlist>
+
<simplesect>
<title>New features</title>
<para><ulink url="https://trac.osgeo.org/postgis/ticket/5055">5055</ulink>, complete manual internationalization (Sandro Santilli)</para>
=====================================
extensions/address_standardizer/Makefile
=====================================
@@ -30,7 +30,7 @@ POSTGIS_PGSQL_VERSION=130
# SQL preprocessor
SQLPP = /usr/bin/cpp -traditional-cpp -w -P -Upixel -Ubool
GREP=/bin/grep
-EXTVERSION = 3.4.0rc2
+EXTVERSION = 3.4.0rc3
MODULE_big = address_standardizer-3
MODULEPATH = $$libdir/address_standardizer-3
ifeq (no,yes)
@@ -48,7 +48,7 @@ DATA_built = \
$(NULL)
all: sql/address_standardizer_pre.sql sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql \
- sql/$(EXTENSION)_data_us.sql sql/address_standardizer--3.4.0rc2.sql sql/$(EXTENSION)_data_us--3.4.0rc2.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
+ sql/$(EXTENSION)_data_us.sql sql/address_standardizer--3.4.0rc3.sql sql/$(EXTENSION)_data_us--3.4.0rc3.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql sql/$(EXTENSION)_data_us--ANY--$(EXTVERSION).sql \
sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql sql/test-debug_standardize_address.sql
@@ -205,7 +205,9 @@ PG_CONFIG := /var/lib/jenkins/workspace/pg/rel/pg13w64/bin/pg_config
PGXS := /var/lib/jenkins/workspace/pg/rel/pg13w64/lib/postgresql/pgxs/src/makefiles/pgxs.mk
include $(PGXS)
PERL = /usr/bin/perl
-MKDIR_P = /bin/mkdir -p
+ifneq (/bin/mkdir -p,)
+ MKDIR_P = /bin/mkdir -p
+endif
srcdir = .
top_srcdir = ../..
=====================================
extensions/address_standardizer/Makefile.in
=====================================
@@ -205,7 +205,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL = @PERL@
-MKDIR_P = @MKDIR_P@
+ifneq (@MKDIR_P@,)
+ MKDIR_P = @MKDIR_P@
+endif
srcdir = @srcdir@
top_srcdir = @top_srcdir@
=====================================
extensions/postgis/Makefile.in
=====================================
@@ -149,7 +149,10 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL = @PERL@
-MKDIR_P = @MKDIR_P@
+
+ifneq (@MKDIR_P@,)
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
=====================================
extensions/postgis_raster/Makefile.in
=====================================
@@ -131,7 +131,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL = @PERL@
-MKDIR_P = @MKDIR_P@
+ifneq (@MKDIR_P@,)
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
=====================================
extensions/postgis_sfcgal/Makefile.in
=====================================
@@ -103,7 +103,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL = @PERL@
-MKDIR_P = @MKDIR_P@
+ifneq (@MKDIR_P@,)
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
=====================================
extensions/postgis_tiger_geocoder/Makefile.in
=====================================
@@ -214,7 +214,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL=@PERL@
-MKDIR_P = @MKDIR_P@
+ifneq (@MKDIR_P@,)
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
=====================================
extensions/postgis_topology/Makefile.in
=====================================
@@ -108,7 +108,9 @@ PG_CONFIG := @PG_CONFIG@
PGXS := @PGXS@
include $(PGXS)
PERL=@PERL@
-MKDIR_P = @MKDIR_P@
+ifneq (@MKDIR_P@,)
+ MKDIR_P = @MKDIR_P@
+endif
VPATH = @srcdir@
=====================================
postgis_revision.h
=====================================
@@ -1 +1 @@
-#define POSTGIS_REVISION 0f5fea6
+#define POSTGIS_REVISION 99647ab
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/6e81681c9bc537ca101a3bd2d5344321c8eeac63...a9c949efe0a14cc4a51c880c099f1bad4aa477cc
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/6e81681c9bc537ca101a3bd2d5344321c8eeac63...a9c949efe0a14cc4a51c880c099f1bad4aa477cc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20230814/3e0c147a/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list