Merge branch 'debian'

debian/changelog

@@ -1,8 +1,23 @@
+<<<<<<< HEAD
 powa-archivist (4.1.2-2) UNRELEASED; urgency=medium
 
   * Update description to mention powa-web package.
 
  -- Christoph Berg <myon@debian.org>  Mon, 13 Sep 2021 15:12:41 +0200
+=======
+powa-archivist (4.1.2-3) UNRELEASED; urgency=medium
+
+  * Provides: postgresql-powa.
+  * Suggests: powa-web, powa-collector.
+
+ -- Christoph Berg <myon@debian.org>  Mon, 25 Oct 2021 17:42:08 +0200
+
+powa-archivist (4.1.2-2) unstable; urgency=medium
+
+  * Upload for PostgreSQL 14.
+
+ -- Christoph Berg <myon@debian.org>  Thu, 21 Oct 2021 12:28:00 +0200
+>>>>>>> debian
 
 powa-archivist (4.1.2-1) unstable; urgency=medium
 

debian/control

@@ -11,14 +11,17 @@ Homepage: https://powa.readthedocs.io/
 Vcs-Browser: https://github.com/powa-team/powa-archivist
 Vcs-Git: https://github.com/powa-team/powa-archivist.git
 
-Package: postgresql-13-powa
+Package: postgresql-14-powa
 Architecture: any
-Suggests: powa-web
-Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-13
-Description: PostgreSQL Workload Analyzer -- PostgreSQL 13 extension
+Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-14
+Provides: postgresql-powa
+Suggests: powa-web, powa-collector
+Description: PostgreSQL Workload Analyzer -- PostgreSQL 14 extension
  PoWA is a PostgreSQL Workload Analyzer that gathers performance stats and
  provides real-time charts and graphs to help monitor and tune your PostgreSQL
- servers.
+ servers. This package contains the core extension of the PoWA project, the
+ archivist.
  .
- This package contains the core extension of the PoWA project, the archivist.
- The web interface is contained in the powa-web package.
+ Related packages:
+  * powa-web: web frontend
+  * powa-collector: collector daemon for remote snapshots

debian/control.in

@@ -13,12 +13,15 @@ Vcs-Git: https://github.com/powa-team/powa-archivist.git
 
 Package: postgresql-PGVERSION-powa
 Architecture: any
-Suggests: powa-web
 Depends: ${misc:Depends}, ${shlibs:Depends}, postgresql-PGVERSION
+Provides: postgresql-powa
+Suggests: powa-web, powa-collector
 Description: PostgreSQL Workload Analyzer -- PostgreSQL PGVERSION extension
  PoWA is a PostgreSQL Workload Analyzer that gathers performance stats and
  provides real-time charts and graphs to help monitor and tune your PostgreSQL
- servers.
+ servers. This package contains the core extension of the PoWA project, the
+ archivist.
  .
- This package contains the core extension of the PoWA project, the archivist.
- The web interface is contained in the powa-web package.
+ Related packages:
+  * powa-web: web frontend
+  * powa-collector: collector daemon for remote snapshots

debian/tests/control

@@ -1,3 +1,3 @@
-Depends: @, postgresql-contrib-13, make
+Depends: @, postgresql-contrib-14, make
 Tests: installcheck
 Restrictions: allow-stderr