From 548d00bc4e311bfe8bdfbb648e231a2324add3d4 Mon Sep 17 00:00:00 2001 Message-Id: <548d00bc4e311bfe8bdfbb648e231a2324add3d4.1714902617.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 17 Feb 2013 16:25:28 +0000 Subject: [PATCH] Merge tag 'branchpoint-5.1' into release Organization: Straylight/Edgeware From: Richard Kettlewell Branch point for 5.1 release. Conflicts: configure.ac debian/changelog --- configure.ac | 4 ++-- debian/changelog | 26 +++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index e47aca2..a07f74d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,9 +18,9 @@ # along with this program. If not, see . # -AC_INIT([disorder], [5.0.DEV], [richard+disorder@sfere.greenend.org.uk]) +AC_INIT([disorder], [5.1], [richard+disorder@sfere.greenend.org.uk]) AC_CONFIG_AUX_DIR([config.aux]) -AM_INIT_AUTOMAKE(disorder, [5.0.DEV]) +AM_INIT_AUTOMAKE(disorder, [5.1]) AC_CONFIG_SRCDIR([server/disorderd.c]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index 52be205..7934542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,28 @@ -disorder (5.0.DEV) unstable; urgency=low +disorder (5.1) stable; urgency=low - * Development version. + * DisOrder 5.1 - -- Richard Kettlewell Sat, 12 Feb 2011 15:44:33 +0000 + -- Richard Kettlewell Sun, 17 Feb 2013 16:22:14 +0000 + +disorder (5.0.3) stable; urgency=emergency + + * Security: Local connections can no longer create and delete users + unless they are properly authorized. + + -- Richard Kettlewell Sun, 31 Jul 2011 17:07:59 +0100 + +disorder (5.0.2) unstable; urgency=low + + * Mention login cookie. + + -- Richard Kettlewell 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 Thu, 10 Jun 2010 09:18:58 +0100 disorder (5.0) unstable; urgency=low -- [mdw]