Update for 2015.05

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/CHANGES b/CHANGES
index e554d5795c5eebcd24cb3bd040fd35a243e080ae..3f5162ecec89a4181bd9dd090bf580d23fbf3863 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+2015.05, Released May 31st, 2015
+
+       Minor fixes.
+
+       Updated/fixed packages: conntrack-tools, directfb, fio, flite,
+       gptfdisk, ipmiutil, iproute2, janus-gateway, keyutils, knock,
+       libelementary, libgcrypt, libgsasl, libjpeg, libstrophe,
+       lttng-libust, nbd, ncurses, nmap, php, postgresql, python,
+       python3, sconeserver, udpcast, upmpdcli
+
 2015.05-rc3, Released May 22nd, 2015
 
        Several fixes, mainly related to static linking.

diff --git a/Makefile b/Makefile
index cf244d734e4286f317c201d23a3450d9dc38ffab..e490871821b0b4343626d1f9591817eda05efbfe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@
 all:
 
 # Set and export the version string
-export BR2_VERSION := 2015.05-rc3
+export BR2_VERSION := 2015.05
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION = 3.81

diff --git a/docs/website/download.html b/docs/website/download.html
index 640800e61fe3048af2fab0027aa62a10b3816f1f..715bec93eb9e35f6b7e4cecbecd25e760d634702 100644 (file)
--- a/docs/website/download.html
+++ b/docs/website/download.html
@@ -7,17 +7,17 @@
 
 <p>
 
-The latest stable release is <b>2015.02</b>, which can be downloaded
+The latest stable release is <b>2015.05</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2015.02.tar.gz">buildroot-2015.02.tar.gz</a>
-(<a href="/downloads/buildroot-2015.02.tar.gz.sign">PGP signature</a>)
+<a href="/downloads/buildroot-2015.05.tar.gz">buildroot-2015.05.tar.gz</a>
+(<a href="/downloads/buildroot-2015.05.tar.gz.sign">PGP signature</a>)
 or
-<a href="/downloads/buildroot-2015.02.tar.bz2">buildroot-2015.02.tar.bz2</a>
-(<a href="/downloads/buildroot-2015.02.tar.bz2.sign">PGP signature</a>).
+<a href="/downloads/buildroot-2015.05.tar.bz2">buildroot-2015.05.tar.bz2</a>
+(<a href="/downloads/buildroot-2015.05.tar.bz2.sign">PGP signature</a>).
 
 <p>
-
+<!--
 The latest release candidate is <b>2015.05-rc3</b>, which can be
 downloaded here:<p>
 
@@ -27,7 +27,7 @@ or
 <a href="/downloads/buildroot-2015.05-rc3.tar.bz2">buildroot-2015.05-rc3.tar.bz2</a>
 (<a href="/downloads/buildroot-2015.05-rc3.tar.bz2.sign">PGP signature</a>).
 <p>
-
+-->
 This and earlier releases (and their PGP signatures) can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 

diff --git a/docs/website/news.html b/docs/website/news.html
index 39fe6933e2cc46ac1e857e618fe9f0c99d4249a6..8b3fd9af12b02a77901236e7768f7148c2b9ebe4 100644 (file)
--- a/docs/website/news.html
+++ b/docs/website/news.html
@@ -8,6 +8,16 @@
 <p>
 
 <ul>
+
+  <li><b>31 May 2015 -- 2015.05 released</b>
+
+    <p>The stable 2015.05 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2015.05">CHANGES</a>
+    file for more details,
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2015.05.tar.bz2">2015.05 release</a>.</p>
+
  <li><b>22 May 2015 -- 2015.05-rc3 released</b>
 
     <p>Release candidate 3 is out with more cleanups and security / build fixes. See the <a