From 047022b627cc46cca6ee725de6d8f342f898740b Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Fri, 27 Mar 2015 13:33:05 -0400
Subject: [PATCH] 2.0.1 release preparation

Refs #68585

Change-Id: If4ebe9e07838c69bafcd5a57eefb770b11620b58
---
 ChangeLog                   |  6 ++----
 NEWS                        | 10 +++++++++-
 configure.ac                |  2 +-
 doc/doxygen/core-doc.cfg.in |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 642e3492c5..157ded7cb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,2 @@
-2.0.0 (2015-03-31)
-------------------
-
-First DRing release (formely SFLPhone - released as 1.4.1)
+This file is not used for logging changes but to satisfies autotool requirements.
+Please, read NEWS file for changes.
diff --git a/NEWS b/NEWS
index f761319d22..091ae3d335 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
-DRing (2.0.0) / 2015-03-31
+DRing (2.0.1) / 2015-03-27
+	* Add FPS calculation for streamed files
+	* Set defaults video bitrate to 800 Kb/s
+	* Use RGBA for direct rendering (MacOSX)
+	* MacOSX: force video device format on supported values
+	* SecureSIP: fix race condition and incoming packet handling
+	* minor documentation fixes
+
+DRing (2.0.0) / 2015-03-25
 	* Project renaming
 	* First release under this name
 	* Ring account (DHT) introduced
diff --git a/configure.ac b/configure.ac
index fb75c5fab0..885a4e4ad1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Ring - configure.ac for automake 1.9 and autoconf 2.59
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.65])
-AC_INIT([Ring],[2.0.0],[ring@lists.savoirfairelinux.net],[ring])
+AC_INIT([Ring],[2.0.1],[ring@lists.savoirfairelinux.net],[ring])
 
 AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2015]])
 AC_REVISION([$Revision$])
diff --git a/doc/doxygen/core-doc.cfg.in b/doc/doxygen/core-doc.cfg.in
index d25075a3ab..764a06e924 100644
--- a/doc/doxygen/core-doc.cfg.in
+++ b/doc/doxygen/core-doc.cfg.in
@@ -31,7 +31,7 @@ PROJECT_NAME           = "Ring Daemon"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.0.0
+PROJECT_NUMBER         = 2.0.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
-- 
GitLab