diff -Nru d-conf-0.16.1/Makefile.in d-conf-0.18.0/Makefile.in
--- d-conf-0.16.1/Makefile.in 2013-07-16 16:43:48.000000000 +0000
+++ d-conf-0.18.0/Makefile.in 2013-09-23 21:29:28.000000000 +0000
@@ -78,8 +78,8 @@
DIST_COMMON = $(srcdir)/Makefile.gtester $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in COPYING NEWS \
- README aux/depcomp aux/install-sh aux/missing \
- $(top_srcdir)/aux/install-sh $(top_srcdir)/aux/missing
+ README aux/install-sh aux/missing $(top_srcdir)/aux/install-sh \
+ $(top_srcdir)/aux/missing
@ENABLE_EDITOR_TRUE@am__append_1 = editor
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -218,6 +218,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
diff -Nru d-conf-0.16.1/NEWS d-conf-0.18.0/NEWS
--- d-conf-0.16.1/NEWS 2013-07-16 16:25:29.000000000 +0000
+++ d-conf-0.18.0/NEWS 2013-09-23 21:28:40.000000000 +0000
@@ -1,10 +1,69 @@
-Changes in dconf 0.16.1
+Changes in dconf 0.18.0
========================
-Fix a crash when using DConfChangeset in two threads (as can happen
-during normal writes to dconf).
+Translations updates:
+ Basque
+ Danish
+ Japanese
+ Korean
+ Portuguese
+ Punjabi
+
+Changes in dconf 0.17.1
+========================
+
+Documentation updates, including better coverage of profiles.
+
+Translations updates:
+ Assamese
+ Belarusian
+ Catalan
+ Dutch
+ Estonian
+ Finnish
+ French
+ German
+ Hungarian
+ Indonesian
+ Italian
+ Korean
+ Latvian
+ Polish
+ Russian
+ Serbian
+ Tajik
+ Thai
+ Traditional Chinese
+
+Changes in dconf 0.17.0
+========================
+
+Fix a semi-serious thread safety issue:
-Updated Indonesian translation
+ https://bugzilla.gnome.org/show_bug.cgi?id=703073
+
+Some improvements to the editor:
+
+ - fix some compile warnings
+ - use gresource
+ - cancel searches on escape
+
+Translation updates:
+ Brazilian Portuguese
+ Czech
+ Esperanto
+ Friulian
+ Galician
+ German
+ Hebrew
+ Indonesian
+ Lithuanian
+ Malayalam
+ Norwegian bokmål
+ Slovak
+ Slovenian
+ Spanish
+ Tajik
Changes in dconf 0.16.0
========================
diff -Nru d-conf-0.16.1/aclocal.m4 d-conf-0.18.0/aclocal.m4
--- d-conf-0.16.1/aclocal.m4 2013-07-16 16:43:48.000000000 +0000
+++ d-conf-0.18.0/aclocal.m4 2013-09-23 21:29:27.000000000 +0000
@@ -20,239 +20,6 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper , 1995-2000.
-dnl Bruno Haible , 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
- AC_MSG_CHECKING([whether NLS is requested])
- dnl Default is enabled NLS
- AC_ARG_ENABLE([nls],
- [ --disable-nls do not use Native Language Support],
- USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT([$USE_NLS])
- AC_SUBST([USE_NLS])
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_default([$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ],
- [pkg_failed=yes])
- else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
- m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
- ])
-elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see .])[]dnl
- ])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- $3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
- [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
- [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
- [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
- [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
- [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
- [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
@@ -570,6 +337,7 @@
dnl
glib_DEFUN([GLIB_GNU_GETTEXT],
[AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
GLIB_LC_MESSAGES
GLIB_WITH_NLS
@@ -773,6 +541,239 @@
]
)
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper , 1995-2000.
+dnl Bruno Haible , 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT([$USE_NLS])
+ AC_SUBST([USE_NLS])
+])
+
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+#
+# Copyright © 2004 Scott James Remnant .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_default([$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+ ])
+elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see .])[]dnl
+ ])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ $3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
diff -Nru d-conf-0.16.1/bin/Makefile.am d-conf-0.18.0/bin/Makefile.am
--- d-conf-0.16.1/bin/Makefile.am 2013-07-16 16:20:20.000000000 +0000
+++ d-conf-0.18.0/bin/Makefile.am 2013-07-17 20:01:30.000000000 +0000
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.gtester
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client
bin_PROGRAMS = dconf
diff -Nru d-conf-0.16.1/bin/Makefile.in d-conf-0.18.0/bin/Makefile.in
--- d-conf-0.16.1/bin/Makefile.in 2013-07-16 16:43:48.000000000 +0000
+++ d-conf-0.18.0/bin/Makefile.in 2013-09-23 21:29:28.000000000 +0000
@@ -218,6 +218,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -344,7 +345,7 @@
# initialize variables for unconditional += appending
TEST_PROGS =
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client
dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
dconf_CFLAGS = \
$(gio_CFLAGS) \
diff -Nru d-conf-0.16.1/client/Makefile.in d-conf-0.18.0/client/Makefile.in
--- d-conf-0.16.1/client/Makefile.in 2013-07-16 16:43:48.000000000 +0000
+++ d-conf-0.18.0/client/Makefile.in 2013-09-23 21:29:28.000000000 +0000
@@ -235,6 +235,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
diff -Nru d-conf-0.16.1/common/Makefile.in d-conf-0.18.0/common/Makefile.in
--- d-conf-0.16.1/common/Makefile.in 2013-07-16 16:43:48.000000000 +0000
+++ d-conf-0.18.0/common/Makefile.in 2013-09-23 21:29:28.000000000 +0000
@@ -234,6 +234,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
diff -Nru d-conf-0.16.1/configure d-conf-0.18.0/configure
--- d-conf-0.16.1/configure 2013-07-16 16:43:49.000000000 +0000
+++ d-conf-0.18.0/configure 2013-09-23 21:29:29.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dconf 0.16.1.
+# Generated by GNU Autoconf 2.69 for dconf 0.18.0.
#
# Report bugs to .
#
@@ -641,8 +641,8 @@
# Identity of this package.
PACKAGE_NAME='dconf'
PACKAGE_TARNAME='dconf'
-PACKAGE_VERSION='0.16.1'
-PACKAGE_STRING='dconf 0.16.1'
+PACKAGE_VERSION='0.18.0'
+PACKAGE_STRING='dconf 0.18.0'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=dconf'
PACKAGE_URL=''
@@ -780,6 +780,7 @@
PKG_CONFIG_PATH
PKG_CONFIG
GSETTINGS_DISABLE_SCHEMAS_COMPILE
+GLIB_COMPILE_RESOURCES
ENABLE_MAN_FALSE
ENABLE_MAN_TRUE
XSLTPROC
@@ -1451,7 +1452,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dconf 0.16.1 to adapt to many kinds of systems.
+\`configure' configures dconf 0.18.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1517,7 +1518,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dconf 0.16.1:";;
+ short | recursive ) echo "Configuration of dconf 0.18.0:";;
esac
cat <<\_ACEOF
@@ -1649,7 +1650,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dconf configure 0.16.1
+dconf configure 0.18.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1738,6 +1739,48 @@
} # ac_fn_c_try_cpp
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -1829,48 +1872,6 @@
} # ac_fn_c_check_header_mongrel
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists and can be compiled using the include files in
@@ -2018,7 +2019,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dconf $as_me 0.16.1, which was
+It was created by dconf $as_me 0.18.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2887,7 +2888,7 @@
# Define the identity of the package.
PACKAGE='dconf'
- VERSION='0.16.1'
+ VERSION='0.18.0'
cat >>confdefs.h <<_ACEOF
@@ -4193,6 +4194,48 @@
fi
+# Use GLib resources
+# Extract the first word of "glib-compile-resources", so it can be a program name with args.
+set dummy glib-compile-resources; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GLIB_COMPILE_RESOURCES in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES
+if test -n "$GLIB_COMPILE_RESOURCES"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5
+$as_echo "$GLIB_COMPILE_RESOURCES" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
# Use GSettings
@@ -5033,12 +5076,12 @@
pkg_cv_gtk_CFLAGS="$gtk_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null`
+ pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.4" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -5050,12 +5093,12 @@
pkg_cv_gtk_LIBS="$gtk_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null`
+ pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.4" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -5076,14 +5119,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0" 2>&1`
+ gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1`
else
- gtk_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0" 2>&1`
+ gtk_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$gtk_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (gtk+-3.0) were not met:
+ as_fn_error $? "Package requirements (gtk+-3.0 >= 3.4) were not met:
$gtk_PKG_ERRORS
@@ -7643,7 +7686,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dconf $as_me 0.16.1, which was
+This file was extended by dconf $as_me 0.18.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7709,7 +7752,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dconf config.status 0.16.1
+dconf config.status 0.18.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru d-conf-0.16.1/configure.ac d-conf-0.18.0/configure.ac
--- d-conf-0.16.1/configure.ac 2013-07-16 16:24:09.000000000 +0000
+++ d-conf-0.18.0/configure.ac 2013-09-23 21:29:03.000000000 +0000
@@ -1,5 +1,5 @@
AC_INIT([dconf],
- [0.16.1],
+ [0.18.0],
[https://bugzilla.gnome.org/enter_bug.cgi?product=dconf],
[dconf])
@@ -33,6 +33,9 @@
])
AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+# Use GLib resources
+AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
+
# Use GSettings
GLIB_GSETTINGS
@@ -50,7 +53,7 @@
AM_CONDITIONAL(ENABLE_EDITOR, test "x$enable_editor" != "xno")
if test "x$enable_editor" != "xno"; then
- PKG_CHECK_MODULES(gtk, gtk+-3.0)
+ PKG_CHECK_MODULES(gtk, gtk+-3.0 >= 3.4)
PKG_CHECK_MODULES(gmodule, gmodule-2.0)
PKG_CHECK_MODULES(libxml, libxml-2.0)
fi
diff -Nru d-conf-0.16.1/dbus-1/Makefile.in d-conf-0.18.0/dbus-1/Makefile.in
--- d-conf-0.16.1/dbus-1/Makefile.in 2013-07-16 16:43:49.000000000 +0000
+++ d-conf-0.18.0/dbus-1/Makefile.in 2013-09-23 21:29:28.000000000 +0000
@@ -245,6 +245,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
diff -Nru d-conf-0.16.1/debian/changelog d-conf-0.18.0/debian/changelog
--- d-conf-0.16.1/debian/changelog 2013-07-17 09:52:08.000000000 +0000
+++ d-conf-0.18.0/debian/changelog 2013-10-21 14:13:38.000000000 +0000
@@ -1,3 +1,18 @@
+d-conf (0.18.0-1~saucy1) saucy; urgency=medium
+
+ * Copied from debian
+
+ -- Rico Tzschichholz Mon, 21 Oct 2013 16:13:38 +0200
+
+d-conf (0.18.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bump build-dependency on libgtk-3-dev to >= 3.4.0
+ * debian/dconf-editor.install: don't install usr/bin/dconf-editor
+ - GLib UI resources are now embedded using glib-compile-resources
+
+ -- Andreas Henriksson Thu, 17 Oct 2013 17:42:48 +0200
+
d-conf (0.16.1-1) unstable; urgency=low
[ Jeremy Bicha ]
diff -Nru d-conf-0.16.1/debian/control d-conf-0.18.0/debian/control
--- d-conf-0.16.1/debian/control 2013-07-17 09:57:11.000000000 +0000
+++ d-conf-0.18.0/debian/control 2013-10-21 14:13:44.000000000 +0000
@@ -2,12 +2,11 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: d-conf
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers
-Uploaders: Emilio Pozuelo Monfort , Josselin Mouette , Michael Biebl , Sebastien Bacher
+Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Josselin Mouette , Michael Biebl , Sebastien Bacher
Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.93),
autotools-dev,
@@ -18,11 +17,11 @@
valac (>= 0.17.0),
libglib2.0-dev (>= 2.35.2),
libdbus-1-dev,
- libgtk-3-dev (>= 3.0.0),
+ libgtk-3-dev (>= 3.4.0),
libxml2-dev
Standards-Version: 3.9.4
Homepage: https://wiki.gnome.org/dconf
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/d-conf
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/d-conf
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/d-conf/
XS-Testsuite: autopkgtest
diff -Nru d-conf-0.16.1/debian/control.in d-conf-0.18.0/debian/control.in
--- d-conf-0.16.1/debian/control.in 2013-06-28 23:05:44.000000000 +0000
+++ d-conf-0.18.0/debian/control.in 2013-10-17 15:41:58.000000000 +0000
@@ -13,11 +13,11 @@
valac (>= 0.17.0),
libglib2.0-dev (>= 2.35.2),
libdbus-1-dev,
- libgtk-3-dev (>= 3.0.0),
+ libgtk-3-dev (>= 3.4.0),
libxml2-dev
Standards-Version: 3.9.4
Homepage: https://wiki.gnome.org/dconf
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/d-conf
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/d-conf
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/d-conf/
XS-Testsuite: autopkgtest
diff -Nru d-conf-0.16.1/debian/dconf-editor.install d-conf-0.18.0/debian/dconf-editor.install
--- d-conf-0.16.1/debian/dconf-editor.install 2013-05-31 14:19:33.000000000 +0000
+++ d-conf-0.18.0/debian/dconf-editor.install 2013-10-17 15:51:01.000000000 +0000
@@ -1,5 +1,4 @@
usr/bin/dconf-editor
-usr/share/dconf-editor
usr/share/applications/dconf-editor.desktop
usr/share/glib-2.0/schemas/*dconf-editor*
usr/share/icons
diff -Nru d-conf-0.16.1/docs/Makefile.am d-conf-0.18.0/docs/Makefile.am
--- d-conf-0.16.1/docs/Makefile.am 2013-07-16 16:20:20.000000000 +0000
+++ d-conf-0.18.0/docs/Makefile.am 2013-07-17 20:01:30.000000000 +0000
@@ -12,7 +12,7 @@
MKDB_OPTIONS = --output-format=xml
-INCLUDES = $(gio_CFLAGS)
+AM_CPPFLAGS = $(gio_CFLAGS)
GTKDOC_LIBS = $(gio_LIBS) -L../client -ldconf -Wl,-rpath=../client
content_files = \
diff -Nru d-conf-0.16.1/docs/Makefile.in d-conf-0.18.0/docs/Makefile.in
--- d-conf-0.16.1/docs/Makefile.in 2013-07-16 16:43:49.000000000 +0000
+++ d-conf-0.18.0/docs/Makefile.in 2013-09-23 21:29:28.000000000 +0000
@@ -177,6 +177,7 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -383,7 +384,7 @@
HFILE_GLOB = $(top_srcdir)/client/*.h $(top_srcdir)/common/*.h
CFILE_GLOB = $(top_srcdir)/client/*.c $(top_srcdir)/common/*.c
MKDB_OPTIONS = --output-format=xml
-INCLUDES = $(gio_CFLAGS)
+AM_CPPFLAGS = $(gio_CFLAGS)
GTKDOC_LIBS = $(gio_LIBS) -L../client -ldconf -Wl,-rpath=../client
content_files = \
dconf-overview.xml \
diff -Nru d-conf-0.16.1/docs/dconf-overview.xml d-conf-0.18.0/docs/dconf-overview.xml
--- d-conf-0.16.1/docs/dconf-overview.xml 2013-03-14 18:27:40.000000000 +0000
+++ d-conf-0.18.0/docs/dconf-overview.xml 2013-07-17 20:01:34.000000000 +0000
@@ -61,6 +61,121 @@
client libraries through a clever "fast" mechanism that records the outstanding changes locally (so they
can be read back immediately) until the service signals that a write has completed.
+
+ The binary database format that dconf uses by default is not suitable for use on NFS, where mmap does not
+ work well. To handle this common use case, dconf can be configured to place its binary database in
+ XDG_RUNTIME_DIR (which is guaranteed to be local, but non-persistent) and synchronize it
+ with a plain text keyfile in the users home directory.
+
+
+
+
+ Profiles
+
+
+ A profile is a list of configuration databases that dconf consults to find the value for a key. The user's personal
+ database always takes the highest priority, followed by the system databases in the order prescribed by the profile.
+
+
+
+ On startup, dconf consults the DCONF_PROFILE environment variable. If set, dconf will attempt to open
+ the named profile, aborting if that fails. If the environment variable is not set, it will attempt to open the profile
+ named "user" and if that fails, it will fall back to an internal hard-wired configuration. dconf stores its profiles
+ in text files. DCONF_PROFILE can specify a relative path to a file in /etc/dconf/profile/ ,
+ or an absolute path (such as in a user's home directory). The profile name can only use alphanumeric characters or '_'.
+
+
+
+ A profile file might look like the following:
+
+user-db:user
+system-db:local
+system-db:site
+
+
+
+
+ Each line in a profile specifies one dconf database. The first line indicates the database used to write changes, and the
+ remaining lines indicate read-only databases. (The first line should specify a user-db or service-db, so that users can actually
+ make configuration changes.)
+
+
+
+ A "user-db" line specifies a user database. These databases are found in $XDG_CONFIG_HOME /dconf/ .
+ The name of the file to open in that directory is exactly as it is written in the profile. This file is expected to be in the binary
+ dconf database format. Note that XDG_CONFIG_HOME cannot be set/modified per terminal or session, because then the writer
+ and reader would be working on different DBs (the writer is started by DBus and cannot see that variable).
+
+
+
+ A "service-db" line instructs dconf to place the binary database file for the user database in XDG_RUNTIME_DIR .
+ Since this location is not persistent, the rest of the line instructs dconf how to store the database persistently. A typical
+ line is service-db:keyfile/user , which tells dconf to synchronize the binary database with a plain text
+ keyfile in $XDG_CONFIG_HOME /dconf/user.txt . The synchronization is bi-directional.
+
+
+
+ A "system-db" line specifies a system database. These databases are found in /etc/dconf/db/ . Again, the name of
+ the file to open in that directory is exactly as it is written in the profile and the file is expected to be in the dconf database
+ format.
+
+
+
+ If the DCONF_PROFILE environment variable is unset and the "user" profile can not be opened, then the effect is as if
+ the profile was specified by this file:
+
+user-db:user
+
+ That is, the user's personal database is consulted and there are no system settings.
+
+
+
+
+ Key Files
+
+
+ To facilitate system configuration with a text editor, dconf can populate databases from plain text keyfiles. For any given system
+ database, keyfiles can be placed into the /etc/dconf/db/database .d/ directory. The
+ keyfiles contain groups of settings as follows:
+
+
+# Some useful default settings for our site
+
+[system/proxy/http]
+host='172.16.0.1'
+enabled=true
+
+[org/gnome/desktop/background]
+picture-uri='file:///usr/local/rupert-corp/company-wallpaper.jpeg'
+
+
+ After changing keyfiles, the database needs to be updated with the
+ dconf 1 tool.
+
+
+
+
+ Locks
+
+
+ System databases can contain 'locks' for keys. If a lock for a particular key or subpath is installed into a database
+ then no database listed above that one in the profile will be able to modify any of the affected settings. This can be
+ used to enforce mandatory settings.
+
+
+
+ To add locks to a database, place text files in the /etc/dconf/db/database .d/locks
+ directory, where database is the name of a system database, as specified in the profile. The files
+ contain list of keys to lock, on per line. Lines starting with a # are ignored. Here is an example:
+
+
+# prevent changes to the company wallpaper
+/org/gnome/desktop/background/picture-uri
+
+
+ After changing locks, the database needs to be updated with the
+ dconf 1 tool.
+
diff -Nru d-conf-0.16.1/docs/dconf-tool.xml d-conf-0.18.0/docs/dconf-tool.xml
--- d-conf-0.16.1/docs/dconf-tool.xml 2013-03-14 18:27:40.000000000 +0000
+++ d-conf-0.18.0/docs/dconf-tool.xml 2013-09-10 14:13:01.000000000 +0000
@@ -83,10 +83,10 @@
The dconf program can perform various operations on a dconf database, such as reading
- or writing individual values or entire directories. This tool operates directly on the dconf database and
- does not read gsettings schema information. Therefore, it cannot perform type and consistency checks on
- values. The gsettings 1
- utility is an alternative if such checks are needed.
+ or writing individual values or entire directories. This tool operates on dconf directly, without using
+ gsettings schema information. Therefore, it cannot perform type and consistency checks on values. The
+ gsettings 1 utility is
+ an alternative if such checks are needed.
@@ -99,6 +99,10 @@
VALUE arguments must be in GVariant format, so e.g. a string must include
explicit quotes: "'foo'". This format is also used when printing out values.
+
+
+ Note that dconf needs a D-Bus session bus connection to write changes to the dconf database.
+
@@ -164,6 +168,20 @@
+ Environment
+
+
+
+ DCONF_PROFILE
+
+ This environment variable determines which dconf profile to use. See
+ dconf 7 .
+
+
+
+
+
+
See Also
dconf 7 ,
diff -Nru d-conf-0.16.1/docs/html/DConfClient.html d-conf-0.18.0/docs/html/DConfClient.html
--- d-conf-0.16.1/docs/html/DConfClient.html 2013-07-16 16:46:17.000000000 +0000
+++ d-conf-0.18.0/docs/html/DConfClient.html 2013-09-23 21:29:39.000000000 +0000
@@ -8,7 +8,7 @@
-
+
@@ -58,7 +58,7 @@
const gchar *key
,
GVariant *value
,
gchar **tag
,
- GCancellable *cancellable
,
+ GCancellable *cancellable
,
GError **error
);
gboolean dconf_client_change_fast (DConfClient *client
,
DConfChangeset *changeset
,
@@ -66,7 +66,7 @@
gboolean dconf_client_change_sync (DConfClient *client
,
DConfChangeset *changeset
,
gchar **tag
,
- GCancellable *cancellable
,
+ GCancellable *cancellable
,
GError **error
);
void dconf_client_watch_fast (DConfClient *client
,
const gchar *path
);
@@ -103,7 +103,7 @@
Most applications probably don't want to access dconf directly and
-would be better off using something like GSettings .
+would be better off using something like GSettings .
Please note that the API of libdconf is not stable in any way. It
@@ -331,7 +331,7 @@
const gchar *key
,
GVariant *value
,
gchar **tag
,
- GCancellable *cancellable
,
+ GCancellable *cancellable
,
GError **error
);
Write value
to the given key
, or reset key
to its default value.
@@ -377,7 +377,7 @@
cancellable
:
-a GCancellable , or NULL
+ a GCancellable , or NULL
@@ -457,7 +457,7 @@
gboolean dconf_client_change_sync (DConfClient *client
,
DConfChangeset *changeset
,
gchar **tag
,
- GCancellable *cancellable
,
+ GCancellable *cancellable
,
GError **error
);
Performs the change operation described by changeset
.
@@ -500,7 +500,7 @@
cancellable
:
-a GCancellable , or NULL
+ a GCancellable , or NULL
@@ -768,6 +768,6 @@
+ Generated by GTK-Doc V1.19