From c8620874e4e3a487d0fd27f204b774dbed34d80f Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 24 May 2013 10:55:41 +0200
Subject: [PATCH] ready for release

---
 NEWS           | 22 ++++++++++++++++++++--
 README         | 31 +++++++++++++++----------------
 mediastreamer2 |  2 +-
 oRTP           |  2 +-
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/NEWS b/NEWS
index 413970e6..0eede9fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,24 @@
-linphone-3.xxx --
+linphone-3.6.0 -- May 27, 2013
+	UI:
+	* new friend list and chat messaging UI
+	* enhanced call history
+	* call and conference audio recording
+	* persistent chat history
+	* DSCP settings for SIP and RTP
+	* display of call statistics (when clicking on the quality indicator bar)
+	core:
+	* ICE for efficient RTP exchange
 	* fix bug in zRTP support (upgrade required)
-	*
+	* call recording
+	* uPnP
+	* call statistics
+	* adaptive bitrate control improvements
+	* faster call quality indicator feedback
+	* DSCP settings for SIP and RTP
+	* detailed call statistics feedback API
+
+	Requires: mediastreamer2 = 2.9.0 and ortp = 0.22.0
+
 
 linphone-3.5.2 -- February 22, 2012
 	* updated oRTP to 0.20.0
diff --git a/README b/README
index 1a66f4a2..a1fb5bd3 100644
--- a/README
+++ b/README
@@ -8,29 +8,35 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
 	- intltool
 
 - you need at least:
- 	- libosip2>=3.0.3
-	- libeXosip2>=3.0.3
+ 	- libosip2>=3.5.0
+	- libeXosip2>=3.5.0
 	- speex>=1.2.0 (including libspeexdsp part)
 	
 	+ if you want the gtk/glade interface:
 		- libgtk >=2.16.0
 	+ if you want video support:
-		- SDL>=1.2.10
+		- libvpx (VP8 codec)
 		- libavcodec (ffmpeg) 
 		- libswscale (part of ffmpeg too) for better scaling performance
 		- libxv (x11 video extension)
-	       - ligl1-mesa (OpenGL API -- GLX development files)
-	       - libglew (OpenGL Extension Wrangler library)
-	       - libv4l (Video for linux)
-	       - libx11 (x11)
+		- ligl1-mesa (OpenGL API -- GLX development files)
+		- libglew (OpenGL Extension Wrangler library)
+		- libv4l (Video for linux)
+		- libx11 (x11)
 		- theora (optional)
-
 	+ gsm codec (gsm source package or libgsm-dev or gsm-devel) (optional)
 	+ libreadline (optional: for convenient command line in linphonec)
 	+ libsoup (optional: for wizard - account creation assistant)
-	+ libsqlite3 (optional : for a local history of messages)
+	+ libsqlite3 (optional : for a local history of chat messages)
 	+ if you want uPnP support (optional):
 		- libupnp (version 1.6 branch (not patched with 18-url-upnpstrings.patch))
+
+	Here is the command line to get these dependencies installed for Ubuntu && Debian 
+
+	$ sudo apt-get install libtool intltool libgtk2.0-dev libosip2-dev libexosip2-dev libspeexdsp-dev libavcodec-dev libswscale-dev libx11-dev libvx-dev ligl1-mesa-dev libglew-dev libv4l-dev
+
+	+ for optional library
+	$ sudo apt-get install libreadline-dev liggsm1-dev libtheora-dev libsoup2.4-dev libsqlit3-dev libupnp6-dev 
 	
 	+ Install srtp (optional) for call encryption :
 		$ git clone git://git.linphone.org/srtp.git
@@ -43,7 +49,6 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
 		$ cd zrtpcpp && cmake -Denable-ccrtp=false . && make
  		$ sudo make install
 
-with their corresponding -dev or -devel package if you don't use source packages.
 
 - Compile linphone
 
@@ -52,13 +57,7 @@ with their corresponding -dev or -devel package if you don't use source packages
  $ make && sudo make install 
  $ sudo ldconfig
 
-- Command line for Ubuntu && Debian 
-
-	$ sudo apt-get install libtool intltool libgtk2.0-dev libosip2-dev libexosip2-dev libspeexdsp-dev libavcodec-dev libswscale-dev libx11-dev libvx-dev ligl1-mesa-dev libglew-dev libv4l-dev
 
-	+ for optional library
-	$ sudo apt-get install libreadline-dev liggsm1-dev libtheora-dev libsoup2.4-dev libsqlit3-dev libupnp6-dev 
- 
 
 For windows compilation see README.mingw.
 For macOS X, see README.macos
diff --git a/mediastreamer2 b/mediastreamer2
index f0c61398..2b43ce53 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f0c61398705609e28cbcb82f4c650ebd16ec0917
+Subproject commit 2b43ce538299df8d9bc9d8f37de5f74a05342792
diff --git a/oRTP b/oRTP
index 68bdfc20..2c37d120 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 68bdfc20122f0231c6853e3b4b9a07e57955ad76
+Subproject commit 2c37d1205e9dd0e30a918ccf666ab217b66c2899
-- 
2.39.2