From 54aff53afe4967030e71e93b6908577413d4948f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 27 Jun 2011 02:25:18 +0000
Subject: [PATCH] 0.8.7

---
 core/java/src/net/i2p/CoreVersion.java        |  2 +-
 history.txt                                   |  2 ++
 installer/install.xml                         |  2 +-
 installer/resources/news.xml                  | 33 +++++++++++++++----
 .../src/net/i2p/router/RouterVersion.java     |  4 +--
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 6005a73485..2dec32f8ce 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -16,7 +16,7 @@ package net.i2p;
 public class CoreVersion {
     /** deprecated */
     public final static String ID = "Monotone";
-    public final static String VERSION = "0.8.6";
+    public final static String VERSION = "0.8.7";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);
diff --git a/history.txt b/history.txt
index 7e50e3720a..eaac47e730 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,5 @@
+* 2011-06-27 0.8.7 released
+
 2011-06-26 zzz
   * Fixes after review:
     - Fix Polish po file
diff --git a/installer/install.xml b/installer/install.xml
index 519108260d..9f0876aadc 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.8.6</appversion>
+        <appversion>0.8.7</appversion>
         <authors>
             <author name="I2P" email="http://forum.i2p2.de/"/>
         </authors>
diff --git a/installer/resources/news.xml b/installer/resources/news.xml
index e978528c5f..61563aae34 100644
--- a/installer/resources/news.xml
+++ b/installer/resources/news.xml
@@ -1,13 +1,34 @@
 <!--
 <i2p.news date="$Date: 2011-05-16 00:00:00 $">
-<i2p.release version="0.8.6" date="2011/05/16" minVersion="0.6" />
+<i2p.release version="0.8.7" date="2011/06/27" minVersion="0.6" />
 -->
 <div lang="en">
-<h3>2011-05-16: <b>0.8.6 <a href="http://www.i2p2.i2p/release-0.8.6.html">Released</a></b></h3>
-<p>
-The 0.8.6 release contains more peer selection defenses to resist powerful attackers, and
-tweaks to adjust to the recent rapid growth in the network.
-Upgrading is recommended.
+<h3>2011-06-27: <b>0.8.7 <a href="http://www.i2p2.i2p/release-0.8.7.html">Released</a></b></h3>
+
+<p>I2P release 0.8.7 contains several upgrades to long-neglected components,
+ including the Naming Services, graphing, the native CPU ID and BigInteger
+ libraries, crypto implementations, and the wrapper.</p>
+
+<p>Thanks to new contributor KillYourTV who was instrumental in implementing
+ and testing these upgrades, with additional support from sponge and hottuna.</p>
+
+<p>CPU ID enhancements are by hottuna, generously funded by
+ <a href="http://relakks.com/">http://relakks.com/</a> and <a href="http://ipredator.se/">http://ipredator.se/</a> -
+ thanks to Peter Sunde and Jan-Erik Fiske for their support.</p>
+
+<p>Also, for the first time, we now have an official
+<a href="https://launchpad.net/~i2p-maintainers/+archive/i2p">I2P Personal Package Archive (PPA) on launchpad.net</a>.
+For those of you using Ubuntu, this offers an easy way to install I2P and keep the
+ various components up-to-date. The I2P package offers the option of installing as
+ a service, or it may be started on-demand as usual. This PPA is currently maintained
+ by KillYourTV with support by other members of the development team.
+The <a href="http://www.i2p2.i2p/debian">Ubuntu/Debian installation instructions</a> are on our website.
+</p>
+
+<p>For those updating over the network, this update is about 4 times the usual size,
+ due to the inclusion of the jbigi updates. Please be patient while downloading the update over the network.
+
+
 </p><p>
 Please help grow the network.
 Say hello to the volunteers on the <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help IRC channel</a>.
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a06babd519..a411b00998 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 31;
+    public final static long BUILD = 0;
 
     /** for example "-test" */
-    public final static String EXTRA = "-rc";
+    public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);