libbonoboui r2629 - trunk

[chpe svn gnome org]

Author: chpe
Date: Mon Jun 16 14:11:59 2008
New Revision: 2629
URL: http://svn.gnome.org/viewvc/libbonoboui?rev=2629&view=rev

Log:
Prepare 2.23.4.


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

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Jun 16 14:11:59 2008
@@ -9,15 +9,9 @@
 	MAINTAINERS	     \
 	libbonoboui-zip.in   \
 	changes.txt          \
-	intltool-extract.in  \
-	intltool-merge.in    \
-	intltool-update.in   \
 	gtk-doc.make
 
-DISTCLEANFILES = \
-	intltool-extract \
-	intltool-merge   \
-	intltool-update
+DISTCLEANFILES =
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jun 16 14:11:59 2008
@@ -1,3 +1,9 @@
+libbonoboui 2.23.4	
+
+        * Only include <glib.h>/<gtk/gtk.h> in public libbonoboui headers (#535475)
+        * Add support for Super/Hyper/Meta in keybindings (#525626)
+	* Translation updates.
+
 libbonoboui 2.22.0
 	* Translation updates.
 

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Mon Jun 16 14:11:59 2008
@@ -14,4 +14,6 @@
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9
+REQUIRED_INTLTOOL_VERSION=0.40.0
+. gnome-autogen.sh

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jun 16 14:11:59 2008
@@ -1,12 +1,15 @@
-AC_INIT([libbonoboui],[2.22.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonoboui])
+m4_define([bonobo_major_version],[2])
+m4_define([bonobo_minor_version],[23])
+m4_define([bonobo_micro_version],[4])
+m4_define([bonobo_version],[bonobo_major_version.bonobo_minor_version.bonobo_micro_version])
+
+AC_INIT([libbonoboui],[bonobo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonoboui])
 
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
 
 AM_MAINTAINER_MODE
 
-IT_PROG_INTLTOOL([0.35.0])
-
 AC_CANONICAL_HOST
 
 case "$host" in
@@ -44,6 +47,8 @@
 # see bug #455597
 # GNOME_MAINTAINER_MODE_DEFINES
 
+IT_PROG_INTLTOOL([0.40.0])
+
 GETTEXT_PACKAGE=libbonoboui-2.0
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain])