Commit d91cbde3 authored by Christoph Berg's avatar Christoph Berg

Replace version 10 in examples by version 11

* Replace version 10 in examples by version 11. (Closes: #911391)
* Replace -X.Y version number template in examples by -NN.
parent 9b4a4c6a
......@@ -2,7 +2,7 @@
// but might be in future releases.
//
// We mark all PostgreSQL packages as NeverAutoRemove because otherwise apt
// would remove the old postgresql-x.y package when the "postgresql" meta
// would remove the old postgresql-NN package when the "postgresql" meta
// package changes its dependencies to a new version, rendering the old
// database cluster inaccessible. As access to the cluster might depend on
// other modules (like datatypes), we use a pretty wide pattern here. We might
......
......@@ -8,7 +8,7 @@ views, sequences, subqueries, triggers, outer joins, multiversion concurrency
control, and user-defined types and functions.
Since the on-disk data format of all major PostgreSQL versions (like 9.6,
10, etc.) is incompatible to each other, Debian's PostgreSQL packaging
11, etc.) is incompatible to each other, Debian's PostgreSQL packaging
architecture is designed to maintain clusters of different major versions in
parallel.
......@@ -27,7 +27,7 @@ but if you want to get straight into playing SQL, here are the steps to create
a database user and a database for the Unix user 'joe':
1. Install a database server with the major version of your choice
('postgresql-XY', e. g. 'postgresql-10'). Preferably the latest
('postgresql-XY', e. g. 'postgresql-11'). Preferably the latest
version, which you can get by installing the metapackage
'postgresql'. This will automatically create a default cluster
'main' with the database superuser 'postgres'.
......@@ -79,9 +79,9 @@ creating clusters, such as initdb(1). However, please note that in
this case you cannot expect *any* of above pg_* tools to work, since
they use different configuration settings (SSL, data directories,
etc.) and file locations (e. g.
/etc/postgresql/10/main/postgresql.conf). If in doubt, then do *not*
/etc/postgresql/11/main/postgresql.conf). If in doubt, then do *not*
use initdb, but only pg_createcluster. Since merely installing
postgresql-X.Y will already set up a default cluster which is ready to
postgresql-NN will already set up a default cluster which is ready to
work, most people do not need to bother about initdb or
pg_createcluster at all.
......@@ -92,9 +92,9 @@ unless you specify them manually. The first cluster which is ever
created (by any major version) will run on the default port 5432, and
each new cluster will use the next higher free one.
E. g. if you first install "postgresql-10" on a clean system, the
default 10/main cluster will run on port 5432. If you then create
another 10 cluster, or install the "postgresql-11" package, that new
E. g. if you first install "postgresql-11" on a clean system, the
default 11/main cluster will run on port 5432. If you then create
another 11 cluster, or install the "postgresql-12" package, that new
one will run on 5433.
Please use "pg_lsclusters" for displaying the cluster <-> port
......@@ -103,23 +103,23 @@ mapping, and please have a look at the pg_createcluster manpage (the
Default clusters and upgrading
------------------------------
When installing a postgresql-X.Y package from scratch, a default
When installing a postgresql-NN package from scratch, a default
cluster 'main' will automatically be created. This operation is
equivalent to doing 'pg_createcluster X.Y main --start'.
equivalent to doing 'pg_createcluster NN main --start'.
Due to this default cluster, an immediate attempt to upgrade an
earlier 'main' cluster to a new version will fail and you need to
remove the newer default cluster first. E. g., if you have
postgresql-9.6 installed and want to upgrade to 10, you first install
postgresql-10:
postgresql-9.6 installed and want to upgrade to 11, you first install
postgresql-11:
apt-get install postgresql-10
apt-get install postgresql-11
Then drop the default 10 cluster that was just created:
Then drop the default 11 cluster that was just created:
pg_dropcluster 10 main --stop
pg_dropcluster 11 main --stop
And then upgrade the 9.6 cluster to the latest installed version (e. g. 10):
And then upgrade the 9.6 cluster to the latest installed version (e. g. 11):
pg_upgradecluster 9.6 main
......@@ -143,7 +143,7 @@ symlink the file to /etc/ssl/certs/ssl-cert-snakeoil.pem; in this
case, client certificates need to be signed by the snakeoil
certificate, which might be desirable in many cases. See
/usr/share/doc/postgresql-doc-10/html/ssl-tcp.html
/usr/share/doc/postgresql-doc-11/html/ssl-tcp.html
for details (in package postgresql-doc).
......
postgresql-common (196) UNRELEASED; urgency=medium
* Replace version 10 in examples by version 11. (Closes: #911391)
* Replace -X.Y version number template in examples by -NN.
-- Christoph Berg <myon@debian.org> Sun, 28 Oct 2018 22:21:31 +0100
postgresql-common (195) unstable; urgency=medium
* apt.postgresql.org: Add 11 as default to supported versions.
......
......@@ -135,11 +135,11 @@ line, in the following formats:
Support all versions. This is recommended unless there are known incompatibilities.
=item I<X.Y>
=item I<NN>
Support this version.
=item I<X.Y>B<+>
=item I<NN>B<+>
Support this and all greater versions.
......@@ -170,6 +170,10 @@ configure the list of supported versions on your system.
all
# alternatives:
#9.6
#11+
=item B<debian/rules:>
#!/usr/bin/make -f
......@@ -238,7 +242,7 @@ which has C<debian/> as subdirectory), use the I<src-dir> argument. Example:
B<pg_buildext loop> was introduced in postgresql-server-dev-all (>= 141~).
The usage of "all" or "X.Y+" in debian/pgversions was introduced in
The usage of "all" or "NN+" in debian/pgversions was introduced in
postgresql-server-dev-all (>= 148~).
B<pg_buildext installcheck> was introduced in postgresql-server-dev-all (>=
......
......@@ -4,7 +4,7 @@
# available one. Otherwise fall back to libpq-dev's version.
#
# (C) 2011 Martin Pitt <mpitt@debian.org>
# (C) 2014-2016 Christoph Berg <myon@debian.org>
# (C) 2014-2018 Christoph Berg <myon@debian.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -27,7 +27,7 @@ else
if [ -x /usr/bin/pg_config.libpq-dev ]; then
exec /usr/bin/pg_config.libpq-dev "$@"
else
echo "You need to install postgresql-server-dev-X.Y for building a server-side extension or libpq-dev for building a client-side application." >&2
echo "You need to install postgresql-server-dev-NN for building a server-side extension or libpq-dev for building a client-side application." >&2
exit 1
fi
fi
......@@ -845,7 +845,7 @@ literal B<%>.
=item B<create_main_cluster> (Default: B<true>)
Create a B<main> cluster when a new postgresql-x.y server package is installed.
Create a B<main> cluster when a new postgresql-NN server package is installed.
=item B<start_conf> (Default: B<auto>)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment