Ubuntu
gsettings-desktop-schemas package

Merge lp:~rodrigo-moya/ubuntu/natty/gsettings-desktop-schemas/0_1_1_release into lp:ubuntu/natty/gsettings-desktop-schemas

  1. Natty (11.04)
  2. 0_1_1_release
  3. Merge into natty
Proposed by Rodrigo Moya
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 3
Merge reported by: Rodrigo Moya
Merged at revision: not available
Proposed branch: lp:~rodrigo-moya/ubuntu/natty/gsettings-desktop-schemas/0_1_1_release
Merge into: lp:ubuntu/natty/gsettings-desktop-schemas
Diff against target: 1497 lines (+598/-566)
7 files modified
NEWS (+5/-0)
aclocal.m4 (+521/-519)
configure (+52/-44)
configure.ac (+1/-1)
debian/changelog (+7/-0)
schemas/gsettings-desktop-schemas.convert (+3/-1)
schemas/org.gnome.desktop.interface.gschema.xml (+9/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/natty/gsettings-desktop-schemas/0_1_1_release
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+41075@code.launchpad.net

Description of the change

Upstream 0.1.1 release

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

We should set the default cursor to a theme we use somewhere but otherwise seems fine, feel free to upload

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-11-05 17:22:35 +0000
3+++ NEWS 2010-11-17 17:44:38 +0000
4@@ -1,3 +1,8 @@
5+Major changes in 0.1.1
6+======================
7+
8+* Misc. schema updates
9+
10 Major changes in 0.1.0
11 ======================
12
13
14=== modified file 'aclocal.m4'
15--- aclocal.m4 2010-11-05 17:22:35 +0000
16+++ aclocal.m4 2010-11-17 17:44:38 +0000
17@@ -13,527 +13,12 @@
18
19 m4_ifndef([AC_AUTOCONF_VERSION],
20 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
21-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
22-[m4_warning([this file was generated for autoconf 2.66.
23+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
24+[m4_warning([this file was generated for autoconf 2.67.
25 You have another version of autoconf. It may work, but is not guaranteed to.
26 If you have problems, you may need to regenerate the build system entirely.
27 To do so, use the procedure documented by the package, typically `autoreconf'.])])
28
29-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
30-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
31-#
32-# This file is free software, distributed under the terms of the GNU
33-# General Public License. As a special exception to the GNU General
34-# Public License, this file may be distributed as part of a program
35-# that contains a configuration script generated by Autoconf, under
36-# the same distribution terms as the rest of that program.
37-#
38-# This file can be copied and used freely without restrictions. It can
39-# be used in projects which are not available under the GNU Public License
40-# but which still want to provide support for the GNU gettext functionality.
41-#
42-# Macro to add for using GNU gettext.
43-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
44-#
45-# Modified to never use included libintl.
46-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
47-#
48-# Major rework to remove unused code
49-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
50-#
51-# Added better handling of ALL_LINGUAS from GNU gettext version
52-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
53-#
54-# Modified to require ngettext
55-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
56-#
57-# We need this here as well, since someone might use autoconf-2.5x
58-# to configure GLib then an older version to configure a package
59-# using AM_GLIB_GNU_GETTEXT
60-AC_PREREQ(2.53)
61-
62-dnl
63-dnl We go to great lengths to make sure that aclocal won't
64-dnl try to pull in the installed version of these macros
65-dnl when running aclocal in the glib directory.
66-dnl
67-m4_copy([AC_DEFUN],[glib_DEFUN])
68-m4_copy([AC_REQUIRE],[glib_REQUIRE])
69-dnl
70-dnl At the end, if we're not within glib, we'll define the public
71-dnl definitions in terms of our private definitions.
72-dnl
73-
74-# GLIB_LC_MESSAGES
75-#--------------------
76-glib_DEFUN([GLIB_LC_MESSAGES],
77- [AC_CHECK_HEADERS([locale.h])
78- if test $ac_cv_header_locale_h = yes; then
79- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
80- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
81- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
82- if test $am_cv_val_LC_MESSAGES = yes; then
83- AC_DEFINE(HAVE_LC_MESSAGES, 1,
84- [Define if your <locale.h> file defines LC_MESSAGES.])
85- fi
86- fi])
87-
88-# GLIB_PATH_PROG_WITH_TEST
89-#----------------------------
90-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
91-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
92-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
93-[# Extract the first word of "$2", so it can be a program name with args.
94-set dummy $2; ac_word=[$]2
95-AC_MSG_CHECKING([for $ac_word])
96-AC_CACHE_VAL(ac_cv_path_$1,
97-[case "[$]$1" in
98- /*)
99- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
100- ;;
101- *)
102- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
103- for ac_dir in ifelse([$5], , $PATH, [$5]); do
104- test -z "$ac_dir" && ac_dir=.
105- if test -f $ac_dir/$ac_word; then
106- if [$3]; then
107- ac_cv_path_$1="$ac_dir/$ac_word"
108- break
109- fi
110- fi
111- done
112- IFS="$ac_save_ifs"
113-dnl If no 4th arg is given, leave the cache variable unset,
114-dnl so AC_PATH_PROGS will keep looking.
115-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
116-])dnl
117- ;;
118-esac])dnl
119-$1="$ac_cv_path_$1"
120-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
121- AC_MSG_RESULT([$]$1)
122-else
123- AC_MSG_RESULT(no)
124-fi
125-AC_SUBST($1)dnl
126-])
127-
128-# GLIB_WITH_NLS
129-#-----------------
130-glib_DEFUN([GLIB_WITH_NLS],
131- dnl NLS is obligatory
132- [USE_NLS=yes
133- AC_SUBST(USE_NLS)
134-
135- gt_cv_have_gettext=no
136-
137- CATOBJEXT=NONE
138- XGETTEXT=:
139- INTLLIBS=
140-
141- AC_CHECK_HEADER(libintl.h,
142- [gt_cv_func_dgettext_libintl="no"
143- libintl_extra_libs=""
144-
145- #
146- # First check in libc
147- #
148- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
149- [AC_TRY_LINK([
150-#include <libintl.h>
151-],
152- [return !ngettext ("","", 1)],
153- gt_cv_func_ngettext_libc=yes,
154- gt_cv_func_ngettext_libc=no)
155- ])
156-
157- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
158- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
159- [AC_TRY_LINK([
160-#include <libintl.h>
161-],
162- [return !dgettext ("","")],
163- gt_cv_func_dgettext_libc=yes,
164- gt_cv_func_dgettext_libc=no)
165- ])
166- fi
167-
168- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
169- AC_CHECK_FUNCS(bind_textdomain_codeset)
170- fi
171-
172- #
173- # If we don't have everything we want, check in libintl
174- #
175- if test "$gt_cv_func_dgettext_libc" != "yes" \
176- || test "$gt_cv_func_ngettext_libc" != "yes" \
177- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
178-
179- AC_CHECK_LIB(intl, bindtextdomain,
180- [AC_CHECK_LIB(intl, ngettext,
181- [AC_CHECK_LIB(intl, dgettext,
182- gt_cv_func_dgettext_libintl=yes)])])
183-
184- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
185- AC_MSG_CHECKING([if -liconv is needed to use gettext])
186- AC_MSG_RESULT([])
187- AC_CHECK_LIB(intl, ngettext,
188- [AC_CHECK_LIB(intl, dcgettext,
189- [gt_cv_func_dgettext_libintl=yes
190- libintl_extra_libs=-liconv],
191- :,-liconv)],
192- :,-liconv)
193- fi
194-
195- #
196- # If we found libintl, then check in it for bind_textdomain_codeset();
197- # we'll prefer libc if neither have bind_textdomain_codeset(),
198- # and both have dgettext and ngettext
199- #
200- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
201- glib_save_LIBS="$LIBS"
202- LIBS="$LIBS -lintl $libintl_extra_libs"
203- unset ac_cv_func_bind_textdomain_codeset
204- AC_CHECK_FUNCS(bind_textdomain_codeset)
205- LIBS="$glib_save_LIBS"
206-
207- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
208- gt_cv_func_dgettext_libc=no
209- else
210- if test "$gt_cv_func_dgettext_libc" = "yes" \
211- && test "$gt_cv_func_ngettext_libc" = "yes"; then
212- gt_cv_func_dgettext_libintl=no
213- fi
214- fi
215- fi
216- fi
217-
218- if test "$gt_cv_func_dgettext_libc" = "yes" \
219- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
220- gt_cv_have_gettext=yes
221- fi
222-
223- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
224- INTLLIBS="-lintl $libintl_extra_libs"
225- fi
226-
227- if test "$gt_cv_have_gettext" = "yes"; then
228- AC_DEFINE(HAVE_GETTEXT,1,
229- [Define if the GNU gettext() function is already present or preinstalled.])
230- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
231- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
232- if test "$MSGFMT" != "no"; then
233- glib_save_LIBS="$LIBS"
234- LIBS="$LIBS $INTLLIBS"
235- AC_CHECK_FUNCS(dcgettext)
236- MSGFMT_OPTS=
237- AC_MSG_CHECKING([if msgfmt accepts -c])
238- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
239-msgid ""
240-msgstr ""
241-"Content-Type: text/plain; charset=UTF-8\n"
242-"Project-Id-Version: test 1.0\n"
243-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
244-"Last-Translator: test <foo@bar.xx>\n"
245-"Language-Team: C <LL@li.org>\n"
246-"MIME-Version: 1.0\n"
247-"Content-Transfer-Encoding: 8bit\n"
248-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
249- AC_SUBST(MSGFMT_OPTS)
250- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
251- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
252- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
253- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
254- return _nl_msg_cat_cntr],
255- [CATOBJEXT=.gmo
256- DATADIRNAME=share],
257- [case $host in
258- *-*-solaris*)
259- dnl On Solaris, if bind_textdomain_codeset is in libc,
260- dnl GNU format message catalog is always supported,
261- dnl since both are added to the libc all together.
262- dnl Hence, we'd like to go with DATADIRNAME=share and
263- dnl and CATOBJEXT=.gmo in this case.
264- AC_CHECK_FUNC(bind_textdomain_codeset,
265- [CATOBJEXT=.gmo
266- DATADIRNAME=share],
267- [CATOBJEXT=.mo
268- DATADIRNAME=lib])
269- ;;
270- *)
271- CATOBJEXT=.mo
272- DATADIRNAME=lib
273- ;;
274- esac])
275- LIBS="$glib_save_LIBS"
276- INSTOBJEXT=.mo
277- else
278- gt_cv_have_gettext=no
279- fi
280- fi
281- ])
282-
283- if test "$gt_cv_have_gettext" = "yes" ; then
284- AC_DEFINE(ENABLE_NLS, 1,
285- [always defined to indicate that i18n is enabled])
286- fi
287-
288- dnl Test whether we really found GNU xgettext.
289- if test "$XGETTEXT" != ":"; then
290- dnl If it is not GNU xgettext we define it as : so that the
291- dnl Makefiles still can work.
292- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
293- : ;
294- else
295- AC_MSG_RESULT(
296- [found xgettext program is not GNU xgettext; ignore it])
297- XGETTEXT=":"
298- fi
299- fi
300-
301- # We need to process the po/ directory.
302- POSUB=po
303-
304- AC_OUTPUT_COMMANDS(
305- [case "$CONFIG_FILES" in *po/Makefile.in*)
306- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
307- esac])
308-
309- dnl These rules are solely for the distribution goal. While doing this
310- dnl we only have to keep exactly one list of the available catalogs
311- dnl in configure.ac.
312- for lang in $ALL_LINGUAS; do
313- GMOFILES="$GMOFILES $lang.gmo"
314- POFILES="$POFILES $lang.po"
315- done
316-
317- dnl Make all variables we use known to autoconf.
318- AC_SUBST(CATALOGS)
319- AC_SUBST(CATOBJEXT)
320- AC_SUBST(DATADIRNAME)
321- AC_SUBST(GMOFILES)
322- AC_SUBST(INSTOBJEXT)
323- AC_SUBST(INTLLIBS)
324- AC_SUBST(PO_IN_DATADIR_TRUE)
325- AC_SUBST(PO_IN_DATADIR_FALSE)
326- AC_SUBST(POFILES)
327- AC_SUBST(POSUB)
328- ])
329-
330-# AM_GLIB_GNU_GETTEXT
331-# -------------------
332-# Do checks necessary for use of gettext. If a suitable implementation
333-# of gettext is found in either in libintl or in the C library,
334-# it will set INTLLIBS to the libraries needed for use of gettext
335-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
336-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
337-# on various variables needed by the Makefile.in.in installed by
338-# glib-gettextize.
339-dnl
340-glib_DEFUN([GLIB_GNU_GETTEXT],
341- [AC_REQUIRE([AC_PROG_CC])dnl
342- AC_REQUIRE([AC_HEADER_STDC])dnl
343-
344- GLIB_LC_MESSAGES
345- GLIB_WITH_NLS
346-
347- if test "$gt_cv_have_gettext" = "yes"; then
348- if test "x$ALL_LINGUAS" = "x"; then
349- LINGUAS=
350- else
351- AC_MSG_CHECKING(for catalogs to be installed)
352- NEW_LINGUAS=
353- for presentlang in $ALL_LINGUAS; do
354- useit=no
355- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
356- desiredlanguages="$LINGUAS"
357- else
358- desiredlanguages="$ALL_LINGUAS"
359- fi
360- for desiredlang in $desiredlanguages; do
361- # Use the presentlang catalog if desiredlang is
362- # a. equal to presentlang, or
363- # b. a variant of presentlang (because in this case,
364- # presentlang can be used as a fallback for messages
365- # which are not translated in the desiredlang catalog).
366- case "$desiredlang" in
367- "$presentlang"*) useit=yes;;
368- esac
369- done
370- if test $useit = yes; then
371- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
372- fi
373- done
374- LINGUAS=$NEW_LINGUAS
375- AC_MSG_RESULT($LINGUAS)
376- fi
377-
378- dnl Construct list of names of catalog files to be constructed.
379- if test -n "$LINGUAS"; then
380- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
381- fi
382- fi
383-
384- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
385- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
386- dnl Try to locate is.
387- MKINSTALLDIRS=
388- if test -n "$ac_aux_dir"; then
389- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
390- fi
391- if test -z "$MKINSTALLDIRS"; then
392- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
393- fi
394- AC_SUBST(MKINSTALLDIRS)
395-
396- dnl Generate list of files to be processed by xgettext which will
397- dnl be included in po/Makefile.
398- test -d po || mkdir po
399- if test "x$srcdir" != "x."; then
400- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
401- posrcprefix="$srcdir/"
402- else
403- posrcprefix="../$srcdir/"
404- fi
405- else
406- posrcprefix="../"
407- fi
408- rm -f po/POTFILES
409- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
410- < $srcdir/po/POTFILES.in > po/POTFILES
411- ])
412-
413-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
414-# -------------------------------
415-# Define VARIABLE to the location where catalog files will
416-# be installed by po/Makefile.
417-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
418-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
419-glib_save_prefix="$prefix"
420-glib_save_exec_prefix="$exec_prefix"
421-glib_save_datarootdir="$datarootdir"
422-test "x$prefix" = xNONE && prefix=$ac_default_prefix
423-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
424-datarootdir=`eval echo "${datarootdir}"`
425-if test "x$CATOBJEXT" = "x.mo" ; then
426- localedir=`eval echo "${libdir}/locale"`
427-else
428- localedir=`eval echo "${datadir}/locale"`
429-fi
430-prefix="$glib_save_prefix"
431-exec_prefix="$glib_save_exec_prefix"
432-datarootdir="$glib_save_datarootdir"
433-AC_DEFINE_UNQUOTED($1, "$localedir",
434- [Define the location where the catalogs will be installed])
435-])
436-
437-dnl
438-dnl Now the definitions that aclocal will find
439-dnl
440-ifdef(glib_configure_ac,[],[
441-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
442-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
443-])dnl
444-
445-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
446-#
447-# Create a temporary file with TEST-FILE as its contents and pass the
448-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
449-# 0 and perform ACTION-IF-FAIL for any other exit status.
450-AC_DEFUN([GLIB_RUN_PROG],
451-[cat >conftest.foo <<_ACEOF
452-$2
453-_ACEOF
454-if AC_RUN_LOG([$1 conftest.foo]); then
455- m4_ifval([$3], [$3], [:])
456-m4_ifvaln([$4], [else $4])dnl
457-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
458-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
459-fi])
460-
461-
462-dnl GLIB_GSETTINGS
463-dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
464-dnl the schema should be compiled
465-dnl
466-
467-AC_DEFUN([GLIB_GSETTINGS],
468-[
469- m4_pattern_allow([AM_V_GEN])
470- AC_ARG_ENABLE(schemas-compile,
471- AC_HELP_STRING([--disable-schemas-compile],
472- [Disable regeneration of gschemas.compiled on install]),
473- [case ${enableval} in
474- yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
475- no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
476- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
477- esac])
478- AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
479- PKG_PROG_PKG_CONFIG([0.16])
480- AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
481- if test x$cross_compiling != xyes; then
482- GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
483- else
484- AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
485- fi
486- AC_SUBST(GLIB_COMPILE_SCHEMAS)
487- if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
488- ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
489- else
490- ifelse([$1],,[:],[$1])
491- fi
492-
493- GSETTINGS_RULES='
494-.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
495-
496-mostlyclean-am: clean-gsettings-schemas
497-
498-gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
499-
500-%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
501- $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
502-
503-all-am: $(gsettings_SCHEMAS:.xml=.valid)
504-uninstall-am: uninstall-gsettings-schemas
505-install-data-am: install-gsettings-schemas
506-
507-.SECONDARY: $(gsettings_SCHEMAS)
508-
509-install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
510- @$(NORMAL_INSTALL)
511- test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
512- $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
513- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
514-
515-uninstall-gsettings-schemas:
516- @$(NORMAL_UNINSTALL)
517- @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
518- files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
519- test -n "$$files" || exit 0; \
520- echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
521- cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
522- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
523-
524-clean-gsettings-schemas:
525- rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
526-
527-ifdef gsettings_ENUM_NAMESPACE
528-$(gsettings__enum_file): $(gsettings_ENUM_FILES)
529- $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $(gsettings_ENUM_FILES) > [$]@.tmp && mv [$]@.tmp [$]@
530-endif
531-'
532- _GSETTINGS_SUBST(GSETTINGS_RULES)
533-])
534-
535-dnl _GSETTINGS_SUBST(VARIABLE)
536-dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
537-AC_DEFUN([_GSETTINGS_SUBST],
538-[
539-AC_SUBST([$1])
540-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
541-]
542-)
543-
544 # nls.m4 serial 5 (gettext-0.18)
545 dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
546 dnl Inc.
547@@ -704,7 +189,7 @@
548 Consider adjusting the PKG_CONFIG_PATH environment variable if you
549 installed software in a non-standard prefix.
550
551-_PKG_TEXT])
552+_PKG_TEXT])[]dnl
553 ])
554 elif test $pkg_failed = untried; then
555 AC_MSG_RESULT([no])
556@@ -715,7 +200,7 @@
557
558 _PKG_TEXT
559
560-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
561+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
562 ])
563 else
564 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
565@@ -1722,4 +1207,521 @@
566 AC_SUBST([am__untar])
567 ]) # _AM_PROG_TAR
568
569+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
570+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
571+#
572+# This file is free software, distributed under the terms of the GNU
573+# General Public License. As a special exception to the GNU General
574+# Public License, this file may be distributed as part of a program
575+# that contains a configuration script generated by Autoconf, under
576+# the same distribution terms as the rest of that program.
577+#
578+# This file can be copied and used freely without restrictions. It can
579+# be used in projects which are not available under the GNU Public License
580+# but which still want to provide support for the GNU gettext functionality.
581+#
582+# Macro to add for using GNU gettext.
583+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
584+#
585+# Modified to never use included libintl.
586+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
587+#
588+# Major rework to remove unused code
589+# Owen Taylor <otaylor@redhat.com>, 12/11/2002
590+#
591+# Added better handling of ALL_LINGUAS from GNU gettext version
592+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
593+#
594+# Modified to require ngettext
595+# Matthias Clasen <mclasen@redhat.com> 08/06/2004
596+#
597+# We need this here as well, since someone might use autoconf-2.5x
598+# to configure GLib then an older version to configure a package
599+# using AM_GLIB_GNU_GETTEXT
600+AC_PREREQ(2.53)
601+
602+dnl
603+dnl We go to great lengths to make sure that aclocal won't
604+dnl try to pull in the installed version of these macros
605+dnl when running aclocal in the glib directory.
606+dnl
607+m4_copy([AC_DEFUN],[glib_DEFUN])
608+m4_copy([AC_REQUIRE],[glib_REQUIRE])
609+dnl
610+dnl At the end, if we're not within glib, we'll define the public
611+dnl definitions in terms of our private definitions.
612+dnl
613+
614+# GLIB_LC_MESSAGES
615+#--------------------
616+glib_DEFUN([GLIB_LC_MESSAGES],
617+ [AC_CHECK_HEADERS([locale.h])
618+ if test $ac_cv_header_locale_h = yes; then
619+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
620+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
621+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
622+ if test $am_cv_val_LC_MESSAGES = yes; then
623+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
624+ [Define if your <locale.h> file defines LC_MESSAGES.])
625+ fi
626+ fi])
627+
628+# GLIB_PATH_PROG_WITH_TEST
629+#----------------------------
630+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
631+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
632+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
633+[# Extract the first word of "$2", so it can be a program name with args.
634+set dummy $2; ac_word=[$]2
635+AC_MSG_CHECKING([for $ac_word])
636+AC_CACHE_VAL(ac_cv_path_$1,
637+[case "[$]$1" in
638+ /*)
639+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
640+ ;;
641+ *)
642+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
643+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
644+ test -z "$ac_dir" && ac_dir=.
645+ if test -f $ac_dir/$ac_word; then
646+ if [$3]; then
647+ ac_cv_path_$1="$ac_dir/$ac_word"
648+ break
649+ fi
650+ fi
651+ done
652+ IFS="$ac_save_ifs"
653+dnl If no 4th arg is given, leave the cache variable unset,
654+dnl so AC_PATH_PROGS will keep looking.
655+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
656+])dnl
657+ ;;
658+esac])dnl
659+$1="$ac_cv_path_$1"
660+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
661+ AC_MSG_RESULT([$]$1)
662+else
663+ AC_MSG_RESULT(no)
664+fi
665+AC_SUBST($1)dnl
666+])
667+
668+# GLIB_WITH_NLS
669+#-----------------
670+glib_DEFUN([GLIB_WITH_NLS],
671+ dnl NLS is obligatory
672+ [USE_NLS=yes
673+ AC_SUBST(USE_NLS)
674+
675+ gt_cv_have_gettext=no
676+
677+ CATOBJEXT=NONE
678+ XGETTEXT=:
679+ INTLLIBS=
680+
681+ AC_CHECK_HEADER(libintl.h,
682+ [gt_cv_func_dgettext_libintl="no"
683+ libintl_extra_libs=""
684+
685+ #
686+ # First check in libc
687+ #
688+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
689+ [AC_TRY_LINK([
690+#include <libintl.h>
691+],
692+ [return !ngettext ("","", 1)],
693+ gt_cv_func_ngettext_libc=yes,
694+ gt_cv_func_ngettext_libc=no)
695+ ])
696+
697+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
698+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
699+ [AC_TRY_LINK([
700+#include <libintl.h>
701+],
702+ [return !dgettext ("","")],
703+ gt_cv_func_dgettext_libc=yes,
704+ gt_cv_func_dgettext_libc=no)
705+ ])
706+ fi
707+
708+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
709+ AC_CHECK_FUNCS(bind_textdomain_codeset)
710+ fi
711+
712+ #
713+ # If we don't have everything we want, check in libintl
714+ #
715+ if test "$gt_cv_func_dgettext_libc" != "yes" \
716+ || test "$gt_cv_func_ngettext_libc" != "yes" \
717+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
718+
719+ AC_CHECK_LIB(intl, bindtextdomain,
720+ [AC_CHECK_LIB(intl, ngettext,
721+ [AC_CHECK_LIB(intl, dgettext,
722+ gt_cv_func_dgettext_libintl=yes)])])
723+
724+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
725+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
726+ AC_MSG_RESULT([])
727+ AC_CHECK_LIB(intl, ngettext,
728+ [AC_CHECK_LIB(intl, dcgettext,
729+ [gt_cv_func_dgettext_libintl=yes
730+ libintl_extra_libs=-liconv],
731+ :,-liconv)],
732+ :,-liconv)
733+ fi
734+
735+ #
736+ # If we found libintl, then check in it for bind_textdomain_codeset();
737+ # we'll prefer libc if neither have bind_textdomain_codeset(),
738+ # and both have dgettext and ngettext
739+ #
740+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
741+ glib_save_LIBS="$LIBS"
742+ LIBS="$LIBS -lintl $libintl_extra_libs"
743+ unset ac_cv_func_bind_textdomain_codeset
744+ AC_CHECK_FUNCS(bind_textdomain_codeset)
745+ LIBS="$glib_save_LIBS"
746+
747+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
748+ gt_cv_func_dgettext_libc=no
749+ else
750+ if test "$gt_cv_func_dgettext_libc" = "yes" \
751+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
752+ gt_cv_func_dgettext_libintl=no
753+ fi
754+ fi
755+ fi
756+ fi
757+
758+ if test "$gt_cv_func_dgettext_libc" = "yes" \
759+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
760+ gt_cv_have_gettext=yes
761+ fi
762+
763+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
764+ INTLLIBS="-lintl $libintl_extra_libs"
765+ fi
766+
767+ if test "$gt_cv_have_gettext" = "yes"; then
768+ AC_DEFINE(HAVE_GETTEXT,1,
769+ [Define if the GNU gettext() function is already present or preinstalled.])
770+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
771+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
772+ if test "$MSGFMT" != "no"; then
773+ glib_save_LIBS="$LIBS"
774+ LIBS="$LIBS $INTLLIBS"
775+ AC_CHECK_FUNCS(dcgettext)
776+ MSGFMT_OPTS=
777+ AC_MSG_CHECKING([if msgfmt accepts -c])
778+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
779+msgid ""
780+msgstr ""
781+"Content-Type: text/plain; charset=UTF-8\n"
782+"Project-Id-Version: test 1.0\n"
783+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
784+"Last-Translator: test <foo@bar.xx>\n"
785+"Language-Team: C <LL@li.org>\n"
786+"MIME-Version: 1.0\n"
787+"Content-Transfer-Encoding: 8bit\n"
788+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
789+ AC_SUBST(MSGFMT_OPTS)
790+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
791+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
792+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
793+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
794+ return _nl_msg_cat_cntr],
795+ [CATOBJEXT=.gmo
796+ DATADIRNAME=share],
797+ [case $host in
798+ *-*-solaris*)
799+ dnl On Solaris, if bind_textdomain_codeset is in libc,
800+ dnl GNU format message catalog is always supported,
801+ dnl since both are added to the libc all together.
802+ dnl Hence, we'd like to go with DATADIRNAME=share and
803+ dnl and CATOBJEXT=.gmo in this case.
804+ AC_CHECK_FUNC(bind_textdomain_codeset,
805+ [CATOBJEXT=.gmo
806+ DATADIRNAME=share],
807+ [CATOBJEXT=.mo
808+ DATADIRNAME=lib])
809+ ;;
810+ *)
811+ CATOBJEXT=.mo
812+ DATADIRNAME=lib
813+ ;;
814+ esac])
815+ LIBS="$glib_save_LIBS"
816+ INSTOBJEXT=.mo
817+ else
818+ gt_cv_have_gettext=no
819+ fi
820+ fi
821+ ])
822+
823+ if test "$gt_cv_have_gettext" = "yes" ; then
824+ AC_DEFINE(ENABLE_NLS, 1,
825+ [always defined to indicate that i18n is enabled])
826+ fi
827+
828+ dnl Test whether we really found GNU xgettext.
829+ if test "$XGETTEXT" != ":"; then
830+ dnl If it is not GNU xgettext we define it as : so that the
831+ dnl Makefiles still can work.
832+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
833+ : ;
834+ else
835+ AC_MSG_RESULT(
836+ [found xgettext program is not GNU xgettext; ignore it])
837+ XGETTEXT=":"
838+ fi
839+ fi
840+
841+ # We need to process the po/ directory.
842+ POSUB=po
843+
844+ AC_OUTPUT_COMMANDS(
845+ [case "$CONFIG_FILES" in *po/Makefile.in*)
846+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
847+ esac])
848+
849+ dnl These rules are solely for the distribution goal. While doing this
850+ dnl we only have to keep exactly one list of the available catalogs
851+ dnl in configure.ac.
852+ for lang in $ALL_LINGUAS; do
853+ GMOFILES="$GMOFILES $lang.gmo"
854+ POFILES="$POFILES $lang.po"
855+ done
856+
857+ dnl Make all variables we use known to autoconf.
858+ AC_SUBST(CATALOGS)
859+ AC_SUBST(CATOBJEXT)
860+ AC_SUBST(DATADIRNAME)
861+ AC_SUBST(GMOFILES)
862+ AC_SUBST(INSTOBJEXT)
863+ AC_SUBST(INTLLIBS)
864+ AC_SUBST(PO_IN_DATADIR_TRUE)
865+ AC_SUBST(PO_IN_DATADIR_FALSE)
866+ AC_SUBST(POFILES)
867+ AC_SUBST(POSUB)
868+ ])
869+
870+# AM_GLIB_GNU_GETTEXT
871+# -------------------
872+# Do checks necessary for use of gettext. If a suitable implementation
873+# of gettext is found in either in libintl or in the C library,
874+# it will set INTLLIBS to the libraries needed for use of gettext
875+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
876+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
877+# on various variables needed by the Makefile.in.in installed by
878+# glib-gettextize.
879+dnl
880+glib_DEFUN([GLIB_GNU_GETTEXT],
881+ [AC_REQUIRE([AC_PROG_CC])dnl
882+ AC_REQUIRE([AC_HEADER_STDC])dnl
883+
884+ GLIB_LC_MESSAGES
885+ GLIB_WITH_NLS
886+
887+ if test "$gt_cv_have_gettext" = "yes"; then
888+ if test "x$ALL_LINGUAS" = "x"; then
889+ LINGUAS=
890+ else
891+ AC_MSG_CHECKING(for catalogs to be installed)
892+ NEW_LINGUAS=
893+ for presentlang in $ALL_LINGUAS; do
894+ useit=no
895+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
896+ desiredlanguages="$LINGUAS"
897+ else
898+ desiredlanguages="$ALL_LINGUAS"
899+ fi
900+ for desiredlang in $desiredlanguages; do
901+ # Use the presentlang catalog if desiredlang is
902+ # a. equal to presentlang, or
903+ # b. a variant of presentlang (because in this case,
904+ # presentlang can be used as a fallback for messages
905+ # which are not translated in the desiredlang catalog).
906+ case "$desiredlang" in
907+ "$presentlang"*) useit=yes;;
908+ esac
909+ done
910+ if test $useit = yes; then
911+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
912+ fi
913+ done
914+ LINGUAS=$NEW_LINGUAS
915+ AC_MSG_RESULT($LINGUAS)
916+ fi
917+
918+ dnl Construct list of names of catalog files to be constructed.
919+ if test -n "$LINGUAS"; then
920+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
921+ fi
922+ fi
923+
924+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
925+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
926+ dnl Try to locate is.
927+ MKINSTALLDIRS=
928+ if test -n "$ac_aux_dir"; then
929+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
930+ fi
931+ if test -z "$MKINSTALLDIRS"; then
932+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
933+ fi
934+ AC_SUBST(MKINSTALLDIRS)
935+
936+ dnl Generate list of files to be processed by xgettext which will
937+ dnl be included in po/Makefile.
938+ test -d po || mkdir po
939+ if test "x$srcdir" != "x."; then
940+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
941+ posrcprefix="$srcdir/"
942+ else
943+ posrcprefix="../$srcdir/"
944+ fi
945+ else
946+ posrcprefix="../"
947+ fi
948+ rm -f po/POTFILES
949+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
950+ < $srcdir/po/POTFILES.in > po/POTFILES
951+ ])
952+
953+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
954+# -------------------------------
955+# Define VARIABLE to the location where catalog files will
956+# be installed by po/Makefile.
957+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
958+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
959+glib_save_prefix="$prefix"
960+glib_save_exec_prefix="$exec_prefix"
961+glib_save_datarootdir="$datarootdir"
962+test "x$prefix" = xNONE && prefix=$ac_default_prefix
963+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
964+datarootdir=`eval echo "${datarootdir}"`
965+if test "x$CATOBJEXT" = "x.mo" ; then
966+ localedir=`eval echo "${libdir}/locale"`
967+else
968+ localedir=`eval echo "${datadir}/locale"`
969+fi
970+prefix="$glib_save_prefix"
971+exec_prefix="$glib_save_exec_prefix"
972+datarootdir="$glib_save_datarootdir"
973+AC_DEFINE_UNQUOTED($1, "$localedir",
974+ [Define the location where the catalogs will be installed])
975+])
976+
977+dnl
978+dnl Now the definitions that aclocal will find
979+dnl
980+ifdef(glib_configure_ac,[],[
981+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
982+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
983+])dnl
984+
985+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
986+#
987+# Create a temporary file with TEST-FILE as its contents and pass the
988+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
989+# 0 and perform ACTION-IF-FAIL for any other exit status.
990+AC_DEFUN([GLIB_RUN_PROG],
991+[cat >conftest.foo <<_ACEOF
992+$2
993+_ACEOF
994+if AC_RUN_LOG([$1 conftest.foo]); then
995+ m4_ifval([$3], [$3], [:])
996+m4_ifvaln([$4], [else $4])dnl
997+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
998+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
999+fi])
1000+
1001+
1002+dnl GLIB_GSETTINGS
1003+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
1004+dnl the schema should be compiled
1005+dnl
1006+
1007+AC_DEFUN([GLIB_GSETTINGS],
1008+[
1009+ m4_pattern_allow([AM_V_GEN])
1010+ AC_ARG_ENABLE(schemas-compile,
1011+ AC_HELP_STRING([--disable-schemas-compile],
1012+ [Disable regeneration of gschemas.compiled on install]),
1013+ [case ${enableval} in
1014+ yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
1015+ no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
1016+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
1017+ esac])
1018+ AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
1019+ PKG_PROG_PKG_CONFIG([0.16])
1020+ AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
1021+ if test x$cross_compiling != xyes; then
1022+ GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
1023+ else
1024+ AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
1025+ fi
1026+ AC_SUBST(GLIB_COMPILE_SCHEMAS)
1027+ if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
1028+ ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
1029+ else
1030+ ifelse([$1],,[:],[$1])
1031+ fi
1032+
1033+ GSETTINGS_RULES='
1034+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
1035+
1036+mostlyclean-am: clean-gsettings-schemas
1037+
1038+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
1039+
1040+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
1041+ $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
1042+
1043+all-am: $(gsettings_SCHEMAS:.xml=.valid)
1044+uninstall-am: uninstall-gsettings-schemas
1045+install-data-am: install-gsettings-schemas
1046+
1047+.SECONDARY: $(gsettings_SCHEMAS)
1048+
1049+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
1050+ @$(NORMAL_INSTALL)
1051+ if test -n "$^"; then \
1052+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
1053+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
1054+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
1055+ fi
1056+
1057+uninstall-gsettings-schemas:
1058+ @$(NORMAL_UNINSTALL)
1059+ @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
1060+ files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
1061+ test -n "$$files" || exit 0; \
1062+ echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
1063+ cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
1064+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
1065+
1066+clean-gsettings-schemas:
1067+ rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
1068+
1069+ifdef gsettings_ENUM_NAMESPACE
1070+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
1071+ $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $(gsettings_ENUM_FILES) > [$]@.tmp && mv [$]@.tmp [$]@
1072+endif
1073+'
1074+ _GSETTINGS_SUBST(GSETTINGS_RULES)
1075+])
1076+
1077+dnl _GSETTINGS_SUBST(VARIABLE)
1078+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
1079+AC_DEFUN([_GSETTINGS_SUBST],
1080+[
1081+AC_SUBST([$1])
1082+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
1083+]
1084+)
1085+
1086 m4_include([m4/intltool.m4])
1087
1088=== modified file 'configure'
1089--- configure 2010-11-05 17:22:35 +0000
1090+++ configure 2010-11-17 17:44:38 +0000
1091@@ -1,6 +1,6 @@
1092 #! /bin/sh
1093 # Guess values for system-dependent variables and create Makefiles.
1094-# Generated by GNU Autoconf 2.66 for gsettings-desktop-schemas 0.1.0.
1095+# Generated by GNU Autoconf 2.67 for gsettings-desktop-schemas 0.1.1.
1096 #
1097 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas>.
1098 #
1099@@ -553,8 +553,8 @@
1100 # Identity of this package.
1101 PACKAGE_NAME='gsettings-desktop-schemas'
1102 PACKAGE_TARNAME='gsettings-desktop-schemas'
1103-PACKAGE_VERSION='0.1.0'
1104-PACKAGE_STRING='gsettings-desktop-schemas 0.1.0'
1105+PACKAGE_VERSION='0.1.1'
1106+PACKAGE_STRING='gsettings-desktop-schemas 0.1.1'
1107 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas'
1108 PACKAGE_URL=''
1109
1110@@ -755,8 +755,7 @@
1111 LDFLAGS
1112 LIBS
1113 CPPFLAGS
1114-CPP
1115-CPPFLAGS'
1116+CPP'
1117
1118
1119 # Initialize some variables set by options.
1120@@ -819,8 +818,9 @@
1121 fi
1122
1123 case $ac_option in
1124- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
1125- *) ac_optarg=yes ;;
1126+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
1127+ *=) ac_optarg= ;;
1128+ *) ac_optarg=yes ;;
1129 esac
1130
1131 # Accept the important Cygnus configure options, so we can diagnose typos.
1132@@ -1298,7 +1298,7 @@
1133 # Omit some internal or obsolete options to make the list less imposing.
1134 # This message is too long to be a string in the A/UX 3.1 sh.
1135 cat <<_ACEOF
1136-\`configure' configures gsettings-desktop-schemas 0.1.0 to adapt to many kinds of systems.
1137+\`configure' configures gsettings-desktop-schemas 0.1.1 to adapt to many kinds of systems.
1138
1139 Usage: $0 [OPTION]... [VAR=VALUE]...
1140
1141@@ -1365,7 +1365,7 @@
1142
1143 if test -n "$ac_init_help"; then
1144 case $ac_init_help in
1145- short | recursive ) echo "Configuration of gsettings-desktop-schemas 0.1.0:";;
1146+ short | recursive ) echo "Configuration of gsettings-desktop-schemas 0.1.1:";;
1147 esac
1148 cat <<\_ACEOF
1149
1150@@ -1464,8 +1464,8 @@
1151 test -n "$ac_init_help" && exit $ac_status
1152 if $ac_init_version; then
1153 cat <<\_ACEOF
1154-gsettings-desktop-schemas configure 0.1.0
1155-generated by GNU Autoconf 2.66
1156+gsettings-desktop-schemas configure 0.1.1
1157+generated by GNU Autoconf 2.67
1158
1159 Copyright (C) 2010 Free Software Foundation, Inc.
1160 This configure script is free software; the Free Software Foundation
1161@@ -1537,7 +1537,7 @@
1162 mv -f conftest.er1 conftest.err
1163 fi
1164 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1165- test $ac_status = 0; } >/dev/null && {
1166+ test $ac_status = 0; } > conftest.i && {
1167 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1168 test ! -s conftest.err
1169 }; then :
1170@@ -1642,7 +1642,7 @@
1171 else
1172 ac_header_preproc=no
1173 fi
1174-rm -f conftest.err conftest.$ac_ext
1175+rm -f conftest.err conftest.i conftest.$ac_ext
1176 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1177 $as_echo "$ac_header_preproc" >&6; }
1178
1179@@ -1833,8 +1833,8 @@
1180 This file contains any messages produced by compilers while
1181 running configure, to aid debugging if configure makes a mistake.
1182
1183-It was created by gsettings-desktop-schemas $as_me 0.1.0, which was
1184-generated by GNU Autoconf 2.66. Invocation command line was
1185+It was created by gsettings-desktop-schemas $as_me 0.1.1, which was
1186+generated by GNU Autoconf 2.67. Invocation command line was
1187
1188 $ $0 $@
1189
1190@@ -2092,7 +2092,7 @@
1191 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1192 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1193 as_fn_error $? "failed to load site script $ac_site_file
1194-See \`config.log' for more details" "$LINENO" 5; }
1195+See \`config.log' for more details" "$LINENO" 5 ; }
1196 fi
1197 done
1198
1199@@ -2317,11 +2317,11 @@
1200 '
1201 case `pwd` in
1202 *[\\\"\#\$\&\'\`$am_lf]*)
1203- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
1204+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
1205 esac
1206 case $srcdir in
1207 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
1208- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
1209+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
1210 esac
1211
1212 # Do `set' in a subshell so we don't clobber the current shell's
1213@@ -2649,7 +2649,7 @@
1214
1215 # Define the identity of the package.
1216 PACKAGE='gsettings-desktop-schemas'
1217- VERSION='0.1.0'
1218+ VERSION='0.1.1'
1219
1220
1221 cat >>confdefs.h <<_ACEOF
1222@@ -2807,7 +2807,7 @@
1223 enableval=$enable_schemas_compile; case ${enableval} in
1224 yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
1225 no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
1226- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
1227+ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
1228 esac
1229 fi
1230
1231@@ -3002,9 +3002,11 @@
1232
1233 install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
1234 @$(NORMAL_INSTALL)
1235- test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
1236- $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
1237- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
1238+ if test -n "$^"; then \
1239+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
1240+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
1241+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
1242+ fi
1243
1244 uninstall-gsettings-schemas:
1245 @$(NORMAL_UNINSTALL)
1246@@ -3395,7 +3397,7 @@
1247 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1248 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1249 as_fn_error $? "no acceptable C compiler found in \$PATH
1250-See \`config.log' for more details" "$LINENO" 5; }
1251+See \`config.log' for more details" "$LINENO" 5 ; }
1252
1253 # Provide some information about the compiler.
1254 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
1255@@ -3510,7 +3512,7 @@
1256 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1257 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1258 as_fn_error 77 "C compiler cannot create executables
1259-See \`config.log' for more details" "$LINENO" 5; }
1260+See \`config.log' for more details" "$LINENO" 5 ; }
1261 else
1262 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1263 $as_echo "yes" >&6; }
1264@@ -3553,7 +3555,7 @@
1265 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1266 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1267 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
1268-See \`config.log' for more details" "$LINENO" 5; }
1269+See \`config.log' for more details" "$LINENO" 5 ; }
1270 fi
1271 rm -f conftest conftest$ac_cv_exeext
1272 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
1273@@ -3612,7 +3614,7 @@
1274 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1275 as_fn_error $? "cannot run C compiled programs.
1276 If you meant to cross compile, use \`--host'.
1277-See \`config.log' for more details" "$LINENO" 5; }
1278+See \`config.log' for more details" "$LINENO" 5 ; }
1279 fi
1280 fi
1281 fi
1282@@ -3664,7 +3666,7 @@
1283 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1284 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1285 as_fn_error $? "cannot compute suffix of object files: cannot compile
1286-See \`config.log' for more details" "$LINENO" 5; }
1287+See \`config.log' for more details" "$LINENO" 5 ; }
1288 fi
1289 rm -f conftest.$ac_cv_objext conftest.$ac_ext
1290 fi
1291@@ -4054,7 +4056,7 @@
1292 # Broken: fails on valid input.
1293 continue
1294 fi
1295-rm -f conftest.err conftest.$ac_ext
1296+rm -f conftest.err conftest.i conftest.$ac_ext
1297
1298 # OK, works on sane cases. Now check whether nonexistent headers
1299 # can be detected and how.
1300@@ -4070,11 +4072,11 @@
1301 ac_preproc_ok=:
1302 break
1303 fi
1304-rm -f conftest.err conftest.$ac_ext
1305+rm -f conftest.err conftest.i conftest.$ac_ext
1306
1307 done
1308 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1309-rm -f conftest.err conftest.$ac_ext
1310+rm -f conftest.i conftest.err conftest.$ac_ext
1311 if $ac_preproc_ok; then :
1312 break
1313 fi
1314@@ -4113,7 +4115,7 @@
1315 # Broken: fails on valid input.
1316 continue
1317 fi
1318-rm -f conftest.err conftest.$ac_ext
1319+rm -f conftest.err conftest.i conftest.$ac_ext
1320
1321 # OK, works on sane cases. Now check whether nonexistent headers
1322 # can be detected and how.
1323@@ -4129,18 +4131,18 @@
1324 ac_preproc_ok=:
1325 break
1326 fi
1327-rm -f conftest.err conftest.$ac_ext
1328+rm -f conftest.err conftest.i conftest.$ac_ext
1329
1330 done
1331 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1332-rm -f conftest.err conftest.$ac_ext
1333+rm -f conftest.i conftest.err conftest.$ac_ext
1334 if $ac_preproc_ok; then :
1335
1336 else
1337 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1338 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1339 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
1340-See \`config.log' for more details" "$LINENO" 5; }
1341+See \`config.log' for more details" "$LINENO" 5 ; }
1342 fi
1343
1344 ac_ext=c
1345@@ -6240,8 +6242,8 @@
1346 # report actual input values of CONFIG_FILES etc. instead of their
1347 # values after options handling.
1348 ac_log="
1349-This file was extended by gsettings-desktop-schemas $as_me 0.1.0, which was
1350-generated by GNU Autoconf 2.66. Invocation command line was
1351+This file was extended by gsettings-desktop-schemas $as_me 0.1.1, which was
1352+generated by GNU Autoconf 2.67. Invocation command line was
1353
1354 CONFIG_FILES = $CONFIG_FILES
1355 CONFIG_HEADERS = $CONFIG_HEADERS
1356@@ -6297,8 +6299,8 @@
1357 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1358 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1359 ac_cs_version="\\
1360-gsettings-desktop-schemas config.status 0.1.0
1361-configured by $0, generated by GNU Autoconf 2.66,
1362+gsettings-desktop-schemas config.status 0.1.1
1363+configured by $0, generated by GNU Autoconf 2.67,
1364 with options \\"\$ac_cs_config\\"
1365
1366 Copyright (C) 2010 Free Software Foundation, Inc.
1367@@ -6319,11 +6321,16 @@
1368 while test $# != 0
1369 do
1370 case $1 in
1371- --*=*)
1372+ --*=?*)
1373 ac_option=`expr "X$1" : 'X\([^=]*\)='`
1374 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
1375 ac_shift=:
1376 ;;
1377+ --*=)
1378+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
1379+ ac_optarg=
1380+ ac_shift=:
1381+ ;;
1382 *)
1383 ac_option=$1
1384 ac_optarg=$2
1385@@ -6345,6 +6352,7 @@
1386 $ac_shift
1387 case $ac_optarg in
1388 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
1389+ '') as_fn_error $? "missing file argument" ;;
1390 esac
1391 as_fn_append CONFIG_FILES " '$ac_optarg'"
1392 ac_need_defaults=false;;
1393@@ -6419,7 +6427,7 @@
1394 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
1395 "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
1396
1397- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
1398+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
1399 esac
1400 done
1401
1402@@ -6626,7 +6634,7 @@
1403 esac
1404 case $ac_mode$ac_tag in
1405 :[FHL]*:*);;
1406- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
1407+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
1408 :[FH]-) ac_tag=-:-;;
1409 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
1410 esac
1411@@ -6654,7 +6662,7 @@
1412 [\\/$]*) false;;
1413 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
1414 esac ||
1415- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
1416+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
1417 esac
1418 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
1419 as_fn_append ac_file_inputs " '$ac_f'"
1420@@ -6681,7 +6689,7 @@
1421
1422 case $ac_tag in
1423 *:-:* | *:-) cat >"$tmp/stdin" \
1424- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
1425+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
1426 esac
1427 ;;
1428 esac
1429
1430=== modified file 'configure.ac'
1431--- configure.ac 2010-11-05 17:22:35 +0000
1432+++ configure.ac 2010-11-17 17:44:38 +0000
1433@@ -1,5 +1,5 @@
1434 AC_PREREQ(2.53)
1435-AC_INIT([gsettings-desktop-schemas], [0.1.0],
1436+AC_INIT([gsettings-desktop-schemas], [0.1.1],
1437 [http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas])
1438 AC_CONFIG_SRCDIR(schemas/org.gnome.desktop.default-applications.gschema.xml)
1439 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
1440
1441=== modified file 'debian/changelog'
1442--- debian/changelog 2010-11-05 17:22:35 +0000
1443+++ debian/changelog 2010-11-17 17:44:38 +0000
1444@@ -1,3 +1,10 @@
1445+gsettings-desktop-schemas (0.1.1-0ubuntu1) natty; urgency=low
1446+
1447+ * New upstream release:
1448+ - Misc schema updates
1449+
1450+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Wed, 17 Nov 2010 18:38:53 +0100
1451+
1452 gsettings-desktop-schemas (0.1.0-0ubuntu1) natty; urgency=low
1453
1454 * debian/control:
1455
1456=== modified file 'schemas/gsettings-desktop-schemas.convert'
1457--- schemas/gsettings-desktop-schemas.convert 2010-11-05 17:22:35 +0000
1458+++ schemas/gsettings-desktop-schemas.convert 2010-11-17 17:44:38 +0000
1459@@ -47,7 +47,9 @@
1460 menubar-detachable = /desktop/gnome/interface/menubar_detachable
1461 toolbar-detachable = /desktop/gnome/interface/toolbar_detachable
1462 toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size
1463-cursor-blink = /desktop/gnome/interface/cursor_blink
1464+# Disabled, as we want users to use the new default:
1465+# https://bugzilla.gnome.org/show_bug.cgi?id=634639
1466+# cursor-blink = /desktop/gnome/interface/cursor_blink
1467 cursor-blink-time = /desktop/gnome/interface/cursor_blink_time
1468 icon-theme = /desktop/gnome/interface/icon_theme
1469 gtk-theme = /desktop/gnome/interface/gtk_theme
1470
1471=== modified file 'schemas/org.gnome.desktop.interface.gschema.xml'
1472--- schemas/org.gnome.desktop.interface.gschema.xml 2010-11-05 17:22:35 +0000
1473+++ schemas/org.gnome.desktop.interface.gschema.xml 2010-11-17 17:44:38 +0000
1474@@ -88,6 +88,14 @@
1475 Length of the cursor blink cycle, in milliseconds.
1476 </description>
1477 </key>
1478+ <key name="cursor-blink-timeout" type="i">
1479+ <range min="1" max="2147483647"/>
1480+ <default>10</default>
1481+ <summary>Cursor Blink Timeout</summary>
1482+ <description>
1483+ Time after which the cursor stops blinking, in seconds.
1484+ </description>
1485+ </key>
1486 <key name="icon-theme" type="s">
1487 <default>'gnome'</default>
1488 <summary>Icon Theme</summary>
1489@@ -190,7 +198,7 @@
1490 </description>
1491 </key>
1492 <key name="cursor-theme" type="s">
1493- <default>'dmz-aa'</default>
1494+ <default>'Adwaita'</default>
1495 <summary>Cursor theme</summary>
1496 <description>Cursor theme name. Used only by Xservers that support the Xcursor extension.</description>
1497 </key>

Subscribers

People subscribed via source and target branches

to all changes: