From afb865ee160a2fcd17386d4450af7cb7be5466e2 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 26 Oct 2021 14:05:26 +0300
Subject: Canonicalize license in package manifest

---
 TODO                  | 4 ----
 libpq/buildfile       | 2 +-
 libpq/libpq/buildfile | 2 +-
 libpq/manifest        | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index 25118d7..89b165d 100644
--- a/TODO
+++ b/TODO
@@ -3,8 +3,6 @@ On the revision:
 - Make the .map and .def files prerequisites of the libs type target and only
   on the respective OSes. Also try to generate them on the fly.
 
-- Canonicalize the license in the package manifest.
-
 - Disable success build emails.
 
 - Normalize C comments in the tests source code replacing:
@@ -18,8 +16,6 @@ On the revision:
   /* ...
    */
 
-- Fix typo in the buildfiles: 'PostgreSQL Licene' -> 'PostgreSQL License'.
-
 On the release:
 
 - Use legal{} target type for legal documentation (LICENSE, AUTHORS, etc).
diff --git a/libpq/buildfile b/libpq/buildfile
index a013a31..51ee818 100644
--- a/libpq/buildfile
+++ b/libpq/buildfile
@@ -1,5 +1,5 @@
 # file      : buildfile
-# license   : PostgreSQL Licene; see accompanying COPYRIGHT file
+# license   : PostgreSQL License; see accompanying COPYRIGHT file
 
 ./: {*/ -build/} doc{COPYRIGHT INSTALL README} manifest
 
diff --git a/libpq/libpq/buildfile b/libpq/libpq/buildfile
index 010be7b..e6608b2 100644
--- a/libpq/libpq/buildfile
+++ b/libpq/libpq/buildfile
@@ -1,5 +1,5 @@
 # file      : libpq/buildfile
-# license   : PostgreSQL Licene; see accompanying COPYRIGHT file
+# license   : PostgreSQL License; see accompanying COPYRIGHT file
 
 # Note that libz is only used in the backend server.
 #
diff --git a/libpq/manifest b/libpq/manifest
index 3b57284..c8f1fa3 100644
--- a/libpq/manifest
+++ b/libpq/manifest
@@ -8,7 +8,7 @@ upstream-version: 14.0
 
 project: postgresql
 summary: PostgreSQL C API client library
-license: PostgreSQL License ; Permissive free software license.
+license: PostgreSQL ; Permissive free software license.
 topics: C, PostgreSQL, SQL, relational database
 description-file: README
 url: https://www.postgresql.org/
-- 
cgit v1.1