summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS6
-rw-r--r--configure.ac2
-rw-r--r--sigc++/macros/slot.h.m41
4 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fe5ab9e..1e7ffd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2.2.2:
+
+2008-03-10 Deng Xiyue <manphiz@gmail.com
+
+ * sigc++/macros/slot.h.m4:
+ Added an include of functors/slot.h that was mistakenly removed
+ during the 2.1 series, apparently breaking API slightly.
+ Bug #521418.
+
2.2.1:
2008-02-28 Elaine Xiong <elaine.xiong@sun.com>
diff --git a/NEWS b/NEWS
index b477624..dbe2201 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.2.2 (stable)
+
+* Added an include of functors/slot.h that was mistakenly removed
+ during the 2.1 series.
+ (Deng Xiyue) Bug #521418.
+
2.2.1 (stable):
* Really fix the build with Sun CC.
diff --git a/configure.ac b/configure.ac
index 85d7d34..9c95151 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ dnl
dnl thus make format_package-0.0.1.tar.gz
pushdef([FP_MAJOR_VERSION], [2])
pushdef([FP_MINOR_VERSION], [2])
-pushdef([FP_MICRO_VERSION], [1])
+pushdef([FP_MICRO_VERSION], [2])
pushdef([FP_EXTRA_VERSION], [])
pushdef([FP_VERSION], FP_MAJOR_VERSION.FP_MINOR_VERSION.FP_MICRO_VERSION[]FP_EXTRA_VERSION)
# package name, version, support contact, tarball name.
diff --git a/sigc++/macros/slot.h.m4 b/sigc++/macros/slot.h.m4
index 31ca81c..04c7ad7 100644
--- a/sigc++/macros/slot.h.m4
+++ b/sigc++/macros/slot.h.m4
@@ -22,3 +22,4 @@ divert(0)
__FIREWALL__
+#include <sigc++/functors/slot.h>