summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS5
-rw-r--r--configure.in2
-rw-r--r--gconf/Makefile.am2
4 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 99e8f635..b43a43ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-03 Kjartan Maraas <kmaraas@gnome.org>
+
+ * configure.in: Bump again.
+ * gconf/Makefile.am: Dist the right file.
+
2008-06-02 Kjartan Maraas <kmaraas@gnome.org>
* NEWS: Update this.
diff --git a/NEWS b/NEWS
index 8b07e25e..a19bf5f2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+2.23.1
+======
+ Fixes
+ - Fix the build. (Kjartan)
+
2.23.0
======
Fixes
diff --git a/configure.in b/configure.in
index af6c1ed1..03c43d4b 100644
--- a/configure.in
+++ b/configure.in
@@ -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])
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index ac023c86..51357f30 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -121,7 +121,7 @@ libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF
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' \