architecture.html, cleanpg, debian/init.d-functions, pg_createcluster:

Remove obsolete references to per-version init scripts. (Closes: #636957)

architecture.html

@@ -134,10 +134,10 @@ addition, if no explicit default database is specified in
 <code>user_clusters</code>, the default database will correspond to the user
 name, thus reintroducing the default upstream behaviour.</p>
 
-<h3>/etc/init.d/postgresql-<i>version</i></h3>
+<h3>/etc/init.d/postgresql</h3>
 
-<p>This script now handles the postmaster server processes for each
-cluster. However, most of the actual work is done by the new
+<p>This script now handles the postmaster server processes for each version and
+all their clusters. However, most of the actual work is done by the new
 <code>pg_ctlcluster</code> program.</p>
 
 <h3>pg_upgradecluster</h3>

cleanpg

@@ -17,9 +17,6 @@
 #  GNU General Public License for more details.
 
 [ `id -u` = 0 ] || SUDO=sudo
-for v in 7.4 8.0 8.1 8.2 8.3 8.4 9.0 9.1; do
-    i=/etc/init.d/postgresql-$v
-    [ -x $i ] && $SUDO $i stop
-done
+$SUDO /etc/init.d/postgresql stop
 $SUDO killall pg_autovacuum postmaster postgres
 $SUDO rm -rf /etc/postgresql /var/lib/postgresql/ /var/log/postgresql/* /tmp/postgresql-testsuite/ /var/run/postgresql/*

debian/changelog

@@ -10,6 +10,8 @@ postgresql-common (119) UNRELEASED; urgency=low
     >= 8.4, as earlier versions do not yet support it. (Closes: #633801)
   * debian/postgresql-common.postinst: Remove some obsolete transition
     logic.
+  * architecture.html, cleanpg, debian/init.d-functions, pg_createcluster:
+    Remove obsolete references to per-version init scripts. (Closes: #636957)
 
   [ Peter Eisentraut ]
   * pg_createcluster:

debian/init.d-functions

 # This file contains common functionality for all postgresql server
 # package init.d scripts. It is usually included by
-# /etc/init.d/postgresql-X.Y.  
+# /etc/init.d/postgresql
 
 . /lib/lsb/init-functions
 

pg_createcluster

@@ -607,7 +607,7 @@ not started.
 
 Set the initial value in the C<start.conf> configuration file. See B<STARTUP
 CONTROL> below. By default, B<auto> is used, which means that the cluster is
-handled by C</etc/init.d/postgresql->I<version>, i. e. starts and stops
+handled by C</etc/init.d/postgresql>, i. e. starts and stops
 automatically on system boot.
 
 =back