[Pkg-kde-trunk] [SCM] DocumentRoot for http://qt-kde.debian.net/ branch, documentroot, updated. 60bb0e14b690942560c8b5702b2a37f95d176655

[Modestas Vainius]

The following commit has been merged in the documentroot branch:
commit 60bb0e14b690942560c8b5702b2a37f95d176655
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Oct 16 19:00:16 2010 +0300

    Note that /etc/apt/preferences are no longer necessary.
    
    Now repository make use of ButAutomaticUpgrades field in the Release file
    (priority 100 by default). This field is supported by apt >= 0.8.5.
    
    Add NEWS item and documentation in the "About repository" section. Also change
    Pin-Priority from 101 to 100 to match what ButAutomaticUpgrades would give to
    the repository.
---
 index.php |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index d153687..9261e8a 100644
--- a/index.php
+++ b/index.php
@@ -17,6 +17,11 @@
 <h1>News &amp; notes</h1>
 
 <p>
+<span class="newsdate">2010-10-16</span>
+Extra entries in /etc/apt/preferences are no longer needed with <strong>apt 0.8.5</strong> or later.
+See <a href="#about">About repository</a> section below.
+</p>
+<p>
 <span class="newsdate">2010-09-09</span>
 Most KDE SC 4.5.1 packages have been uploaded.
 </p>
@@ -57,7 +62,7 @@ In order to get repository key, install the
 You can view the list of available packages <a href="debian/">here</a>.
 </p> 
 
-<h1>About repository</h1>
+<h1 id="about">About repository</h1>
 
 <p>
 The primary purpose of this repository is to provide package versions of the
@@ -66,15 +71,23 @@ experimental. Therefore, this repository is targetted at Debian
 unstable/experimental users.
 </p>
 <p>
-It is recommended to bump priority of this repository to 101 in order get
-updates using normal dist-upgrade process. Just add this snippet to the
-/etc/apt/preferences:
+In order to receive repository updates using standard <pre>apt-get
+dist-upgrade</pre> or <pre>aptitude full-upgrade</pre> process, make sure that
+you have <strong>apt 0.8.5</strong> or later installed. Both testing and unstable
+distributions already have this version so if your system is up-to-date, you do
+not need to worry about further repository setup. However, if you had to hold
+back apt for some reason, it's recommended that you add the following snippet
+to the /etc/apt/preferences file:
 </p>
 <pre>
 Package: *
 Pin: release o=qt-kde,a=experimental-snapshots
-Pin-Priority: 101
+Pin-Priority: 100
 </pre>
+<p>
+Once you upgrade to apt 0.8.5 or later, you can remove this snippet from
+/etc/apt/preferences. However, if you happen to keep it, it won't do any harm.
+</p>
 
 <h1>KDE Software Compilation 4.5.1 packages</h1>
 

-- 
DocumentRoot for http://qt-kde.debian.net/