Merge ~athos-ribeiro/ubuntu/+source/postgresql-common:add-lunar-support into ubuntu/+source/postgresql-common:ubuntu/devel

[Athos Ribeiro]

Currently, postgresql-common autopkgtests are failing due to a missing entry to support lunar. This adds the entry pointing to pg-14 for now so we can unblock tests in devel. Once the autopkgtests are OK for the release pocket, we can start sync'ing the new version to point to pg-15 (do note that this is currently blocked on the ongoing perl transitiion).

Local autopkgtest result summary:

autopkgtest [07:45:38]: @@@@@@@@@@@@@@@@@@@@ summary
default-psql PASS
run-testsuite PASS

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/pg-common-lunar-proposed/+packages

[Athos Ribeiro (athos-ribeiro)]

This is no longer valid. Gianfranco already handled the issue. Thanks!

diff --git a/debian/changelog b/debian/changelog
index bd9f1df..f7b79de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 postgresql-common (242ubuntu2) lunar; urgency=medium
 
+<<<<<<< debian/changelog
   * Add 23.04 as supported release
 
  -- Gianfranco Costamagna <[e-mail]>  Fri, 02 Dec 2022 11:13:42 +0100
+=======
+  * debian/supported-versions: Add 23.04 to supported versions.
+
+ -- Athos Ribeiro <[e-mail]>  Fri, 02 Dec 2022 07:21:50 -0300
+>>>>>>> debian/changelog
 
 postgresql-common (242ubuntu1) kinetic; urgency=medium
 
diff --git a/debian/supported-versions b/debian/supported-versions
index 88f6111..e63a312 100755
--- a/debian/supported-versions
+++ b/debian/supported-versions
@@ -87,7 +87,12 @@ ubuntu() {
         19.04|19.10) /bin/echo -e "11" ;;
         20.04|20.10) /bin/echo -e "12" ;;
         21.04|21.10) /bin/echo -e "13" ;;
+<<<<<<< debian/supported-versions
         22.04|22.10|23.04) /bin/echo -e "14" ;;
+=======
+        22.04|22.10) /bin/echo -e "14" ;;
+        23.04) /bin/echo -e "14" ;;
+>>>>>>> debian/supported-versions
         *)
             echo "supported-versions: WARNING: Unknown Ubuntu release: $1" >&2
             /bin/echo -e "$DEFAULT" ;;