Merge pull request #330 from pblottiere/prepare_v124

Prepare v1.2.4
pgpointcloud · Sep 26, 2022 · 6e7ecaa · 6e7ecaa
2 parents 6b60f6f + c6351fe
commit 6e7ecaa
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,5 @@
-1.2.4.dev
----------
+1.2.4, 2022-09-26
+-----------------
 
 - Bug fixes
   - Add upgrade paths for pointcloud_postgis (#327)

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Release][release-image]][releases]
 
-[release-image]: https://img.shields.io/badge/release-1.2.3-green.svg?style=plastic
+[release-image]: https://img.shields.io/badge/release-1.2.4-green.svg?style=plastic
 [releases]: https://github.com/pgpointcloud/pointcloud/releases
 
 A PostgreSQL extension for storing point cloud (LIDAR) data. See

diff --git a/Version.config b/Version.config
@@ -1 +1 @@
-1.2.3
+1.2.4
diff --git a/doc/development.rst b/doc/development.rst
@@ -183,12 +183,12 @@ Steps for releasing a new version of Pointcloud:
 1. Add a new section to the ``NEWS`` file, listing all the changes associated
    with the new release.
 
-2. Change the version number in the ``Version.config`` and
+2. Change the version number in the ``README``, ``Version.config`` and
    ``pgsql/expected/pointcloud.out`` files.
 
-3. Update the value of ``UPGRADABLE`` in ``pgsql/Makefile.in``. This variable
-   defines the versions from which a database can be upgraded to the new
-   Pointcloud version.
+3. Update the value of ``UPGRADABLE`` in ``pgsql/Makefile.in`` and
+   ``pgsql_postgis/Makefile``. This variable defines the versions from which a
+   database can be upgraded to the new Pointcloud version.
 
 4. Create a PR with these changes.
 

diff --git a/pgsql/Makefile.in b/pgsql/Makefile.in
@@ -15,7 +15,7 @@ EXTENSION = pointcloud
 EXTVERSION=$(shell cat ../Version.config)
 EXTVERSION_MAJOR=$(shell cut -d. -f1,2 ../Version.config)
 MODULE_big = $(EXTENSION)-$(EXTVERSION_MAJOR)
-UPGRADABLE = 1.1.0 1.1.1 1.2.0 1.2.1 1.2.2
+UPGRADABLE = 1.1.0 1.1.1 1.2.0 1.2.1 1.2.2 1.2.3
 
 UPGRADES = \
   $(shell echo $(UPGRADABLE) | \

diff --git a/pgsql/expected/pointcloud.out b/pgsql/expected/pointcloud.out
@@ -4,7 +4,7 @@ CREATE EXTENSION pointcloud;
 SELECT PC_Version();
  pc_version 
 ------------
- 1.2.3
+ 1.2.4
 (1 row)
 
 INSERT INTO pointcloud_formats (pcid, srid, schema)

diff --git a/pgsql_postgis/Makefile b/pgsql_postgis/Makefile
@@ -8,7 +8,7 @@ SED = sed
 EXTENSION = pointcloud_postgis
 EXTVERSION=$(shell cat ../Version.config)
 
-UPGRADABLE = 1.1.0 1.1.1 1.2.0 1.2.1 1.2.2
+UPGRADABLE = 1.1.0 1.1.1 1.2.0 1.2.1 1.2.2 1.2.3
 UPGRADES = \
   $(shell echo $(UPGRADABLE) | \
      $(SED) 's/^/$(EXTENSION)--/' | \
@@ -41,4 +41,4 @@ $(EXTENSION)--%--$(EXTVERSION).sql: $(EXTENSION)--$(EXTVERSION).sql ../util/proc
 	cat $< | ../util/proc_upgrade.pl > $@
 
 $(EXTENSION)--%--$(EXTVERSION)next.sql: $(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql
-	ln -f $< $@
+	ln -f $< $@