gconf r2612 - in trunk: . gconf

[kmaraas svn gnome org]

Author: kmaraas
Date: Wed Jun  4 10:42:47 2008
New Revision: 2612
URL: http://svn.gnome.org/viewvc/gconf?rev=2612&view=rev

Log:
2008-06-03  Kjartan Maraas  <kmaraas gnome org>

	* configure.in: Bump again.
	* gconf/Makefile.am: Dist the right file.

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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Jun  4 10:42:47 2008
@@ -1,3 +1,8 @@
+2.23.1
+======
+  Fixes
+  - Fix the build. (Kjartan)
+
 2.23.0
 ======
   Fixes

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jun  4 10:42:47 2008
@@ -1,4 +1,4 @@
-AC_INIT([GConf],[2.23.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],[GConf])
+AC_INIT([GConf],[2.23.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],[GConf])
 
 AC_DEFUN([AC_FYI], [echo "FYI: " $1])
 

Modified: trunk/gconf/Makefile.am
==============================================================================
--- trunk/gconf/Makefile.am	(original)
+++ trunk/gconf/Makefile.am	Wed Jun  4 10:42:47 2008
@@ -121,7 +121,7 @@
 
 libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS)
 
-EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
+EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
 
 default.path: $(srcdir)/default.path.in
 	sed -e 's,[ ]sysgconfdir[@],$(sysgconfdir),g' \