2.31.22.31.2

3 files changed, 35 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b5a31d1b..82844d1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2.31.2:
+
 2011-11-24  Kjell Ahlstedt  <kjell.ahlstedt@bredband.net>
 
 	Make class Glib::Threads::Private buildable with --enable-warnings=fatal.
@@ -109,10 +111,10 @@
 
 2011-10-26  Murray Cumming  <murrayc@murrayc.com>
 
-  Fix the deprecation ifdefs.
+	Fix the deprecation ifdefs.
   
 	* glib/src/thread.hg: Move the deprecation ifdefs to avoid affecting 
-  non-deprecated API.
+	non-deprecated API.
 
 2.31.0.1:
 
diff --git a/NEWS b/NEWS
index 762ffecf..887c10d9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,32 @@
+2.31.2: (unstable):
+
+glibmm:
+* Add Glib::Threads::* in threads.h, deprecating everything in thread.h.
+  This was necessary because we had to break the ABI to avoid using 
+  API that is now deprecated in glib.
+* Avoid compiler warnings when using -std=c++0x with g++.
+  (Murray Cumming, Kjell Ahlsted)
+
+giomm:
+* drive: Add get_sort_key().
+* EmblemedIcon: Add clear_emblems().
+* FileIconL Add the "file" property.
+* InetAddress: Add address_equal().
+* Mount: Add get_sort_key().
+* Socket: Add the "timeout" property.
+* SocketAddress: Add the "family" property.
+  (José Alburquerque)
+
+gmmproc:
+* C example code removal: Also remove code in </programlisting> tags.
+ (José Alburquerque)
+* Ensure template parameter has a space before to avoid trigraphs.
+  (Hub Figuière) Bug #663303
+
+Examples:
+* Avoid use of the now-deprecated API.
+ (Murray Cummign)
+
 2.31.0.2: (unstable)
 
 * gthread.h: Move the deprecation ifdefs to avoid affecting non-deprecated API.
@@ -543,7 +572,7 @@ Gio:
 	* Added connect_to_uri(), connect_to_uri_async()
 	and connect_to_uri_finish().
 	(Murray Cumming)
-* SocketConnectable: socketconnectable.hg: Added proxy_enumerate() and a
+* SocketConnectable: socketconnectable Added proxy_enumerate() and a
 	const enumerate().
 * Added UnixSocketAddress
 * UnixCredentialMessage, UnixFDMessage: Wrap properties properly.
diff --git a/configure.ac b/configure.ac
index 1f640987..b65c0f3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([glibmm], [2.31.0.2],
+AC_INIT([glibmm], [2.31.2],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
         [glibmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])