[Pkg-kde-trunk] http://qt-kde.debian.net/ document root updated

[Debian Qt/KDE Public Repository]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

http://qt-kde.debian.net/ document root has been updated.
The following changes have been made:

commit b50ff77b4788aefd55d789c855139b8d4057bdb1
Merge: 0d6b8cd 7338152
Author: Debian Qt/KDE Public Repository Daemon <noreply at qt-kde.debian.net>
Date:   Tue Nov 29 21:40:02 2011 +0000

    Merge branch 'documentroot' of git://git.debian.org/git/pkg-kde/qt-kde.debian.net

commit 7338152919d711dc7a8857e93a7fa73189dc8561
Author: Eshat Cakar <info at eshat.de>
Date:   Tue Nov 29 22:30:39 2011 +0100

    Improve layout of the two ways to add the repos

diff --git a/index.php b/index.php
index e03e63f..d1cde72 100644
- --- a/index.php
+++ b/index.php
@@ -113,7 +113,9 @@ KDE SC 4.4.2 has been uploaded to <a href="http://wiki.debian.org/DebianExperime
 As a result, KDE SC 4.4.2 packages have been removed from this repository.
 </div>
 
- -<h1>Configuring repositories with apt-spy (recommended)</h1>
+<h1>Configuring repositories</h1>
+<p>Use one of the following ways, to add the repository:</p>
+<h2>Using apt-spy to find the fastest mirror (recommended)</h2>
 <p>
 Install apt-spy:
 </p>
@@ -143,7 +145,7 @@ Download this file: <a href="mirrors.txt">mirrors.txt</a>. Then execute:
 <p>
 Now, in /etc/apt/sources.list.d/qt-kde.list you should have the mirror which works faster for you. 
 
- -<h1>Configuring repositories editing /etc/apt/sources.list</h1>
+<h2>By manually editing /etc/apt/sources.list</h2>
 <p>
 You need to add the following to your /etc/apt/sources.list:
 </p>

commit 0fcf7f2df2c845a4fc7e7404872b2cc3571478a3
Author: Eshat Cakar <info at eshat.de>
Date:   Tue Nov 29 22:28:32 2011 +0100

    use dist-upgrade to upgrade all packages

diff --git a/index.php b/index.php
index 754768d..e03e63f 100644
- --- a/index.php
+++ b/index.php
@@ -185,7 +185,7 @@ In order to get the repository key, install the
 and install the newer packages with:
 </p>
 <pre>
- -aptitude -t experimental-snapshots upgrade
+aptitude -t experimental-snapshots dist-upgrade
 </pre>
 
 <!-- <p>

commit e4d3d538b0b204f6528ddbe50b4785ff9275cb90
Author: Eshat Cakar <info at eshat.de>
Date:   Tue Nov 29 21:51:33 2011 +0100

    add upgrade section, and don't repeat upgrade procedure

diff --git a/index.php b/index.php
index 579c50f..754768d 100644
- --- a/index.php
+++ b/index.php
@@ -142,32 +142,6 @@ Download this file: <a href="mirrors.txt">mirrors.txt</a>. Then execute:
 
 <p>
 Now, in /etc/apt/sources.list.d/qt-kde.list you should have the mirror which works faster for you. 
- -So you should update you packages list:
- -</p>
- -<pre>
- -# aptitude update
- -</pre>
- -
- -<p>
- -In order to get the repository key, install the
- -<strong>pkg-kde-archive-keyring</strong> package:
- -</p>
- -<pre>
- -# aptitude install pkg-kde-archive-keyring
- -</pre>
- -<p>
- -(confirm the question about a missing key with "Yes"). Then update your package list again:
- -</p>
- -<pre>
- -# aptitude update
- -</pre>
- -<p>
- -and install the newer packages with:
- -</p>
- -<pre>
- -aptitude -t experimental-snapshots upgrade
- -</pre>
- -
 
 <h1>Configuring repositories editing /etc/apt/sources.list</h1>
 <p>
@@ -186,6 +160,7 @@ deb http://qt-kde2.debian.net/debian experimental-snapshots main
 deb-src http://qt-kde2.debian.net/debian experimental-snapshots main
 </pre>
 
+<h1>Upgrade packages</h1>
 <p>
 Update your package list with:
 </p>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQIcBAEBAgAGBQJO1VEzAAoJEJPdKuLnnIur9LIP/045bPcChjs8eXFwBwAytRyN
HBQfO9iarcKwY6G3Hl0e6EBQdYF+RuF0WsLIazfsQ9jyQuW+HvHjTjWEi1Imr+ZJ
pNC80oyCmROAlz8Noi1SW9U5SKvkla75mGsY1pAowQlX26z+Ck04uhvZxt1YwgFw
re7BvlmWOJ2Rk8cCUiTNfVXN5PseupVtj8oqzGqQlwTmcZvDmctZgbcACy+SCC7u
j7E9izSFGth8qjHkRmaIi0moL3SW+wbu0v9tKpMUfpI3QhmX+QVGiIjyzGHrGVoN
yLhZdgLAijgbsqz84dFNON2wkgWYxV7Ewq0O1E8O7CnTRIaTPbCkqQKWxfJVbkru
899sKbUyYDCT8w+UY16DSlIb6icd44HaAc6JSZ1bvap2Ke9OPXtxRCbd8+gvaDt2
Aj35DaaE/BB1SZIysfulyQ32xj00kqOIaTaFmNPDGjDsqVmCwov7nJfFH3naaN6O
esqpGW27Q2t49qVNsPKOwUqJVbKmR46m0jHPqj6kMstIAyLsfhmc1iYDW7yMfBdi
XNTHHu/wU89ED9mPEj9xoZOieG5x4tVWvgA8c7I6qM+fEIBbxrE/cGc+1la9iR5x
yylEfwjDbm2HsWTK/IhK9RFMEbJ/LzSDOcGg9TPdbMd+pZLnhPDjzty25kxBu17O
bxBckUFezOCOjAEPalL6
=6hcd
-----END PGP SIGNATURE-----