In 9.5, some programs were moved from contrib into the standard
installation.  But the packaging was not updated to reflect that.  See
attached patch.

This will also need an update for postgresql-common to wire pgbench into
pg_wrapper.  Or maybe just an alternative, since there is very little
use of using an old version of pgbench.

Comments?
>From 9550aa33b95e9a0a42d09cf8502f91b11bd89f81 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Tue, 9 Aug 2016 22:54:23 +0000
Subject: [PATCH] Move some programs from contrib to server and client
 packages, reflecting upstream changes

---
 debian/changelog                      | 7 +++++++
 debian/control                        | 3 ++-
 debian/postgresql-9.6.install         | 6 ++++++
 debian/postgresql-client-9.6.install  | 2 ++
 debian/postgresql-contrib-9.6.install | 8 --------
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9721efb..db557be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgresql-9.6 (9.6~beta4-2) UNRELEASED; urgency=medium
+
+  * Move some programs from contrib to server and client packages,
+    reflecting upstream changes
+
+ -- Peter Eisentraut <[email protected]>  Tue, 09 Aug 2016 21:44:33 +0000
+
 postgresql-9.6 (9.6~beta4-1) experimental; urgency=medium
 
   * New upstream beta version.
diff --git a/debian/control b/debian/control
index 4ff81a4..7efd1f3 100644
--- a/debian/control
+++ b/debian/control
@@ -147,6 +147,7 @@ Depends:
  ${shlibs:Depends}
 Recommends: postgresql-contrib-9.6, sysstat
 Suggests: locales-all
+Replaces: postgresql-contrib-9.6 (<< 9.6~beta4-2)
 Description: object-relational SQL database, version 9.6 server
  PostgreSQL is a powerful, open source object-relational database
  system. It is fully ACID compliant, has full support for foreign
@@ -181,6 +182,7 @@ Depends:
  ${shlibs:Depends}
 Suggests: postgresql-9.6, postgresql-doc-9.6
 Provides: postgresql-client
+Replaces: postgresql-contrib-9.6 (<< 9.6~beta4-2)
 Description: front-end programs for PostgreSQL 9.6
  This package contains client and administrative programs for
  PostgreSQL: these are the interactive terminal client psql and
@@ -259,7 +261,6 @@ Description: additional facilities for PostgreSQL
   pg_freespacemap- Displays the contents of the free space map (FSM)
   pg_trgm        - Determine the similarity of text based on trigram matching
   pg_standby     - Create a warm stand-by server
-  pgbench        - TPC-B like benchmark
   pgcrypto       - Cryptographic functions
   pgrowlocks     - A function to return row locking information
   pgstattuple    - Returns the percentage of dead tuples in a table; this
diff --git a/debian/postgresql-9.6.install b/debian/postgresql-9.6.install
index 27f58d7..e4189c4 100644
--- a/debian/postgresql-9.6.install
+++ b/debian/postgresql-9.6.install
@@ -1,8 +1,11 @@
 usr/lib/postgresql/*/bin/initdb
+usr/lib/postgresql/*/bin/pg_archivecleanup
 usr/lib/postgresql/*/bin/pg_controldata
 usr/lib/postgresql/*/bin/pg_ctl
 usr/lib/postgresql/*/bin/pg_resetxlog
 usr/lib/postgresql/*/bin/pg_rewind
+usr/lib/postgresql/*/bin/pg_test_fsync
+usr/lib/postgresql/*/bin/pg_test_timing
 usr/lib/postgresql/*/bin/pg_upgrade
 usr/lib/postgresql/*/bin/pg_xlogdump
 usr/lib/postgresql/*/bin/postgres
@@ -23,10 +26,13 @@ usr/share/locale/*/LC_MESSAGES/plpgsql-*.mo
 usr/share/locale/*/*/plpython-*.mo
 usr/share/postgresql/*/extension/plpgsql*
 usr/share/postgresql/*/man/man1/initdb.1*
+usr/share/postgresql/*/man/man1/pg_archivecleanup.1*
 usr/share/postgresql/*/man/man1/pg_controldata.1*
 usr/share/postgresql/*/man/man1/pg_ctl.1*
 usr/share/postgresql/*/man/man1/pg_resetxlog.1*
 usr/share/postgresql/*/man/man1/pg_rewind.1*
+usr/share/postgresql/*/man/man1/pg_test_fsync.1*
+usr/share/postgresql/*/man/man1/pg_test_timing.1*
 usr/share/postgresql/*/man/man1/pg_upgrade.1*
 usr/share/postgresql/*/man/man1/pg_xlogdump.1*
 usr/share/postgresql/*/man/man1/postgres.1*
diff --git a/debian/postgresql-client-9.6.install b/debian/postgresql-client-9.6.install
index f01ede8..2066403 100644
--- a/debian/postgresql-client-9.6.install
+++ b/debian/postgresql-client-9.6.install
@@ -5,6 +5,7 @@ usr/lib/postgresql/*/bin/pg_basebackup
 usr/lib/postgresql/*/bin/pg_isready
 usr/lib/postgresql/*/bin/pg_recvlogical
 usr/lib/postgresql/*/bin/pg_receivexlog
+usr/lib/postgresql/*/bin/pgbench
 usr/lib/postgresql/*/bin/createdb
 usr/lib/postgresql/*/bin/createlang
 usr/lib/postgresql/*/bin/createuser
@@ -20,6 +21,7 @@ usr/share/postgresql/*/man/man1/pg_isready.1*
 usr/share/postgresql/*/man/man1/pg_recvlogical.1*
 usr/share/postgresql/*/man/man1/pg_receivexlog.1*
 usr/share/postgresql/*/man/man1/pg_restore.1*
+usr/share/postgresql/*/man/man1/pgbench.1*
 usr/share/postgresql/*/man/man1/psql.1*
 usr/share/postgresql/*/man/man1/vacuumdb.1*
 usr/share/postgresql/*/man/man1/clusterdb.1*
diff --git a/debian/postgresql-contrib-9.6.install b/debian/postgresql-contrib-9.6.install
index 509e3ca..91e94b3 100755
--- a/debian/postgresql-contrib-9.6.install
+++ b/debian/postgresql-contrib-9.6.install
@@ -2,13 +2,9 @@
 
 usr/share/postgresql/*/extension/*
 usr/lib/postgresql/*/lib/auth_delay.so
-usr/lib/postgresql/*/bin/pg_archivecleanup
 usr/lib/postgresql/*/bin/oid2name
-usr/lib/postgresql/*/bin/pgbench
 usr/lib/postgresql/*/bin/vacuumlo
 usr/lib/postgresql/*/bin/pg_standby
-usr/lib/postgresql/*/bin/pg_test_fsync
-usr/lib/postgresql/*/bin/pg_test_timing
 usr/lib/postgresql/*/lib/_int.so
 usr/lib/postgresql/*/lib/autoinc.so
 usr/lib/postgresql/*/lib/bloom.so
@@ -58,9 +54,5 @@ usr/lib/postgresql/*/lib/tsm_system_*.so
 usr/lib/postgresql/*/lib/pg_visibility.so
 [linux-any] usr/share/postgresql/*/contrib/sepgsql.sql
 usr/share/postgresql/*/man/man1/oid2name.1*
-usr/share/postgresql/*/man/man1/pg_test_fsync.1*
-usr/share/postgresql/*/man/man1/pg_archivecleanup.1*
-usr/share/postgresql/*/man/man1/pg_test_timing.1*
 usr/share/postgresql/*/man/man1/pg_standby.1*
-usr/share/postgresql/*/man/man1/pgbench.1*
 usr/share/postgresql/*/man/man1/vacuumlo.1*
-- 
2.8.1

_______________________________________________
Pkg-postgresql-public mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-postgresql-public

Reply via email to