diff --git a/www.i2p2/pages/debian.html b/www.i2p2/pages/debian.html
index 876363f7b4729f281e5d0db83ac0527328def1a4..bc159bb56afd5efa9e05c219f747e6da6a91ad5f 100644
--- a/www.i2p2/pages/debian.html
+++ b/www.i2p2/pages/debian.html
@@ -6,10 +6,10 @@
The Debian packages have been tested and <span style="font-style: italic;">should </span>work on x86/x86_64 platforms running
<ul>
<li><a href="debian#ubuntu">Ubuntu</a> (Precise <span style="font-style: italic;">12.04</span> and newer)</li><li><a href="debian.html#ubuntu">Mint</a></li>
- <li><a href="debian#debian">Debian Linux</a> (Wheezy and newer) & kFreeBSD</li>
+ <li><a href="debian#debian">Debian Linux</a> (Squeeze and newer) & kFreeBSD</li>
<li><a href="debian#debian">Knoppix</a></li>
</ul>
-The I2P packages <span style="font-style: italic;">may</span> work on systems not listed above. Please report any issues with these packages on <a href="http://trac.i2p2.de/">Trac</a> at <a href="http://trac.i2p2.de">http://trac.i2p2.de</a>.
+The I2P packages <span style="font-style: italic;">may</span> work on systems not listed above. Please report any issues with these packages on <a href="http://trac.i2p2.no/newticket?component=package/debian&owner=killyourtv&cc=killyourtv@mail.i2p">Trac</a> at <a href="http://trac.i2p2.no/newticket?component=package/debian&owner=killyourtv&cc=killyourtv@mail.i2p">http://trac.i2p2.de</a>.
<ul>
<li>Option 1: <a href="debian#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<span style="font-style: italic;">Try this if you're not using Debian)</span></li>
<li>Option 2: <a href="debian#debian">Debian</a> (including Debian-derivatives)</li>
@@ -41,32 +41,29 @@ was added with the earlier command.</li>
After the installation process completes you can move on to the next
part of <a href="debian#Post-install_work">starting I2P</a> and configuring it for your system.
-<h2 id="debian">Instructions for Debian or non-Linux/non-x86</h2>
-The dependencies in Debian Wheezy are older than those supported by
-Launchpad. As a result, Debian users can no longer use the PPA packages. The following is a temporary
-workaround until repository hosting is worked out:
-
+<h2 id="debian">Instructions for Debian</h2>
+<i>Currently supported architectures include amd64, i386, armel, armhf (for Raspbian), kfreebsd-amd64, and kfreebsd-i386.</i>
<p>Note: The steps below should be performed with root access (i.e., switching
user to root with "su" or by prefixing each command with "sudo").
</p>
<ol>
-<li>Install the package <b>apt-transport-https</b> then add lines like the following to <code>/etc/apt/sources.list.d/i2p.list</code>.<br>
+<li>Add lines like the following to <code>/etc/apt/sources.list.d/i2p.list</code>.<br>
For Squeeze:<br>
<pre>
- <code>deb https://dl.dropboxusercontent.com/u/18621288/debian squeeze main
- deb-src https://dl.dropboxusercontent.com/u/18621288/debian squeeze main</code>
+ <code>deb http://deb.i2p2.no/ squeeze main
+ deb-src http://deb.i2p2.no/ squeeze main</code>
</pre>
<br />
-For Wheezy:<br />
+For Wheezy (stable):<br />
<pre>
- <code>deb https://dl.dropboxusercontent.com/u/18621288/debian wheezy main
- deb-src https://dl.dropboxusercontent.com/u/18621288/debian wheezy main</code>
+ <code>deb http://deb.i2p2.no/ stable main
+ deb-src http://deb.i2p2.no/ stable main</code>
</pre>
<br />
-For Sid:<br />
+For Testing or Unstable:<br />
<pre>
- <code>deb https://dl.dropboxusercontent.com/u/18621288/debian sid main
- deb-src https://dl.dropboxusercontent.com/u/18621288/debian sid main</code>
+ <code>deb http://deb.i2p2.no/ unstable main
+ deb-src http://deb.i2p2.no/ unstable main</code>
</pre>
</li>
<li>Download <a href="/_static/debian-repo.pub">the key used to sign the repository</a> and add it to apt:<br />
@@ -76,11 +73,14 @@ For Sid:<br />
<li>Notify your package manager of the new repository by entering<br />
<code> apt-get update</code><br />
This command will retrieve the latest list of software from every
-repository enabled on your system, including the I2P PPA added in step
+repository enabled on your system, including the I2P repository added in step
1.</li>
- <li>You are now ready to install I2P! <br />
- <code> apt-get install i2p</code></li>
+<li>You are now ready to install I2P! Installing the <code>i2p-keyring</code>
+package will ensure that you receive updates to the repository's
+GPG key.<br />
+ <code> apt-get install i2p i2p-keyring</code></li>
</ol>
+
After the installation process completes you can move on to the next part of <a href="#Post-install_work">starting I2P</a> and configuring it for your system.
<h2 id="Post-install_work">Post-install work</h2>
Using these I2P packages the I2P router can be started in the following
diff --git a/www.i2p2/pages/debian_fr.html b/www.i2p2/pages/debian_fr.html
index c53c24a0529042bf8d0b0d23ed111e9467222af1..30b48387412d02f7159cae642cf114212570e128 100644
--- a/www.i2p2/pages/debian_fr.html
+++ b/www.i2p2/pages/debian_fr.html
@@ -8,12 +8,12 @@ ont été testés et <span style="font-style: italic;">devraient</span> fonction
<ul>
<li><a href="debian_fr#ubuntu">Ubuntu</a> (Precise<span style="font-style: italic;">12.04</span> et ultérieures)</li>
<li><a href="debian_fr#ubuntu">Mint</a></li>
- <li><a href="debian_fr#debian">Debian Linux</a> (Wheezy et ultérieures) & <a href="#nonlinux">kFreeBSD</a></li>
+ <li><a href="debian_fr#debian">Debian Linux</a> (Wheezy et ultérieures)</li>
<li><a href="debian_fr#debian">Knoppix</a></li>
</ul>
Les paquets I2P <span style="font-style: italic;">peuvent</span> marcher sur des systèmes non listés ci-dessus.
-Merci de rapporter tout problème avec ces paquets dans <a href="http://trac.i2p2.de/">Trac</a> sur
-<a href="http://trac.i2p2.de">http://trac.i2p2.de</a>.
+Merci de rapporter tout problème avec ces paquets dans <a href="http://trac.i2p2.no/newticket?component=package/debian&owner=killyourtv&cc=killyourtv@mail.i2p">Trac</a> sur
+<a href="http://trac.i2p2.no/newticket?component=package/debian&owner=killyourtv&cc=killyourtv@mail.i2p">http://trac.i2p2.no</a>.
<ul>
<li>Option 1: <a href="debian_fr#ubuntu">Versions récentes </a> d'Ubuntu et ses dérivées
(<span style="font-style: italic;">À essayer si vous n'utilisez pas Debian)</span></li>
@@ -58,34 +58,31 @@ cliquez sur <span style="font-weight: bold;">Ajouter à la sélection</span> pui
<h5>À la fin du processus d'installation vous pouvez passer à l'étape suivante pour
<a href="debian_fr#Post-install_work">démarrer I2P</a> et le configurer pour votre système.</h5>
-<h2 id="debian">Instructions pour Debian Wheezy et plus récentes and non-x86</h2>
-The dependencies in Debian Wheezy are older than those supported by
-Launchpad. As a result, Debian users can no longer use the PPA packages. The following is a temporary
-workaround until repository hosting is worked out:
-
+<h2 id="debian">Instructions pour Debian Wheezy et plus récentes</h2>
+<i>Currently supported architectures include amd64, i386, armel, armhf (for Raspbian), kfreebsd-amd64, and kfreebsd-i386.</i>
<p>
Les étapes suivantes doivent être effectuées avec l'accès root (c.à d. en basculant de l'utilisateur en cours à root
avec "su" ou en préfixant chaque commande avec "sudo").
</p>
<ol>
-<li>Install the package <b>apt-transport-https</b> then add lines like the following to <code>/etc/apt/sources.list.d/i2p.list</code>.<br>
+<li>Add lines like the following to <code>/etc/apt/sources.list.d/i2p.list</code>.<br>
For Squeeze:<br>
<pre>
- <code>deb https://dl.dropboxusercontent.com/u/18621288/debian squeeze main
- deb-src https://dl.dropboxusercontent.com/u/18621288/debian squeeze main</code>
+ <code>deb http://deb.i2p2.no/ squeeze main
+ deb-src http://deb.i2p2.no/ squeeze main</code>
</pre>
<br />
For Wheezy:<br />
<pre>
- <code>deb https://dl.dropboxusercontent.com/u/18621288/debian wheezy main
- deb-src https://dl.dropboxusercontent.com/u/18621288/debian wheezy main</code>
+ <code>deb http://deb.i2p2.no/ stable main
+ deb-src http://deb.i2p2.no/ stable main</code>
</pre>
<br />
-For Sid:<br />
+For Testing or Unstable:<br />
<pre>
- <code>deb https://dl.dropboxusercontent.com/u/18621288/debian sid main
- deb-src https://dl.dropboxusercontent.com/u/18621288/debian sid main</code>
+ <code>deb http://deb.i2p2.no/ unstable main
+ deb-src http://deb.i2p2.no/ unstable main</code>
</pre>
</li>
<li>Download <a href="/_static/debian-repo.pub">the key used to sign the repository</a> and add it to apt:<br />
@@ -95,10 +92,12 @@ For Sid:<br />
<li>Notify your package manager of the new repository by entering<br />
<code> apt-get update</code><br />
This command will retrieve the latest list of software from every
-repository enabled on your system, including the I2P PPA added in step
+repository enabled on your system, including the I2P repository added in step
1.</li>
- <li>You are now ready to install I2P! <br />
- <code> apt-get install i2p</code></li>
+<li>You are now ready to install I2P! Installing the <code>i2p-keyring</code>
+package will ensure that you receive updates to the repository's
+GPG key.<br />
+ <code> apt-get install i2p i2p-keyring</code></li>
</ol>
À la fin du processus d'installation vous pouvez passer à l'étape suivante pour
<a href="#Post-install_work">démarrer I2P</a> et le configurer pour votre système.
diff --git a/www.i2p2/static/debian-repo.pub b/www.i2p2/static/debian-repo.pub
index 530d3ccd3485c13b10fd20208b6530fb74fc3271..45d49b345cec9482770d8b41e5913caf44f731ee 100644
--- a/www.i2p2/static/debian-repo.pub
+++ b/www.i2p2/static/debian-repo.pub
@@ -1,36 +1,36 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
+Version: GnuPG v1.4.15 (GNU/Linux)
-mQINBFFgTesBEAC2vlToWN6bu1ekfT3nq41hrPA2D6X1qCaUnpePV0nOduPeJZUC
-YCTKYuDnW/EcIJtSWkspsBwxLg/QWTdH+TU65XlboeevxI2yASL0muhmZ0zs3f6g
-81i2gMaceEtYhpZDRedvk2qIIJz6fy3ziEa7GI3+GHtzQ+MYBvlvDUZ4dkRqJ1cF
-0CW/I2aVUcoIrWx4azC7ahLGGc5sKUcoMzYIDqdWl3MFqBCmqIE1ZyxxJbmdDVYE
-QLwo4+u6+ybksNRM4tmNmcXk0BP2bgWjY2//yVZGGnxhig/vXvxlHF+DqJg2tGFk
-JBPBvf52T3qfJyrzd5+TZz0Qf4GV6BCQhzH8hBEC8g+MdgMa+uzCun+/oTgoobvf
-vW3aGIq0eCGpByI7mVI1WIvSe82ZEvpHf/t6f+az7mdEoOfEn1P91Mtes5AfPJOj
-5vRjKwcd/uB53y0DN0bwbaR3HrTGDbsEYsHgxgvaOLAYfOp5j/ynFHUeBq7Tl97L
-1xzvnqSCjp8n4XEQcYdPCc0PgSvX6x8HDVX22LrYdkCago0VnvDH52WmgypU6ltc
-+nvCr/EEwxPYwpY+rRgpi7NimL9e6ID6iOZoBVUS89scbu/asiJbUy4GftH+pZgK
-CqZiTwMkvoH2DJJfZIQ4/pWVdXYcV3Jg9Zb7lHQO05vHhiREbYW9kKzCYQARAQAB
-tD5LaWxsWW91clRWIERlYmlhbiByZXBvc2l0b3J5IHNpZ25pbmcga2V5IDxraWxs
-eW91cnR2QG1haWwuaTJwPokCPQQTAQoAJwUCUWBN6wIbAwUJA8JnAAULCQgHAwUV
-CgkICwUWAgMBAAIeAQIXgAAKCRCM9uiWs8AbCXW2EACF1CzUTeLQYB7wynCxuV+B
-WcWZ1GljiIshP8bwIxUmOZN1c/53YvybBiwkygWEDC6Epq4gUVyXcgL+Pk6Du/Du
-n2GjqACFDQ28pCm1ggLtYxdGlRM6UpIO+VFdzTr+fuGfuwBKsdE9NqFfsDOoMLys
-M1D29aZhU84RYII6lBrgN7t0o9c/sUlRVsVRUj+OLTwC9U1KSrDy5IWTMG/xULdL
-JfDIgqF0QvIx+jeu/6wJs44OYqfkYZSseEwRqWY/+H6FuZcupAqGpnOjMbnBC7WY
-j93E05jp072pOqYYxxs3laLgtjMXS7IA0jz38xE182dKZysGjNe1zAJwsYdDHOwE
-Dl15EuDG+dboGQmsPf+gV29u2p964x04O5BN/rceKMVxf5AKgyNZJNrASKA2UUIT
-fW7koGnxRLeW5JjrZ4WLgvj3VSI5OM8KE7mDTzHTw4BVepPDo7QLUMMUbGM+E9pp
-52y7F6QuKKymD7HMuMDrDyO3gTH+7u1RedhvGN9BzTCK30aE2QSlfaKePny0x9xR
-miV3ztzukz/tGyhZAbXI9Rll2Zpaykj9FQUQmLxHOK0JicggMMOu1ZBGbXn8i2SL
-5SuzS0zl4YH0g/K1WLxLZCXAlVl9c4luBZfkI/fVyV5BLPi9Vc+5Cc2a06JqIUZu
-uDgT9eyDYzI91ZTtbFs6ZokBHAQQAQoABgUCUWBPyQAKCRCr4MMZ3woKGnZZCACY
-2KjDJsJZwiDf8CcgJ0/ArB81N8vuJoP1jbXT5pvfer7m5dTtcdnfUO91YnLjJbSh
-lE3dJWInog5/ImbbkVIYulINxAg2Fc6LRBf9OmEdTezo/1UgzwIsCDF3/rwVYLfk
-uzbXOyVV4KiEUOi5CZgF85xnLfMDu/fCj9kunQAQ8a8KaMBd6LvBp9aZzCuwQcL8
-PGs6l0ozFAWth1zkrWmPof7sI8YHDcvZYfr7USKndL3PqJXFWIy97XLmXGAO7akI
-ZZ8VbThTX8yX5AJHCLRh9Cbc4WdyW/KpOmrLPmJAebFp/wNTROSkiFQCrawn77ld
-kZtbof+b1iBaTMMIg+oc
-=SBqN
+mQINBFJXM+IBEAC4d7PbH0ZZjOld1DBu0rFAjZYITMa0yFCqOEbRGd3gdMeMx21h
+TJ8B2gICRL6UJL/GFN9HieSzQGAd9ABf924/UQyZJ+zMwt3x0bYAfC8SMWg5XgHM
+rR4M9v+aUZ5fsqwXEoKVI0AC3z3e6IutRota6/mpsuFaHwjzsv/0elFa6aapK6D+
+ZYHCQLXEk72RokmYcIxYaNZilgNjKf0IYS5wwEg9NZqiUyaJr9dvQb8uYQMNt0MK
+7Lklm5aepFOS+KmThnFTZb5l3UYr/rNvpMmHmS8XpNBvtoga0YNXMYjrPf9QdvjP
+1V0dMdOF6rSPkq7sTKDyF713ovSLxgtnibqhp9LgQcjyA43591Fg7cmwNu42ccd2
+Frdt+BxpYjzYu49d+pxQJXoSwPSQFuAE5V0AkuQeng/IxpW3zi6ybJJWOwvxeq2Z
+RdNjzpwu0vUYsLELdsCW88etc141n7O9P5L3s4o7PYHE/y3N47PwDgb43cErvTcF
+bIP2aEmJnyIbOWwiCftnxaKlfAbv0g7TNho5HX66OreR4Fb5vUkoIfzte/fxZKOL
+R/hhNTH1fZNEaIaxHwvitfQe8xPsLgR/O3PoXd74UOJuwOwcf0LROgNaN5O+0rmD
+5eAbVn7CYd7ZQPIRRKlHrFsQDg4u5jEt7GVd+jYsEF9A6fK7npNhCkNAnwARAQAB
+tDZJMlAgRGViaWFuIFBhY2thZ2UgUmVwb3NpdG9yeSA8a2lsbHlvdXJ0dkBpMnBt
+YWlsLm9yZz6JAj0EEwEKACcFAlJXM+ICGwMFCQHhM4AFCwkIBwMFFQoJCAsFFgID
+AQACHgECF4AACgkQZ+zlYFvPE0ajKBAAr64De1vMJb+SzqW20fCFyOmG/QbFgGK9
+FeJzDaZ8lcGDFiMtMvm7IkL0jAKQl5bInsAA26SQq4j1gEU3DIx2mJT4i+ZztDLO
+Tv3XxO6DuVdPMtNEH3AKiRufwGH/HtudtAyUy7gwIYg2qhRVR3hz7iHs9WbgkkXy
+6Qp/WCYJGuH74hXIQtW+Cyyded50vjm8uPqYuRUfze6jetZkWUSkAmqbzZhfHPv1
+ju5GptHWH+9Z4q9fvr1LZ09eHy+XfnxE/NpP4nfXJ42F9/QpNDEPgT8DTp3NknpS
+N95EDhKduHGX1rBAjc4ZQE6L+gTS2DJq5ozgAM/sFfH9uL+kULx7lzbXTpwL1Zd8
+fVwrmGM81duOZ7erFlpRqYKn6aVdLbQFxcLz6Q4WUBuHd4XBE5WilYvTyOPB/mYf
+TmWBaTS4glYz3cFKi9J8LSaW6b8/ik9gVS6Z7wPckWHuWWIRdcKk3zJZoXeOzrTZ
+KX+z2uATkX7Tfpd07o4wwSRmWevFGniGL1ml+abanpIGHt8h79/gscEQ8aQdD+i0
+dNjqgpLTS1TL0aQ0sJ/UD5EexbMuWKIGatABVguuofrK77GmGTcz1LL3mGJV0HIR
+vXjFOx3tEV5HYdDJK9gq1W0JKxYmE+paw8PFaM5+vnXP0xoTz75KKlL3N1Ra6/mG
+whIPAIaMfhiJARwEEAEKAAYFAlJYlBAACgkQq+DDGd8KChoHcgf8DegR4gl6F4uy
+YnHXKSubJYHSfWGHaKe7msoCjAna13BtKkZXj2DWDLUmMCwI/qHvQT1V9mNwsBgW
+nAagKATeB+bhumg9/xbBAKndaowHTuGI0wZ9uXbXaxxlpXbODFScBoR86CCeJa4F
+3N5RwWZryv3MwlLc109aEaCriL9nNb/K2OZ98I9i+K2SdT5mITk3FeAgzD+UrVqL
+oYNQ677BpsJQfvTvOP6PiFpXbVVzRouhQX6a7Dzkd2rzjLRNeAc2gp0+n4U1j8N0
+HTRvBAX6RRv6BZNLWtS21bqwPtcrTJ9qr8aLbWyjWbBTFqRR4lAUn0vDQBfA5B2Z
+z+b2yx4iqA==
+=ZkNG
-----END PGP PUBLIC KEY BLOCK-----