Import definitions.units September 2022 Version 3.15.

df7cb · Jan 4, 2023 · c93475f · c93475f
1 parent c15b76c
commit c93475f
Show file tree

Hide file tree

Showing 10 changed files with 1,320 additions and 746 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+7.6: Jan 04, 2023
+-----------------
+* Import definitions.units September 2022 Version 3.15.
+
 7.4: May 20, 2021 - World Metrology Day
 ---------------------------------------
 * Fix hash table creation on PostgreSQL 14.

diff --git a/debian/changelog b/debian/changelog
@@ -1,10 +1,14 @@
-postgresql-unit (7.5-3) UNRELEASED; urgency=medium
+postgresql-unit (7.6-1) UNRELEASED; urgency=medium
 
+  [ Debian Janitor ]
   * Remove constraints unnecessary since buster (oldstable):
     + Build-Depends: Drop versioned constraint on bison.
   * Use secure copyright file specification URI.
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse.
 
+  [ Christoph Berg ]
+  * Import definitions.units September 2022 Version 3.15.
+
  -- Debian Janitor <[email protected]>  Mon, 24 Oct 2022 16:32:10 -0000
 
 postgresql-unit (7.5-2) unstable; urgency=medium

diff --git a/definitions.units b/definitions.units
diff --git a/definitions.units.patched b/definitions.units.patched
diff --git a/definitions.unresolved b/definitions.unresolved
@@ -47,7 +47,7 @@ guilder	netherlandsguilder
 hollandguilder	netherlandsguilder
 peso	mexicopeso
 yen	japanyen
-lira	italylira
+lira	turkeylira
 rupee	indiarupee
 drachma	greecedrachma
 franc	francefranc
@@ -112,11 +112,14 @@ loony	1 canadadollar
 toony	2 canadadollar
 satoshi	1e-8 bitcoin
 XBT	bitcoin
+brmgd	mega brgallon/day
+usmgd	mega usgallon/day
 percapita	per capita
 dollar	US$
 cent	$ 0.01
 penny	cent
 grand	usgrand
+π	pi
 ¢	cent
 £	britainpound
 ¥	japanyen

diff --git a/do b/do
@@ -4,13 +4,13 @@ set -eux
 
 export PGDATABASE=postgres
 
-for PGVERSION in ${*:-14 13 12 11 10 9.6 9.5}; do
+for PGVERSION in ${*:-15 14 13 12 11 10 9.6 9.5}; do
 	echo
 	echo "### $PGVERSION ###"
 	PG_CONFIG=/usr/lib/postgresql/$PGVERSION/bin/pg_config
 	export PGCLUSTER="$PGVERSION/main"
 	export PGPORT="54${PGVERSION/./}"
-	[ "$PGVERSION" = "14" ] && unset PGPORT # default version
+	[ "$PGVERSION" = "15" ] && unset PGPORT # default version
 
 	make clean
 	make PG_CONFIG=$PG_CONFIG PROFILE="-Werror"

diff --git a/expected/time.out b/expected/time.out
diff --git a/expected/units.out b/expected/units.out
diff --git a/load-units.pl b/load-units.pl
@@ -27,6 +27,8 @@
 my @todo;
 my $continued = '';
 
+<F>; # skip over initial line with BOM
+
 while (<F>) {
 	# skip over locale specific parts
 	$skip_british = 1 if /^!var UNITS_ENGLISH GB/;

diff --git a/unit_units.data b/unit_units.data