glibmm r729 - trunk

[jjongsma svn gnome org]

Author: jjongsma
Date: Sun Sep 21 17:30:24 2008
New Revision: 729
URL: http://svn.gnome.org/viewvc/glibmm?rev=729&view=rev

Log:
update to get ready for 2.18.0 release


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Sep 21 17:30:24 2008
@@ -89,9 +89,9 @@
 	@echo ""
 	@echo "    $(PACKAGE) is a C++ API for glib, used by gtkmm."
 	@echo ""
-	@echo "    $(PACKAGE) 2.16 wraps new API in glib 2.16, including the new gio library, "
-	@echo "    and is API/ABI-compatibile with glibmm 2.14, 2.12, 2.10, 2.8, 2.6 and "
-	@echo "    2.4. It is a version of the glibmm-2.4 API."
+	@echo "    $(PACKAGE) wraps new API in glib, including the gio library, "
+	@echo "    and is API/ABI-compatibile with older versions of glibmm back to "
+	@echo "    version 2.4. It is a version of the glibmm-2.4 API."
 	@echo ""
 	@echo "    gtkmm and $(PACKAGE) stay in-sync with GTK+ by following the official GNOME release schedule:"
 	@echo "    http://www.gnome.org/start/unstable/";

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Sep 21 17:30:24 2008
@@ -1,3 +1,8 @@
+2.18.0 (stable):
+
+ * Bug #550789: Fixed a licensing issue with some of the tools distributed with
+   the source tarball (Murray Cumming)
+
 2.17.3 (unstable):
 
  * More Glib::NodeTree improvements (SzilÃrd Pfeiffer, Murray Cumming)

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Sep 21 17:30:24 2008
@@ -13,8 +13,8 @@
 #
 
 pushdef([GLIBMM_MAJOR_VERSION],     [2])
-pushdef([GLIBMM_MINOR_VERSION],     [17])
-pushdef([GLIBMM_MICRO_VERSION],     [3])
+pushdef([GLIBMM_MINOR_VERSION],     [18])
+pushdef([GLIBMM_MICRO_VERSION],     [0])
 pushdef([GLIBMM_EXTRA_VERSION],     [])
 pushdef([GLIBMM_VERSION], GLIBMM_MAJOR_VERSION.GLIBMM_MINOR_VERSION.GLIBMM_MICRO_VERSION[]GLIBMM_EXTRA_VERSION)
 
@@ -53,7 +53,7 @@
 #  ? :+1 : ?   == just some internal changes, nothing breaks but might work 
 #                 better
 # CURRENT : REVISION : AGE
-LIBGLIBMM_SO_VERSION=2:0:1
+LIBGLIBMM_SO_VERSION=3:0:2
 AC_SUBST(LIBGLIBMM_SO_VERSION)
 
 AC_CONFIG_AUX_DIR(scripts)