diff --git a/www.i2p2/pages/debian.html b/www.i2p2/pages/debian.html
index 966008e6841590106a9445966b456e93549b1899..876363f7b4729f281e5d0db83ac0527328def1a4 100644
--- a/www.i2p2/pages/debian.html
+++ b/www.i2p2/pages/debian.html
@@ -3,18 +3,16 @@
{% block content %}
<h1>Debian I2P Packages</h1>
-The packages hosted on <a href="https://launchpad.net/%7Ei2p-maintainers/+archive/i2p">the I2P Launchpad site</a>
-have been tested and <span style="font-style: italic;">should </span>work on x86/x86_64 platforms running
+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) & <a href="#nonlinux">kFreeBSD</a></li>
+ <li><a href="debian#debian">Debian Linux</a> (Wheezy 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>.
<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>
- <li>Option 3: <a href="debian#nonlinux">Non-Linux</a> (and possibly Non-x86 architectures)</li>
</ul>
<h2 id="ubuntu">Instructions for Ubuntu Precise Pangolin (and newer) and derivatives like Linux Mint & Trisquel</h2>
<h5>Adding the PPA via the command line and installing I2P</h5>
@@ -43,19 +41,39 @@ 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 Wheezy and newer</h2>
-<p>(<i>For Squeeze you can follow the instructions <a href="#nonlinux">here</a>)</i>.</p>
-The steps below should be performed with root access (i.e., switching
+<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:
+
+<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>Add the GPG key that signs the repository with the following command:<br />
- <code>apt-key adv --keyserver keyserver.ubuntu.com --recv-keys <a href="http://keyserver.ubuntu.com:11371/pks/lookup?search=0x474BC46576FAE76E97C1A1A1AB9660B9EB2CC88B&op=index">EB2CC88B</a></code><br />
-You'll have output like the following if the command was successful: <br />
- <img src="/_static/images/add-key-terminal.png" alt="" /></li>
- <li>Add the following entries to <code>/etc/apt/sources.list.d/i2p.list</code><br />
- <code> deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main <br />
- deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main </code><br />
- <li>Notify your package manager of the new PPA by entering<br />
+<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>
+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>
+</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>
+</pre>
+<br />
+For Sid:<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>
+</pre>
+</li>
+<li>Download <a href="/_static/debian-repo.pub">the key used to sign the repository</a> and add it to apt:<br />
+ <code>apt-key add debian-repo.pub</code>
+</li>
+
+ <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
@@ -64,21 +82,6 @@ repository enabled on your system, including the I2P PPA added in step
<code> apt-get install i2p</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="nonlinux">Instructions for Non-Linux / Non-x86</h2>
-The steps below should be performed with root access (i.e., switching
-user to root with "<code>su</code>" or by prefixing each command with "<code>sudo</code>").<br />
-<ol>
- <li>Download the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">i2p-router</a> package
- from the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">PPA</a>.
- Alternatively, there are unofficial packages available <a href="http://killyourtv.i2p/debian/">within I2P</a>
- (or <a href="http://killyourtv.i2p.in/debian/">through an inproxy (not anonyous!)</a>) for <code>armel, armhf, and kfreebsd</code>.</li>
- <li>Make sure that you have Java installed. Running <span style="font-style: italic;"><code>apt-get install default-jre</code></span> should be sufficient.<br />
-You are now ready to install I2P! <br />
- <code> dpkg -i i2p-router_*.deb</code></li>
- <li>It is recommended to compile <a href="/jbigi">jbigi</a> for your system to achieve better performance. Instructions are available <a href="/jbigi">here</a>.
- </li>
-</ol>
-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="Post-install_work">Post-install work</h2>
Using these I2P packages the I2P router can be started in the following
three ways:
diff --git a/www.i2p2/pages/debian_fr.html b/www.i2p2/pages/debian_fr.html
index b2f8e993feb16d38ac674b12a9f958608f4534ca..c53c24a0529042bf8d0b0d23ed111e9467222af1 100644
--- a/www.i2p2/pages/debian_fr.html
+++ b/www.i2p2/pages/debian_fr.html
@@ -19,7 +19,6 @@ Merci de rapporter tout problème avec ces paquets dans <a href="http://trac.i2p
(<span style="font-style: italic;">À essayer si vous n'utilisez pas Debian)</span></li>
<li>Option 2: <a href="debian_fr#debian">Debian</a> (dont les systèmes basés sur Debian et les anciennes versions
d'Ubuntu)</li>
- <li>Option 3: <a href="debian_fr#nonlinux">Non-Linux</a> (et peut-être les architectures non x-86)</li>
</ul>
<h2 id="ubuntu">Instructions pour Ubuntu Precise Pangolin (et plus récentes) et ses dérivées comme Linux Mint & Trisquel</h2>
<h5>Ajout du PPA via la ligne de commande et installation d'I2P</h5>
@@ -59,44 +58,52 @@ 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</h2>
+<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:
+
+<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>Ajoutez les entrées suivantes à <code>/etc/apt/sources.list.d/i2p.list</code><br />
- <code> deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main <br />
- deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main </code><br />
-Ces deux lignes devraient fonctionner quelle que soit la version de Debian installée.</li>
- <li>Ajouter la clé GPG de signature du dépôt avec la commande suivante:<br />
-
-<code>apt-key adv --keyserver keyserver.ubuntu.com --recv-keys <a href="http://keyserver.ubuntu.com:11371/pks/lookup?search=0x474BC46576FAE76E97C1A1A1AB9660B9EB2CC88B&op=index">EB2CC88B</a></code><br />
-Vous obtiendrez une sortie semblable à la suivante si la commande a réussi: <br />
- <img src="/_static/images/add-key-terminal.png" alt="" /></li>
- <li>Instruisez votre gestionnaire de paquets de la nouvelle PPA en entrant<br />
+<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>
+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>
+</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>
+</pre>
+<br />
+For Sid:<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>
+</pre>
+</li>
+<li>Download <a href="/_static/debian-repo.pub">the key used to sign the repository</a> and add it to apt:<br />
+ <code>apt-key add debian-repo.pub</code>
+</li>
+
+ <li>Notify your package manager of the new repository by entering<br />
<code> apt-get update</code><br />
-Cette commande va récupérer la dernière liste de logiciels depuis chaque dépôt activé sur votre système, dont ceux de
-la
-PPA I2P ajoutée à l'étape 1.</li>
- <li>Vous êtes maintenant prêt à installer I2P! <br />
+This command will retrieve the latest list of software from every
+repository enabled on your system, including the I2P PPA added in step
+1.</li>
+ <li>You are now ready to install I2P! <br />
<code> apt-get install i2p</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.
-<h2 id="nonlinux">Instructions pour Non-Linux / Non-x86</h2>
-Les étapes suivantes doivent être effectuées avec l'accès root (c.à d. en basculant de l'utilisateur en cours à root
-avec "<code>su</code>" ou en préfixant chaque commande avec "<code>sudo</code>").<br />
-<ol>
- <li>Téléchargez le paquet <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">i2p-router</a>
-depuis la <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">PPA</a>.</li>
- <li>Assurez-vous que Java est installé. Lancer <span style="font-style: italic;">
-<code>apt-get install default-jvm</code></span> devrait suffire.<br />
-Vous êtes maintenant prêt à installer I2P! <br />
- <code> dpkg -i i2p-router_*.deb</code></li>
- <li>On recommande de compiler <a href="/jbigi">jbigi</a> pour votre système pour obtenir les meilleures performances.
-Les instructions sont disponibles <a href="/jbigi">ici</a>.</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.
+
+
<h2 id="Post-install_work">Après l'installation</h2>
L'utilisation de ces paquets I2P vous permet de lancer le routeur de l'une de ces trois façons:
<ul>
diff --git a/www.i2p2/static/debian-repo.pub b/www.i2p2/static/debian-repo.pub
new file mode 100644
index 0000000000000000000000000000000000000000..530d3ccd3485c13b10fd20208b6530fb74fc3271
--- /dev/null
+++ b/www.i2p2/static/debian-repo.pub
@@ -0,0 +1,36 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (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
+-----END PGP PUBLIC KEY BLOCK-----