[Xfce4-commits] [xfce/xfconf] 01/01: Fix make distcheck and prepare for 4.13.6 release

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   l   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfconf.

commit 86bcfcf972e2b350fd0c5a1339de664f544b6a84
Author: Ali Abdallah <ali at xfce.org>
Date:   Sun Oct 21 12:20:09 2018 +0200

    Fix make distcheck and prepare for 4.13.6 release
---
 NEWS            |  5 +++++
 configure.ac.in | 10 ++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 53cca40..88a40f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+4.13.6
+======
+- Added .NOTPARALLEL to property change test (bug #13840)
+- Implement an optional GSettings backend
+
 4.13.5
 ======
 - Fix make distcheck, (bug #14082)
diff --git a/configure.ac.in b/configure.ac.in
index cc73403..8e20494 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -10,10 +10,10 @@ m4_define([libxfconf_verinfo], [3:0:0])
 m4_define([libxfconf_version_api], [0])
 m4_define([xfconf_version_major], [4])
 m4_define([xfconf_version_minor], [13])
-m4_define([xfconf_version_micro], [5])
+m4_define([xfconf_version_micro], [6])
 m4_define([xfconf_version_nano], [])
-m4_define([xfconf_version_build], [@REVISION@])
-m4_define([xfconf_version_tag], [git])
+m4_define([xfconf_version_build], [])
+m4_define([xfconf_version_tag], [])
 m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfconf_version_micro()ifelse(xfconf_version_nano(), [], [], [.xfconf_version_nano()])ifelse(xfconf_version_tag(), [git], [xfconf_version_tag()-xfconf_version_build()], [xfconf_version_tag()])])
 
 m4_define([xfconf_default_debug], [ifelse(xfconf_version_tag(), [git], [yes], [minimum])])
@@ -191,9 +191,7 @@ AC_MSG_RESULT([$ac_gsettings_backend])
 dnl GModule is required in order to build the GSettings backend module
 if test "x$ac_gsettings_backend"; then
 	XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.30.0])
-	GIO_MODULE_DIR="`$PKG_CONFIG --variable=giomoduledir gio-2.0`"
-	AC_DEFINE_UNQUOTED(GIO_MODULE_DIR, "$GIO_MODULE_DIR",
-     [The GIO modules directory.])
+	GIO_MODULE_DIR=$libdir/gio/modules
     AC_SUBST(GIO_MODULE_DIR)
 fi
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.