[goocanvasmm/goocanvasmm-1.0] 0.15.4

[Murray Cumming <murrayc src gnome org>]

commit e4d37cd4a960a06132f22ee2e57465ca619a57b5
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 18 15:08:19 2010 +0200

    0.15.4

 ChangeLog    |    5 +++--
 NEWS         |   26 +++++++++++++++-----------
 configure.ac |    4 ++--
 3 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b8b8a12..039b068 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+0.15.4:
+
 2010-10-18  Murray Cumming  <murrayc murrayc com>
 
 	Use non-deprecated Gtk::ALIGN_* for default parameters.
@@ -11,8 +13,7 @@
 
 	* goocanvas/src/bounds.hg:
 	* goocanvas/src/canvas.hg:
-	* goocanvas/src/item.ccg:
-	* goocanvas/src/item.hg:
+	* goocanvas/src/item.[hg|ccg]:
 	* goocanvas/src/itemmodel.[hg|ccg]:
 	* goocanvas/src/itemsimple.hg:
 	* goocanvas/src/style.hg: Rearranged the includes to fix the build with
diff --git a/NEWS b/NEWS
index 051d0cd..8117c28 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.15.4 (unstable):
+
+Fix the build with gtkmm 2.22, with deprecations disabled.
+
 0.15.3 (unstable):
 
 Documentation:
@@ -13,7 +17,7 @@ Build improvements for documentation.
 
 0.15.1 (unstable):
 
-Use the latest mm-common build system, to produce API documentation that is 
+Use the latest mm-common build system, to produce API documentation that is
 ready for library.gnome.org.
 
 0.15.0 (unstable):
@@ -26,12 +30,12 @@ Build:
 
 0.14.0 (unstable):
 
-* Item and ItemModel: Added x, y, height, width properties. Removed them from 
+* Item and ItemModel: Added x, y, height, width properties. Removed them from
   derived classes, which now get them from their base Item/ItemModel instead.
 * Item: Added signal_scroll_event.
   (Murray Cumming)
 * Build: Fixed warnings. (Hubert Figuiere) Bug #562903
-  
+
 0.13.0 (unstable):
 
 * Canvas: Added get_static_root_item() and get_static_root_item_model().
@@ -47,7 +51,7 @@ Build:
     Bug #558489 (Louis-Francis Ratté-Boulianne)
 * ItemModel: Added animation_finished signal.
   (Murray Cumming)
-* Remove the CANVAS_ prefix from enum values because they are already 
+* Remove the CANVAS_ prefix from enum values because they are already
   namespaced.
   (José Alburquerque)
   Bug #557990 (Louis-Francis Ratté-Boulianne)
@@ -82,13 +86,13 @@ Build:
 * Item, ItemModel: Added get_simple_transform(). (Murray Cumming)
 * Table:
   - Added attach() convenience method.
-  - Added x-border-spacing, y-border-spacing, vert-grid-line-width, 
+  - Added x-border-spacing, y-border-spacing, vert-grid-line-width,
     horz-grid-line-width properties.
 * Added TableModel.
 * Added properties and vfuncs (there should be almost none left now).
   (Armin Burgmeier, Openismus)
 * Documentation:
-  - Added tablemodel example, showing two canvases that display the same 
+  - Added tablemodel example, showing two canvases that display the same
   underlying model.
   (Armin Burgmeier, Openismus)
 
@@ -115,7 +119,7 @@ Build:
   (Gennaro Bellizio. Bug #517817)
 
 * Build:
-  Correct installation of .m4 gmmproc files, 
+  Correct installation of .m4 gmmproc files,
   and correct the .pc file.
   (Murray Cumming) (Bug #489865. Yaakov Selkovitz)
 
@@ -139,14 +143,14 @@ Build:
 * The pkg-config file is now called goocanvas-1.0 instead of libgoocanvas.
 * The files should now be included as, for instance,
   <libgoocanvas/canvas.h>
-  instead of 
+  instead of
   <libgoocanvasmm/canvas.h>
-* Several constructors were corrected to properly initialize the underlying 
+* Several constructors were corrected to properly initialize the underlying
   C objects.
-* The parent parameter was removed from all item constructors, 
+* The parent parameter was removed from all item constructors,
   to avoid confusion with the unusual memory management used in the C API.
   Use add_child() instead.
-* Various methods were added or improved. 
+* Various methods were added or improved.
 
 0.1.0 (unstable):
 
diff --git a/configure.ac b/configure.ac
index 8140b1f..817553f 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 program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([goocanvasmm], [0.15.3], [http://bugzilla.gnome.org/], [goocanvasmm], [http://www.gtkmm.org/])
+AC_INIT([goocanvasmm], [0.15.4], [http://bugzilla.gnome.org/], [goocanvasmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
 
 AC_CONFIG_SRCDIR([goocanvas/src/canvas.hg])
@@ -38,7 +38,7 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_SUBST([GOOCANVASMM_MODULES], ['glibmm-2.4 >= 2.14.2 gtkmm-2.4 >= 2.10.9 goocanvas >= 0.15'])
+AC_SUBST([GOOCANVASMM_MODULES], ['glibmm-2.4 >= 2.14.2 gtkmm-2.4 >= 2.22.0 goocanvas >= 0.15'])
 PKG_CHECK_MODULES([GOOCANVASMM], [$GOOCANVASMM_MODULES])
 
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])