Received: from malur.postgresql.org ([217.196.149.56])
	by arkaria.postgresql.org with esmtp (Exim 4.72) (envelope-from
	<pgsql-www-owner+M21458=pgsql+2Dwww=arkaria.postgresql.org@postgresql.org>)
	id 1UDBMS-00082E-Kj
	for pgsql-www@arkaria.postgresql.org; Wed, 06 Mar 2013 10:14:12 +0000
Received: from localhost ([127.0.0.1] helo=postgresql.org)
	by malur.postgresql.org with smtp (Exim 4.72) (envelope-from
	<pgsql-www-owner+M21458=pgsql+2Dwww=arkaria.postgresql.org@postgresql.org>)
	id 1UDBMR-00081u-Sh
	for pgsql-www@arkaria.postgresql.org; Wed, 06 Mar 2013 10:14:11 +0000
Received: from makus.postgresql.org ([2001:4800:7903:4::125])
	by malur.postgresql.org with esmtp (Exim 4.72)
	(envelope-from <cb@df7cb.de>) id 1UDBMR-00081p-13
	for pgsql-www@postgresql.org; Wed, 06 Mar 2013 10:14:11 +0000
Received: from cl-2390.ham-01.de.sixxs.net ([2001:6f8:900:955::2]
	helo=feynman.df7cb.de) by makus.postgresql.org with esmtp (Exim 4.72)
	(envelope-from <cb@df7cb.de>) id 1UDBMO-0000wB-ND
	for pgsql-www@postgresql.org; Wed, 06 Mar 2013 10:14:10 +0000
Received: from msgid.df7cb.de (benz.df7cb.de [IPv6:2001:6f8:10ee:e:134::2])
	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
	(Client did not present a certificate)
	by feynman.df7cb.de (Postfix) with ESMTPSA id BA40C6969A
	for <pgsql-www@postgresql.org>; Wed,  6 Mar 2013 11:14:05 +0100 (CET)
Date: Wed, 6 Mar 2013 11:14:01 +0100
From: Christoph Berg <cb@df7cb.de>
To: PostgreSQL WWW <pgsql-www@postgresql.org>
Subject: Re: Updates for the apt.postgresql.org instructions
Message-ID: <20130306101400.GB27001@msgid.df7cb.de>
Mail-Followup-To: Christoph Berg <cb@df7cb.de>,
	PostgreSQL WWW <pgsql-www@postgresql.org>
References: <20130305143657.GF11586@msgid.df7cb.de>
	<CABUevExP_rY3CPac_Q6F=BZL7cpA-Fjd1LRHhmTpov0aVtiO0A@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="7JfCtLOvnd9MIVvH"
Content-Disposition: inline
In-Reply-To: 
 <CABUevExP_rY3CPac_Q6F=BZL7cpA-Fjd1LRHhmTpov0aVtiO0A@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Pg-Spam-Score: -1.9 (-)
List-Archive: <http://archives.postgresql.org/pgsql-www>
List-Help: <mailto:majordomo@postgresql.org?body=help>
List-ID: <pgsql-www.postgresql.org>
List-Owner: <mailto:pgsql-www-owner@postgresql.org>
List-Post: <mailto:pgsql-www@postgresql.org>
List-Subscribe: <mailto:majordomo@postgresql.org?body=sub%20pgsql-www>
List-Unsubscribe: <mailto:majordomo@postgresql.org?body=unsub%20pgsql-www>
X-Mailing-List: pgsql-www
Precedence: bulk
Sender: pgsql-www-owner@postgresql.org


--7JfCtLOvnd9MIVvH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Re: Magnus Hagander 2013-03-05 <CABUevExP_rY3CPac_Q6F=BZL7cpA-Fjd1LRHhmTpov0aVtiO0A@mail.gmail.com>
> Any chance you can provide this as an attachment instead? To make sure
> line endings and friends aren't messed up..

Here it is.

Christoph
-- 
cb@df7cb.de | http://www.df7cb.de/

--7JfCtLOvnd9MIVvH
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="apt.diff"

diff --git a/templates/pages/download/linux/debian.html b/templates/pages/download/linux/debian.html
index 96b75cf..cc064cb 100644
--- a/templates/pages/download/linux/debian.html
+++ b/templates/pages/download/linux/debian.html
@@ -41,6 +41,15 @@ version number as required):
  <li>pgadmin3 - pgAdmin III graphical administration utility</li>
 </ul>
 
+<script>
+ <!--
+ function updateSeries(select) {
+  var deb = document.getElementById('series-deb');
+  deb.innerHTML = select.value;
+ }
+ -->
+</script>
+
 <h2>PostgreSQL Apt Repository</h2>
 <p>
 If the version included in your version of Debian is not the one you want,
@@ -52,24 +61,22 @@ updates for all supported versions of PostgreSQL throughout the support
 <p>
 To use the apt repository, follow these steps:
 <ul>
- <li>Import the repository signing key
-   <code>wget -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -</code>
- </li>
- <li>Edit the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
-   for the repository, substituting the proper "codename" for your release
-   <code>deb http://apt.postgresql.org/pub/repos/apt/ squeeze-pgdg main</code>
- </li>
- <li>Configure apt's package pinning to prefer the PGDG packages over the standard ones in <i>/etc/apt/preferences.d/pgdg.pref</i>
-   <code>
-Package: *<br/>
-Pin: release o=apt.postgresql.org<br/>
-Pin-Priority: 500
-   </code>
+ <li>Create the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
+ for the repository
+ <form style="display: inline">
+  <select id="field.series" name="field.series" onChange='updateSeries(this);'>
+   <option selected="selected" value="YOUR_DEBIAN_VERSION_HERE">Choose your Debian version</option>
+   <option value="wheezy">Wheezy (7.0)</option>
+   <option value="squeeze">Squeeze (6.0)</option>
+  </select>
+ </form>
+ <code>deb http://apt.postgresql.org/pub/repos/apt/ <span id="series-deb">YOUR_DEBIAN_VERSION_HERE</span>-pgdg main</code>
  </li>
- <li>Update the package lists, and install the pgdg-keyring package to automatically get repository key updates
+ <li>Import the repository signing key, and update the package lists
    <code>
-sudo apt-get update<br/>
-sudo apt-get install pgdg-keyring
+wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | \<br/>
+&nbsp;&nbsp;sudo apt-key add -<br/>
+sudo apt-get update
    </code>
  </li>
 </ul>
diff --git a/templates/pages/download/linux/ubuntu.html b/templates/pages/download/linux/ubuntu.html
index 664af81..a506d37 100644
--- a/templates/pages/download/linux/ubuntu.html
+++ b/templates/pages/download/linux/ubuntu.html
@@ -43,40 +43,42 @@ version number as required):
  <li>pgadmin3 - pgAdmin III graphical administration utility</li>
 </ul>
 
+<script>
+ <!--
+ function updateSeries(select) {
+  var deb = document.getElementById('series-deb');
+  deb.innerHTML = select.value;
+ }
+ -->
+</script>
+
 <h2>PostgreSQL Apt Repository</h2>
 <p>
-If the version included in your version of Debian is not the one you want,
+If the version included in your version of Ubuntu is not the one you want,
 you can use the PostgreSQL Apt Repository. This repository will integrate
 with your normal systems and patch management, and provide automatic
 updates for all supported versions of PostgreSQL throughout the support
 <a href="/support/versioning/">lifetime</a> of PostgreSQL.
 </p>
 <p>
-Not all Ubuntu releases are currently supported in the apt repository. For
-an up to date list of supported releases, please see the apt page on
-<a href="http://wiki.postgresql.org/wiki/Apt">the wiki</a>.
-</p>
-<p>
 To use the apt repository, follow these steps:
 <ul>
- <li>Import the repository signing key
-   <code>wget -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -</code>
- </li>
- <li>Edit the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
-   for the repository, substituting the proper "codename" for your release
-   <code>deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main</code>
- </li>
- <li>Configure apt's package pinning to prefer the PGDG packages over the standard ones in <i>/etc/apt/preferences.d/pgdg.pref</i>
-   <code>
-Package: *<br/>
-Pin: release o=apt.postgresql.org<br/>
-Pin-Priority: 500
-   </code>
+ <li>Create the file <i>/etc/apt/sources.list.d/pgdg.list</i>, and add a line
+ for the repository
+ <form style="display: inline">
+  <select id="field.series" name="field.series" onChange='updateSeries(this);'>
+   <option selected="selected" value="YOUR_UBUNTU_VERSION_HERE">Choose your Ubuntu version</option>
+   <option value="precise">Precise (12.04)</option>
+   <option value="lucid">Lucid (10.04)</option>
+  </select>
+ </form>
+ <code>deb http://apt.postgresql.org/pub/repos/apt/ <span id="series-deb">YOUR_UBUNTU_VERSION_HERE</span>-pgdg main</code>
  </li>
- <li>Update the package lists, and install the pgdg-keyring package to automatically get repository key updates
+ <li>Import the repository signing key, and update the package lists
    <code>
-sudo apt-get update<br/>
-sudo apt-get install pgdg-keyring
+wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | \<br/>
+&nbsp;&nbsp;sudo apt-key add -<br/>
+sudo apt-get update
    </code>
  </li>
 </ul>

--7JfCtLOvnd9MIVvH
Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0


-- 
Sent via pgsql-www mailing list (pgsql-www@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-www

--7JfCtLOvnd9MIVvH--