Merge branch 'branch-5.0' into release

diff --git a/configure.ac b/configure.ac
index b0290c9..cef3de8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-AC_INIT([disorder], [5.0], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [5.0.2], [richard+disorder@sfere.greenend.org.uk])
 AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [5.0])
+AM_INIT_AUTOMAKE(disorder, [5.0.2])
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 

diff --git a/debian/changelog b/debian/changelog
index e76e763..9e7f42e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+disorder (5.0.2) unstable; urgency=low
+
+  * Mention login cookie.
+
+ -- Richard Kettlewell <rjk@greenend.org.uk>  Sat, 28 May 2011 11:54:52 +0100
+
+disorder (5.0.1) unstable; urgency=low
+
+  * Disorder 5.0.1
+  * The sense of the Control -> Playing menu item was fixed.
+
+ -- Richard Kettlewell <rjk@greenend.org.uk>  Thu, 10 Jun 2010 09:18:58 +0100
+
 disorder (5.0) unstable; urgency=low
 
   * DisOrder 5.0