From 5b26a92644b81730c324e6fd1a03c6a0bad54a64 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Tue, 30 Nov 2021 14:03:13 +0200
Subject: [PATCH 01/17] 
 DISTPG-348-pg_stat_monitor-Update-directory-structure-for-Debian-packaging-files

---
 {percona-packaging/debian => debian}/changelog                | 0
 {percona-packaging/debian => debian}/compat                   | 0
 {percona-packaging/debian => debian}/control                  | 0
 {percona-packaging/debian => debian}/control.in               | 0
 {percona-packaging/debian => debian}/copyright                | 0
 {percona-packaging/debian => debian}/pgversions               | 0
 {percona-packaging/debian => debian}/rules                    | 0
 {percona-packaging/debian => debian}/source/format            | 0
 {percona-packaging/debian => debian}/source/lintian-overrides | 0
 {percona-packaging/rpm => rpm}/pg-stat-monitor.spec           | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename {percona-packaging/debian => debian}/changelog (100%)
 rename {percona-packaging/debian => debian}/compat (100%)
 rename {percona-packaging/debian => debian}/control (100%)
 rename {percona-packaging/debian => debian}/control.in (100%)
 rename {percona-packaging/debian => debian}/copyright (100%)
 rename {percona-packaging/debian => debian}/pgversions (100%)
 rename {percona-packaging/debian => debian}/rules (100%)
 rename {percona-packaging/debian => debian}/source/format (100%)
 rename {percona-packaging/debian => debian}/source/lintian-overrides (100%)
 rename {percona-packaging/rpm => rpm}/pg-stat-monitor.spec (100%)

diff --git a/percona-packaging/debian/changelog b/debian/changelog
similarity index 100%
rename from percona-packaging/debian/changelog
rename to debian/changelog
diff --git a/percona-packaging/debian/compat b/debian/compat
similarity index 100%
rename from percona-packaging/debian/compat
rename to debian/compat
diff --git a/percona-packaging/debian/control b/debian/control
similarity index 100%
rename from percona-packaging/debian/control
rename to debian/control
diff --git a/percona-packaging/debian/control.in b/debian/control.in
similarity index 100%
rename from percona-packaging/debian/control.in
rename to debian/control.in
diff --git a/percona-packaging/debian/copyright b/debian/copyright
similarity index 100%
rename from percona-packaging/debian/copyright
rename to debian/copyright
diff --git a/percona-packaging/debian/pgversions b/debian/pgversions
similarity index 100%
rename from percona-packaging/debian/pgversions
rename to debian/pgversions
diff --git a/percona-packaging/debian/rules b/debian/rules
similarity index 100%
rename from percona-packaging/debian/rules
rename to debian/rules
diff --git a/percona-packaging/debian/source/format b/debian/source/format
similarity index 100%
rename from percona-packaging/debian/source/format
rename to debian/source/format
diff --git a/percona-packaging/debian/source/lintian-overrides b/debian/source/lintian-overrides
similarity index 100%
rename from percona-packaging/debian/source/lintian-overrides
rename to debian/source/lintian-overrides
diff --git a/percona-packaging/rpm/pg-stat-monitor.spec b/rpm/pg-stat-monitor.spec
similarity index 100%
rename from percona-packaging/rpm/pg-stat-monitor.spec
rename to rpm/pg-stat-monitor.spec

From d5c9c94d4f4ab390e9ee7ba8773a9e2c38e62731 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Tue, 30 Nov 2021 14:10:37 +0200
Subject: [PATCH 02/17] DISTPG-349 PG Debian Requirement: Remove dependency on
 Percona PostgreSQL

---
 debian/control.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 662d898..f1a620f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Percona Development Team <info@percona.com>
 Build-Depends:
  debhelper (>= 9),
- percona-postgresql-server-dev-all (>= 153~),
+ postgresql-server-dev-all (>= 153~),
 
 Package: percona-pg-stat-monitor@@PG_REL@@
 Architecture: any
 Depends:
- percona-postgresql-@@PG_REL@@ | postgresql-@@PG_REL@@,
+ postgresql-@@PG_REL@@,
  ${misc:Depends},
  ${shlibs:Depends},
 Description: The pg_stat_monitor is statistics collector tool

From 09aa10d140b5681f8cc59a0ed697e5cea3e5d071 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Tue, 30 Nov 2021 14:38:45 +0200
Subject: [PATCH 03/17] DISTPG-353 PG Debian Requirement: the Description is
 overflowing

---
 percona-packaging/debian/control | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/percona-packaging/debian/control b/percona-packaging/debian/control
index 662d898..8eb2b20 100644
--- a/percona-packaging/debian/control
+++ b/percona-packaging/debian/control
@@ -12,9 +12,13 @@ Depends:
  percona-postgresql-@@PG_REL@@ | postgresql-@@PG_REL@@,
  ${misc:Depends},
  ${shlibs:Depends},
-Description: The pg_stat_monitor is statistics collector tool
- based on PostgreSQL's contrib module "pg_stat_statements".
+Description: enhancement query planning and execution statistics collector
+ The pg_stat_monitor is a Query Performance Monitoring tool for PostgreSQL.
+ It attempts to provide a more holistic picture by providing much-needed query
+ performance insights in a single view.
  .
- pg_stat_monitor is developed on the basis of pg_stat_statments
- as more advanced replacement for pg_stat_statment.
- It provides all the features of pg_stat_statment plus its own feature set.
+ pg_stat_monitor provides improved insights that allow database users to
+ understand query origins, execution, planning statistics and details, query
+ information, and metadata. This significantly improves observability, enabling
+ users to debug and tune query performance. pg_stat_monitor is developed on the
+ basis of pg_stat_statements as its more advanced replacement.

From 74fcbbca5bbf9d18459fb2eabdcc1668b1a9b764 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Tue, 30 Nov 2021 15:13:04 +0200
Subject: [PATCH 04/17] DISTPG-349 modified build script

---
 percona-packaging/scripts/pg_stat_monitor_builder.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh
index 52b2ccb..bab9be0 100644
--- a/percona-packaging/scripts/pg_stat_monitor_builder.sh
+++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh
@@ -128,9 +128,6 @@ get_sources(){
     fi
     REVISION=$(git rev-parse --short HEAD)
     echo "REVISION=${REVISION}" >> ${WORKDIR}/pg-stat-monitor.properties
-    rm -rf rpm debian
-    cp -r percona-packaging/rpm ./
-    cp -r percona-packaging/debian ./
 
     EDITFILES="debian/control debian/control.in debian/rules rpm/pg-stat-monitor.spec"
     for file in $EDITFILES; do

From d293be2ac4b1875fc0cc7a28bfa6e4ffe867eba8 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Tue, 30 Nov 2021 21:04:43 +0200
Subject: [PATCH 05/17] DISTPG-349 modified build script

---
 percona-packaging/scripts/pg_stat_monitor_builder.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh
index bab9be0..e903448 100644
--- a/percona-packaging/scripts/pg_stat_monitor_builder.sh
+++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh
@@ -222,6 +222,10 @@ install_deps() {
         elif [[ "${PG_RELEASE}" == "12" ]]; then
             percona-release enable ppg-12 release
         fi
+
+        wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+        echo "deb http://apt.postgresql.org/pub/repos/apt/ ${PG_RELEASE}"-pgdg main | sudo tee  /etc/apt/sources.list.d/pgdg.list
+
         apt-get update
 
         if [[ "${OS_NAME}" != "focal" ]]; then
@@ -234,7 +238,7 @@ install_deps() {
             fi
         fi
 
-        PKGLIST+=" percona-postgresql-${PG_RELEASE} debconf debhelper clang-7 devscripts dh-exec dh-systemd git wget libkrb5-dev libssl-dev percona-postgresql-common percona-postgresql-server-dev-all"
+        PKGLIST+=" postgresql-${PG_RELEASE} debconf debhelper clang-7 devscripts dh-exec dh-systemd git wget libkrb5-dev libssl-dev postgresql-common postgresql-server-dev-all"
         PKGLIST+=" build-essential debconf debhelper devscripts dh-exec dh-systemd git wget libxml-checker-perl libxml-libxml-perl libio-socket-ssl-perl libperl-dev libssl-dev libxml2-dev txt2man zlib1g-dev libpq-dev"
 
         until DEBIAN_FRONTEND=noninteractive apt-get -y install ${PKGLIST}; do
@@ -399,6 +403,7 @@ build_source_deb(){
     cd ${BUILDDIR}
 
     dch -D unstable --force-distribution -v "${VERSION}-${DEB_RELEASE}" "Update to new percona-pg-stat-monitor${PG_RELEASE} version ${VERSION}"
+    pg_buildext updatecontrol
     dpkg-buildpackage -S
     cd ../
     mkdir -p $WORKDIR/source_deb

From 851da527508bee6763ba8599584bb483cc642b23 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Tue, 30 Nov 2021 21:39:52 +0200
Subject: [PATCH 06/17] DISTPG-349 modified build script

---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 662d898..728b50f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Percona Development Team <info@percona.com>
 Build-Depends:
  debhelper (>= 9),
- percona-postgresql-server-dev-all (>= 153~),
+ postgresql-server-dev-all (>= 153~),
 
 Package: percona-pg-stat-monitor@@PG_REL@@
 Architecture: any
 Depends:
- percona-postgresql-@@PG_REL@@ | postgresql-@@PG_REL@@,
+ postgresql-@@PG_REL@@ | postgresql-@@PG_REL@@,
  ${misc:Depends},
  ${shlibs:Depends},
 Description: The pg_stat_monitor is statistics collector tool

From 2507619134baeaeb8f41b95a57586457101c74e8 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Tue, 30 Nov 2021 21:43:54 +0200
Subject: [PATCH 07/17] DISTPG-349 modified build script

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 728b50f..f1a620f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
 Package: percona-pg-stat-monitor@@PG_REL@@
 Architecture: any
 Depends:
- postgresql-@@PG_REL@@ | postgresql-@@PG_REL@@,
+ postgresql-@@PG_REL@@,
  ${misc:Depends},
  ${shlibs:Depends},
 Description: The pg_stat_monitor is statistics collector tool

From f36b9c3e92463b6c0251b8291f243f7ebcb8ed67 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Wed, 1 Dec 2021 12:12:39 +0200
Subject: [PATCH 08/17] DISTPG-349 modified build script

---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index f1a620f..90a2b19 100644
--- a/debian/control
+++ b/debian/control
@@ -18,3 +18,4 @@ Description: The pg_stat_monitor is statistics collector tool
  pg_stat_monitor is developed on the basis of pg_stat_statments
  as more advanced replacement for pg_stat_statment.
  It provides all the features of pg_stat_statment plus its own feature set.
+

From 71d36a15788698c1cf14378727adfa3c7a3f0815 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Wed, 1 Dec 2021 19:22:29 +0200
Subject: [PATCH 09/17] DISTPG-349 modified build script

---
 debian/control                                       | 1 -
 percona-packaging/scripts/pg_stat_monitor_builder.sh | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 90a2b19..f1a620f 100644
--- a/debian/control
+++ b/debian/control
@@ -18,4 +18,3 @@ Description: The pg_stat_monitor is statistics collector tool
  pg_stat_monitor is developed on the basis of pg_stat_statments
  as more advanced replacement for pg_stat_statment.
  It provides all the features of pg_stat_statment plus its own feature set.
-
diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh
index e903448..1152837 100644
--- a/percona-packaging/scripts/pg_stat_monitor_builder.sh
+++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh
@@ -446,6 +446,7 @@ build_deb(){
     dpkg-source -x ${DSC}
     #
     cd percona-pg-stat-monitor-${VERSION}
+    sed -i "s:\. :${WORKDIR}/percona-pg-stat-monitor-${VERSION} :g" debian/rules
     dch -m -D "${OS_NAME}" --force-distribution -v "1:${VERSION}-${DEB_RELEASE}.${OS_NAME}" 'Update distribution'
     unset $(locale|cut -d= -f1)
     dpkg-buildpackage -rfakeroot -us -uc -b

From e009f13fed634d2c7f5ff5bdb3c8381fd2d029e4 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Wed, 1 Dec 2021 21:30:14 +0200
Subject: [PATCH 10/17] DISTPG-349 modified build script

---
 Makefile | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ac1225d..02cdb99 100644
--- a/Makefile
+++ b/Makefile
@@ -23,19 +23,39 @@ PG_VERSION := $(shell pg_config --version | awk {'print $$1 $$2'})
 MAJOR := $(shell echo $(PG_VERSION) | sed -e 's/\.[^./]*$$//')
 
 ifneq (,$(findstring PostgreSQL14,$(MAJOR)))
-  CP := $(shell cp pg_stat_monitor--1.0.14.sql.in pg_stat_monitor--1.0.sql)
+  ifneq (,$(wildcard ../pg_stat_monitor--1.0.14.sql.in))
+    CP := $(shell cp ../pg_stat_monitor--1.0.14.sql.in ../pg_stat_monitor--1.0.sql)
+  endif
+  ifneq (,$(wildcard pg_stat_monitor--1.0.14.sql.in))
+    CP := $(shell cp pg_stat_monitor--1.0.14.sql.in pg_stat_monitor--1.0.sql)
+  endif
 endif
 
 ifneq (,$(findstring PostgreSQL13,$(MAJOR)))
-  CP := $(shell cp pg_stat_monitor--1.0.13.sql.in pg_stat_monitor--1.0.sql)
+  ifneq (,$(wildcard ../pg_stat_monitor--1.0.13.sql.in))
+    CP := $(shell cp ../pg_stat_monitor--1.0.13.sql.in ../pg_stat_monitor--1.0.sql)
+  endif
+  ifneq (,$(wildcard pg_stat_monitor--1.0.13.sql.in))
+    CP := $(shell cp pg_stat_monitor--1.0.13.sql.in pg_stat_monitor--1.0.sql)
+  endif
 endif
 
 ifneq (,$(findstring PostgreSQL12,$(MAJOR)))
-  CP := $(shell cp pg_stat_monitor--1.0.sql.in pg_stat_monitor--1.0.sql)
+  ifneq (,$(wildcard ../pg_stat_monitor--1.0.sql.in))
+    CP := $(shell cp ../pg_stat_monitor--1.0.sql.in ../pg_stat_monitor--1.0.sql)
+  endif
+  ifneq (,$(wildcard pg_stat_monitor--1.0.sql.in))
+    CP := $(shell cp pg_stat_monitor--1.0.sql.in pg_stat_monitor--1.0.sql)
+  endif
 endif
 
 ifneq (,$(findstring PostgreSQL11,$(MAJOR)))
-  CP := $(shell cp pg_stat_monitor--1.0.sql.in pg_stat_monitor--1.0.sql)
+  ifneq (,$(wildcard ../pg_stat_monitor--1.0.sql.in))
+    CP := $(shell cp ../pg_stat_monitor--1.0.sql.in ../pg_stat_monitor--1.0.sql)
+  endif
+  ifneq (,$(wildcard pg_stat_monitor--1.0.sql.in))
+    CP := $(shell cp pg_stat_monitor--1.0.sql.in pg_stat_monitor--1.0.sql)
+  endif
 endif
 
 ifdef USE_PGXS

From d034b9f6683d79e5b9884bebc71dc2de0c6464f3 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Wed, 1 Dec 2021 21:43:41 +0200
Subject: [PATCH 11/17] DISTPG-349 Modify Description

---
 debian/control | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index f1a620f..8e77a49 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,13 @@ Depends:
  postgresql-@@PG_REL@@,
  ${misc:Depends},
  ${shlibs:Depends},
-Description: The pg_stat_monitor is statistics collector tool
- based on PostgreSQL's contrib module "pg_stat_statements".
+Description: enhancement query planning and execution statistics collector
+ The pg_stat_monitor is a Query Performance Monitoring tool for PostgreSQL.
+ It attempts to provide a more holistic picture by providing much-needed query
+ performance insights in a single view.
  .
- pg_stat_monitor is developed on the basis of pg_stat_statments
- as more advanced replacement for pg_stat_statment.
- It provides all the features of pg_stat_statment plus its own feature set.
+ pg_stat_monitor provides improved insights that allow database users to
+ understand query origins, execution, planning statistics and details, query
+ information, and metadata. This significantly improves observability, enabling
+ users to debug and tune query performance. pg_stat_monitor is developed on the
+ basis of pg_stat_statements as its more advanced replacement.

From 3e7445efc05adb7f6fd5a44209b04b97280a99ac Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Thu, 2 Dec 2021 12:54:08 +0200
Subject: [PATCH 12/17] DISTPG-349 Change Copyright

---
 debian/copyright | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 621a1ee..dfbbbf6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,27 +1,26 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: PostgreSQL
+Upstream-Name: pg_stat_monitor
 Source: https://github.com/percona/pg_stat_monitor
 
-pg_stat_monitor - Statistics collector for PostgreSQL.
+Files: *
+Copyright: Portions Copyright © 2018-2021, Percona LLC and/or its affiliates 
+           Portions Copyright © 1996-2021, The PostgreSQL Global Development Group
+           Portions Copyright © 1994, The Regents of the University of California
 
-Portions Copyright © 2018-2020, Percona LLC and/or its affiliates
-
-Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
-
-Portions Copyright (c) 1994, The Regents of the University of California
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose, without fee, and without a written agreement is
-hereby granted, provided that the above copyright notice and this paragraph and
-the following two paragraphs appear in all copies.
-
-IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR DIRECT,
-INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE
-COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND
-THE COPYRIGHT HOLDER HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+License: PostgreSQL
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without a written agreement
+ is hereby granted, provided that the above copyright notice and this
+ paragraph and the following two paragraphs appear in all copies.
+ .
+ IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+ LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+ DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
+ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

From c9da6ddc5c4554837cd153ca6f3a6ea7ca8ec3d5 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Thu, 2 Dec 2021 19:02:41 +0200
Subject: [PATCH 13/17] DISTPG-349 modify control.in

---
 debian/control.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index f1a620f..66d837c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,10 +6,10 @@ Build-Depends:
  debhelper (>= 9),
  postgresql-server-dev-all (>= 153~),
 
-Package: percona-pg-stat-monitor@@PG_REL@@
+Package: percona-pg-stat-monitorPGVERSION
 Architecture: any
 Depends:
- postgresql-@@PG_REL@@,
+ postgresql-PGVERSION,
  ${misc:Depends},
  ${shlibs:Depends},
 Description: The pg_stat_monitor is statistics collector tool

From 95bee8648daa5496a9df747ef6945ecb27489f2d Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Fri, 3 Dec 2021 10:45:38 +0200
Subject: [PATCH 14/17] DISTPG-349 modify control.in

---
 debian/control.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control.in b/debian/control.in
index 66d837c..66a62c4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Percona Development Team <info@percona.com>
 Build-Depends:
  debhelper (>= 9),
- postgresql-server-dev-all (>= 153~),
+ postgresql-server-dev-all (>= 153~) | percona-postgresql-server-dev-all (>= 153~),
 
 Package: percona-pg-stat-monitorPGVERSION
 Architecture: any

From 0ead47c8687cdb9fe1dafdfaeba36a71106920f0 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Mon, 6 Dec 2021 10:06:55 +0200
Subject: [PATCH 15/17] DISTPG-349 modify build script

---
 .../scripts/pg_stat_monitor_builder.sh        | 22 ++++++++++++++-----
 rpm/pg-stat-monitor.spec                      |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh
index 1152837..77b8db3 100644
--- a/percona-packaging/scripts/pg_stat_monitor_builder.sh
+++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh
@@ -21,6 +21,7 @@ Usage: $0 [OPTIONS]
         --rpm_release       RPM version( default = 1)
         --deb_release       DEB version( default = 1)
         --pg_release        PPG version build on( default = 11)
+        --pg_version        product version community or percona ( default = percona )
         --version           product version
         --help) usage ;;
 Example $0 --builddir=/tmp/test --get_sources=1 --build_src_rpm=1 --build_rpm=1
@@ -57,6 +58,7 @@ append_arg_to_args () {
             --rpm_release=*) RPM_RELEASE="$val" ;;
             --deb_release=*) DEB_RELEASE="$val" ;;
             --pg_release=*) PG_RELEASE="$val" ;;
+            --pg_version=*) PG_VERSION="$val" ;;
             --version=*) VERSION="$val" ;;
             --help) usage ;;
             *)
@@ -110,6 +112,7 @@ get_sources(){
     echo "BUILD_ID=${BUILD_ID}" >> pg-stat-monitor.properties
     echo "BRANCH_NAME=$(echo ${BRANCH} | awk -F '/' '{print $(NF)}')" >> pg-stat-monitor.properties
     echo "PG_RELEASE=${PG_RELEASE}" >> pg-stat-monitor.properties
+    echo "PG_VERSION=${PG_VERSION}" >> pg-stat-monitor.properties
     echo "RPM_RELEASE=${RPM_RELEASE}" >> pg-stat-monitor.properties
     echo "DEB_RELEASE=${DEB_RELEASE}" >> pg-stat-monitor.properties
     git clone "$REPO" ${PRODUCT_FULL}
@@ -190,9 +193,10 @@ install_deps() {
             percona-release enable ppg-12 release
         fi
         yum -y install git wget
+        PKGLIST="percona-postgresql-common percona-postgresql${PG_RELEASE}-devel"
         PKGLIST+=" clang-devel git clang llvm-devel rpmdevtools vim wget"
         PKGLIST+=" perl binutils gcc gcc-c++"
-        PKGLIST+=" percona-postgresql-common clang-devel llvm-devel percona-postgresql${PG_RELEASE}-devel git rpm-build rpmdevtools wget gcc make autoconf"
+        PKGLIST+=" clang-devel llvm-devel git rpm-build rpmdevtools wget gcc make autoconf"
         if [[ "${RHEL}" -eq 8 ]]; then 
             dnf -y module disable postgresql
         elif [[ "${RHEL}" -eq 7 ]]; then
@@ -223,8 +227,15 @@ install_deps() {
             percona-release enable ppg-12 release
         fi
 
-        wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-        echo "deb http://apt.postgresql.org/pub/repos/apt/ ${PG_RELEASE}"-pgdg main | sudo tee  /etc/apt/sources.list.d/pgdg.list
+
+        PKGLIST="percona-postgresql-${PG_RELEASE} percona-postgresql-common percona-postgresql-server-dev-all"
+
+        if [[ "${PG_VERSION}" == "community" ]]; then
+            # ---- using a community version of postgresql
+            wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+            echo "deb http://apt.postgresql.org/pub/repos/apt/ ${PG_RELEASE}"-pgdg main | sudo tee  /etc/apt/sources.list.d/pgdg.list
+            PKGLIST="postgresql-${PG_RELEASE} postgresql-common postgresql-server-dev-all"
+        fi
 
         apt-get update
 
@@ -238,8 +249,9 @@ install_deps() {
             fi
         fi
 
-        PKGLIST+=" postgresql-${PG_RELEASE} debconf debhelper clang-7 devscripts dh-exec dh-systemd git wget libkrb5-dev libssl-dev postgresql-common postgresql-server-dev-all"
-        PKGLIST+=" build-essential debconf debhelper devscripts dh-exec dh-systemd git wget libxml-checker-perl libxml-libxml-perl libio-socket-ssl-perl libperl-dev libssl-dev libxml2-dev txt2man zlib1g-dev libpq-dev"
+        PKGLIST+=" debconf debhelper clang-7 devscripts dh-exec dh-systemd git wget libkrb5-dev libssl-dev"
+        PKGLIST+=" build-essential debconf debhelper devscripts dh-exec dh-systemd git wget libxml-checker-perl"
+        PKGLIST+=" libxml-libxml-perl libio-socket-ssl-perl libperl-dev libssl-dev libxml2-dev txt2man zlib1g-dev libpq-dev"
 
         until DEBIAN_FRONTEND=noninteractive apt-get -y install ${PKGLIST}; do
             sleep 1
diff --git a/rpm/pg-stat-monitor.spec b/rpm/pg-stat-monitor.spec
index e59ab61..59fa034 100644
--- a/rpm/pg-stat-monitor.spec
+++ b/rpm/pg-stat-monitor.spec
@@ -10,7 +10,7 @@ Release:        %{rpm_release}%{?dist}
 License:        PostgreSQL
 Source0:        percona-pg-stat-monitor%{pgrel}-%{version}.tar.gz
 URL:            https://github.com/Percona-Lab/pg_stat_monitor
-BuildRequires:  percona-postgresql%{pgrel}-devel
+BuildRequires:  postgresql%{pgrel}-devel or percona-postgresql%{pgrel}-devel
 Requires:       postgresql-server
 Provides:	percona-pg-stat-monitor%{pgrel}
 Epoch:          1

From 61c9a621ae88fcb9af05ca83067f14d45e6e560c Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Mon, 6 Dec 2021 11:55:21 +0200
Subject: [PATCH 16/17] DISTPG-349 modify build script

---
 .../scripts/pg_stat_monitor_builder.sh              | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh
index 77b8db3..92986dc 100644
--- a/percona-packaging/scripts/pg_stat_monitor_builder.sh
+++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh
@@ -21,7 +21,6 @@ Usage: $0 [OPTIONS]
         --rpm_release       RPM version( default = 1)
         --deb_release       DEB version( default = 1)
         --pg_release        PPG version build on( default = 11)
-        --pg_version        product version community or percona ( default = percona )
         --version           product version
         --help) usage ;;
 Example $0 --builddir=/tmp/test --get_sources=1 --build_src_rpm=1 --build_rpm=1
@@ -58,7 +57,6 @@ append_arg_to_args () {
             --rpm_release=*) RPM_RELEASE="$val" ;;
             --deb_release=*) DEB_RELEASE="$val" ;;
             --pg_release=*) PG_RELEASE="$val" ;;
-            --pg_version=*) PG_VERSION="$val" ;;
             --version=*) VERSION="$val" ;;
             --help) usage ;;
             *)
@@ -112,7 +110,6 @@ get_sources(){
     echo "BUILD_ID=${BUILD_ID}" >> pg-stat-monitor.properties
     echo "BRANCH_NAME=$(echo ${BRANCH} | awk -F '/' '{print $(NF)}')" >> pg-stat-monitor.properties
     echo "PG_RELEASE=${PG_RELEASE}" >> pg-stat-monitor.properties
-    echo "PG_VERSION=${PG_VERSION}" >> pg-stat-monitor.properties
     echo "RPM_RELEASE=${RPM_RELEASE}" >> pg-stat-monitor.properties
     echo "DEB_RELEASE=${DEB_RELEASE}" >> pg-stat-monitor.properties
     git clone "$REPO" ${PRODUCT_FULL}
@@ -230,12 +227,10 @@ install_deps() {
 
         PKGLIST="percona-postgresql-${PG_RELEASE} percona-postgresql-common percona-postgresql-server-dev-all"
 
-        if [[ "${PG_VERSION}" == "community" ]]; then
-            # ---- using a community version of postgresql
-            wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-            echo "deb http://apt.postgresql.org/pub/repos/apt/ ${PG_RELEASE}"-pgdg main | sudo tee  /etc/apt/sources.list.d/pgdg.list
-            PKGLIST="postgresql-${PG_RELEASE} postgresql-common postgresql-server-dev-all"
-        fi
+        # ---- using a community version of postgresql
+        #wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+        #echo "deb http://apt.postgresql.org/pub/repos/apt/ ${PG_RELEASE}"-pgdg main | sudo tee  /etc/apt/sources.list.d/pgdg.list
+        #PKGLIST="postgresql-${PG_RELEASE} postgresql-common postgresql-server-dev-all"
 
         apt-get update
 

From 752eb71ce63ac78d3c65f03f4b628e5e32c09616 Mon Sep 17 00:00:00 2001
From: Vadim Yalovets <vadim.yalovets@percona.com>
Date: Mon, 6 Dec 2021 12:33:06 +0200
Subject: [PATCH 17/17] DISTPG-349 restored spec file

---
 rpm/pg-stat-monitor.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpm/pg-stat-monitor.spec b/rpm/pg-stat-monitor.spec
index 59fa034..e59ab61 100644
--- a/rpm/pg-stat-monitor.spec
+++ b/rpm/pg-stat-monitor.spec
@@ -10,7 +10,7 @@ Release:        %{rpm_release}%{?dist}
 License:        PostgreSQL
 Source0:        percona-pg-stat-monitor%{pgrel}-%{version}.tar.gz
 URL:            https://github.com/Percona-Lab/pg_stat_monitor
-BuildRequires:  postgresql%{pgrel}-devel or percona-postgresql%{pgrel}-devel
+BuildRequires:  percona-postgresql%{pgrel}-devel
 Requires:       postgresql-server
 Provides:	percona-pg-stat-monitor%{pgrel}
 Epoch:          1