summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@src.gnome.org>2008-09-21 17:30:24 +0000
committerJonathon Jongsma <jjongsma@src.gnome.org>2008-09-21 17:30:24 +0000
commit6bcfe74e233b44556eaffa53656921830c892f0f (patch)
tree6e9ab07eb1da9493eee02b3a342e33a14de35df5
parent8ea67f3f611d2b04b70b0f12416bad01627ecafe (diff)
downloadglibmm-6bcfe74e233b44556eaffa53656921830c892f0f.tar.gz
update to get ready for 2.18.0 release
svn path=/trunk/; revision=729
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am6
-rw-r--r--NEWS5
-rw-r--r--configure.in6
4 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bd0d1722..cdf63238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+=== 2.18.0 ===
+
+2008-09-21 Jonathon Jongsma <jonathon@quotidian.org>
+
+ * NEWS: Add news for 2.18 release
+ * configure.in: bump version number for release
+ * Makefile.am: update release mail template slightly
+
2008-09-08 Murray Cumming <murrayc@murrayc.com>
* COPYING.tools:
diff --git a/Makefile.am b/Makefile.am
index 02750946..20a52f8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,9 +89,9 @@ release-announce: upload-release
@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/"
diff --git a/NEWS b/NEWS
index 7672dc90..67018583 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
diff --git a/configure.in b/configure.in
index 873c78c5..d398736f 100644
--- a/configure.in
+++ b/configure.in
@@ -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 @@ AC_SUBST(GLIBMM_RELEASE)
# ? :+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)