Hello community, here is the log from the commit of package five-or-more for openSUSE:Factory checked in at 2014-10-15 16:26:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/five-or-more (Old) and /work/SRC/openSUSE:Factory/.five-or-more.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "five-or-more" Changes: -------- --- /work/SRC/openSUSE:Factory/five-or-more/five-or-more.changes 2014-09-30 19:40:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.five-or-more.new/five-or-more.changes 2014-10-15 16:27:16.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 13 20:39:31 UTC 2014 - [email protected] + +- Update to version 3.14.1: + + Updated translations. + +------------------------------------------------------------------- Old: ---- five-or-more-3.14.0.tar.xz New: ---- five-or-more-3.14.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ five-or-more.spec ++++++ --- /var/tmp/diff_new_pack.KtpzYE/_old 2014-10-15 16:27:17.000000000 +0200 +++ /var/tmp/diff_new_pack.KtpzYE/_new 2014-10-15 16:27:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: five-or-more -Version: 3.14.0 +Version: 3.14.1 Release: 0 Summary: "Five or More" Game for GNOME License: GPL-2.0+ ++++++ five-or-more-3.14.0.tar.xz -> five-or-more-3.14.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/Makefile.in new/five-or-more-3.14.1/Makefile.in --- old/five-or-more-3.14.0/Makefile.in 2014-09-22 22:27:35.000000000 +0200 +++ new/five-or-more-3.14.1/Makefile.in 2014-10-13 21:37:14.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -354,8 +354,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -554,10 +554,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -599,9 +605,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/NEWS new/five-or-more-3.14.1/NEWS --- old/five-or-more-3.14.0/NEWS 2014-09-22 22:18:16.000000000 +0200 +++ new/five-or-more-3.14.1/NEWS 2014-10-13 21:36:37.000000000 +0200 @@ -1,3 +1,8 @@ +3.14.1 - October 13, 2014 +============================ + +* Updated translations + 3.14.0 - September 22, 2014 ============================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/aclocal.m4 new/five-or-more-3.14.1/aclocal.m4 --- old/five-or-more-3.14.0/aclocal.m4 2014-09-22 22:27:33.000000000 +0200 +++ new/five-or-more-3.14.1/aclocal.m4 2014-10-13 21:37:12.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -20,6 +20,143 @@ 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'.])]) +# gnome-common.m4 +# +# serial 3 +# + +dnl GNOME_COMMON_INIT + +AU_DEFUN([GNOME_COMMON_INIT], +[ + dnl this macro should come after AC_CONFIG_MACRO_DIR + AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) + + dnl ensure that when the Automake generated makefile calls aclocal, + dnl it honours the $ACLOCAL_FLAGS environment variable + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" + if test -n "$ac_macro_dir"; then + ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" + fi + + AC_SUBST([ACLOCAL_AMFLAGS]) +], +[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" +in your top-level Makefile.am, instead, where "m4" is the macro directory set +with AC_CONFIG_MACRO_DIR() in your configure.ac]]) + +AU_DEFUN([GNOME_DEBUG_CHECK], +[ + AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG]) +], +[[$0: This macro is deprecated. You should use AX_CHECK_ENABLE_DEBUG instead and +replace uses of GNOME_ENABLE_DEBUG with ENABLE_DEBUG. +See: http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html#ax_check_enable_debug]]) + +dnl GNOME_MAINTAINER_MODE_DEFINES () +dnl define DISABLE_DEPRECATED +dnl +AU_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +[ + AC_REQUIRE([AM_MAINTAINER_MODE]) + + DISABLE_DEPRECATED="" + if test $USE_MAINTAINER_MODE = yes; then + DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" + for DOMAIN in $DOMAINS; do + DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" + done + fi + + AC_SUBST(DISABLE_DEPRECATED) +], +[[$0: This macro is deprecated. All of the modules it disables deprecations for +are obsolete. Remove it and all uses of DISABLE_DEPRECATED.]]) + +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(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>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) + +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 42 IT_PROG_INTLTOOL @@ -236,7 +373,7 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 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, @@ -483,143 +620,6 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR -# gnome-common.m4 -# -# serial 3 -# - -dnl GNOME_COMMON_INIT - -AU_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) - - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" - fi - - AC_SUBST([ACLOCAL_AMFLAGS]) -], -[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" -in your top-level Makefile.am, instead, where "m4" is the macro directory set -with AC_CONFIG_MACRO_DIR() in your configure.ac]]) - -AU_DEFUN([GNOME_DEBUG_CHECK], -[ - AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG]) -], -[[$0: This macro is deprecated. You should use AX_CHECK_ENABLE_DEBUG instead and -replace uses of GNOME_ENABLE_DEBUG with ENABLE_DEBUG. -See: http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html#ax_check_enable_debug]]) - -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AU_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) - - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi - - AC_SUBST(DISABLE_DEPRECATED) -], -[[$0: This macro is deprecated. All of the modules it disables deprecations for -are obsolete. Remove it and all uses of DISABLE_DEPRECATED.]]) - -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl - -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi - - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas - -mostlyclean-am: clean-gsettings-schemas - -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) - -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ - -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas - -.SECONDARY: $(gsettings_SCHEMAS) - -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi - -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) - -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(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>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) - -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - AC_DEFUN([YELP_HELP_INIT], [ AC_REQUIRE([AC_PROG_LN_S]) @@ -846,10 +846,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -865,7 +865,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -1232,6 +1232,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -1340,7 +1346,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell [email protected] about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1348,7 +1395,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -1496,38 +1542,6 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. @@ -1598,6 +1612,70 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/config.h.in new/five-or-more-3.14.1/config.h.in --- old/five-or-more-3.14.0/config.h.in 2014-09-22 22:27:34.000000000 +0200 +++ new/five-or-more-3.14.1/config.h.in 2014-10-13 21:37:14.000000000 +0200 @@ -3,9 +3,6 @@ /* The gettext package name */ #undef GETTEXT_PACKAGE -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/configure new/five-or-more-3.14.1/configure --- old/five-or-more-3.14.0/configure 2014-09-22 22:27:34.000000000 +0200 +++ new/five-or-more-3.14.1/configure 2014-10-13 21:37:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Five or More 3.14.0. +# Generated by GNU Autoconf 2.69 for Five or More 3.14.1. # # Report bugs to <https://bugzilla.gnome.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='Five or More' PACKAGE_TARNAME='five-or-more' -PACKAGE_VERSION='3.14.0' -PACKAGE_STRING='Five or More 3.14.0' +PACKAGE_VERSION='3.14.1' +PACKAGE_STRING='Five or More 3.14.1' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/' PACKAGE_URL='https://wiki.gnome.org/Apps/Five%20or%20more' @@ -1294,7 +1294,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 Five or More 3.14.0 to adapt to many kinds of systems. +\`configure' configures Five or More 3.14.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1360,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Five or More 3.14.0:";; + short | recursive ) echo "Configuration of Five or More 3.14.1:";; esac cat <<\_ACEOF @@ -1473,7 +1473,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Five or More configure 3.14.0 +Five or More configure 3.14.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1641,7 +1641,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Five or More $as_me 3.14.0, which was +It was created by Five or More $as_me 3.14.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1989,7 +1989,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2504,7 +2504,7 @@ # Define the identity of the package. PACKAGE='five-or-more' - VERSION='3.14.0' + VERSION='3.14.1' cat >>confdefs.h <<_ACEOF @@ -2555,6 +2555,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell [email protected] about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -3485,6 +3526,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -3613,131 +3713,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { 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; } && - test -f conftest2.$ac_objext && { { 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 - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { 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_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { 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; } && - test -f conftest2.$ac_objext && { { 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 - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - @@ -5638,7 +5613,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Five or More $as_me 3.14.0, which was +This file was extended by Five or More $as_me 3.14.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5705,7 +5680,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Five or More config.status 3.14.0 +Five or More config.status 3.14.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/configure.ac new/five-or-more-3.14.1/configure.ac --- old/five-or-more-3.14.0/configure.ac 2014-09-22 22:16:47.000000000 +0200 +++ new/five-or-more-3.14.1/configure.ac 2014-10-13 21:36:40.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([Five or More], [3.14.0], [https://bugzilla.gnome.org/], +AC_INIT([Five or More], [3.14.1], [https://bugzilla.gnome.org/], [five-or-more], [https://wiki.gnome.org/Apps/Five%20or%20more]) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) AM_SILENT_RULES([yes]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/data/Makefile.in new/five-or-more-3.14.1/data/Makefile.in --- old/five-or-more-3.14.0/data/Makefile.in 2014-09-22 22:27:35.000000000 +0200 +++ new/five-or-more-3.14.1/data/Makefile.in 2014-10-13 21:37:14.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/data/icons/HighContrast/Makefile.in new/five-or-more-3.14.1/data/icons/HighContrast/Makefile.in --- old/five-or-more-3.14.0/data/icons/HighContrast/Makefile.in 2014-09-22 22:27:35.000000000 +0200 +++ new/five-or-more-3.14.1/data/icons/HighContrast/Makefile.in 2014-10-13 21:37:14.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/data/icons/Makefile.in new/five-or-more-3.14.1/data/icons/Makefile.in --- old/five-or-more-3.14.0/data/icons/Makefile.in 2014-09-22 22:27:35.000000000 +0200 +++ new/five-or-more-3.14.1/data/icons/Makefile.in 2014-10-13 21:37:14.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/data/icons/hicolor/Makefile.in new/five-or-more-3.14.1/data/icons/hicolor/Makefile.in --- old/five-or-more-3.14.0/data/icons/hicolor/Makefile.in 2014-09-22 22:27:35.000000000 +0200 +++ new/five-or-more-3.14.1/data/icons/hicolor/Makefile.in 2014-10-13 21:37:14.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/help/Makefile.in new/five-or-more-3.14.1/help/Makefile.in --- old/five-or-more-3.14.0/help/Makefile.in 2014-09-22 22:27:35.000000000 +0200 +++ new/five-or-more-3.14.1/help/Makefile.in 2014-10-13 21:37:14.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/missing new/five-or-more-3.14.1/missing --- old/five-or-more-3.14.0/missing 2014-09-22 22:27:35.000000000 +0200 +++ new/five-or-more-3.14.1/missing 2014-10-13 21:37:14.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/po/it.po new/five-or-more-3.14.1/po/it.po --- old/five-or-more-3.14.0/po/it.po 2014-09-22 22:15:33.000000000 +0200 +++ new/five-or-more-3.14.1/po/it.po 2014-10-13 21:35:56.000000000 +0200 @@ -5,23 +5,23 @@ # Alessio Frusciante <[email protected]>. 2003. # Francesco Marletta <[email protected]>. 2002-2006. # Gruppo traduzione Italiano di Ubuntu <[email protected]>, 2007-2008 -# Milo Casagrande <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Milo Casagrande <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # msgid "" msgstr "" "Project-Id-Version: five-or-more\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=five-"; "or-more&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-03-09 05:54+0000\n" -"PO-Revision-Date: 2014-03-09 13:23+0100\n" -"Last-Translator: Milo Casagrande <[email protected]>\n" +"POT-Creation-Date: 2014-10-06 16:53+0000\n" +"PO-Revision-Date: 2014-10-09 13:12+0100\n" +"Last-Translator: Milo Casagrande <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 1.6.4\n" +"X-Generator: Poedit 1.6.9\n" #: ../data/five-or-more.appdata.xml.in.h:1 msgid "" @@ -44,7 +44,7 @@ "tempo possibile, finché il tavolo di gioco non è pieno!" #: ../data/five-or-more.desktop.in.h:1 ../data/five-or-more.ui.h:1 -#: ../src/glines.c:1181 ../src/glines.c:1687 +#: ../src/five-or-more.c:1174 ../src/five-or-more.c:1675 msgid "Five or More" msgstr "Cinque o più" @@ -56,9 +56,10 @@ msgid "game;strategy;logic;" msgstr "gioco;giochi;strategia;logica;" -#: ../data/five-or-more-preferences.ui.h:1 -msgid "Five or More Preferences" -msgstr "Preferenze di Cinque o più" +#: ../data/five-or-more-preferences.ui.h:1 ../data/menu.ui.h:3 +#: ../src/five-or-more.c:173 +msgid "Preferences" +msgstr "Preferenze" #: ../data/five-or-more-preferences.ui.h:2 msgid "Appearance" @@ -108,8 +109,12 @@ msgid "Score:" msgstr "Punteggio:" -#: ../data/five-or-more.ui.h:5 ../src/games-stock.c:48 -msgid "Start a new game" +#: ../data/five-or-more.ui.h:5 +msgid "_New Game" +msgstr "_Nuova partita" + +#: ../data/five-or-more.ui.h:6 +msgid "Start a new puzzle" msgstr "Inizia una nuova partita" #: ../data/menu.ui.h:1 ../src/games-scores-dialog.c:385 @@ -120,10 +125,6 @@ msgid "Scores" msgstr "Punteggi" -#: ../data/menu.ui.h:3 ../src/glines.c:176 -msgid "Preferences" -msgstr "Preferenze" - #: ../data/menu.ui.h:4 msgid "Help" msgstr "Aiuto" @@ -208,248 +209,26 @@ msgid "true if the window is maximized" msgstr "VERO se la finestra è massimizzata" -#: ../data/org.gnome.five-or-more.gschema.xml.h:18 -msgid "true if the window is fullscren" -msgstr "VERO se la finestra è a schermo intero" - -#. Score dialog column header for the score time (e.g. 1 minute) -#: ../src/games-scores-dialog.c:132 -msgctxt "score-dialog" -msgid "Time" -msgstr "Tempo" - -#. Score dialog column header for the score value (e.g. 30 moves) -#: ../src/games-scores-dialog.c:138 -msgctxt "score-dialog" -msgid "Score" -msgstr "Punteggio" - -#. Score format for time based scores. %1$d is the time in minutes, %2$d is the time in seconds -#: ../src/games-scores-dialog.c:225 -#, c-format -msgctxt "score-dialog" -msgid "%1$dm %2$ds" -msgstr "%1$dm %2$ds" - -#. Score dialog column header for the date the score was recorded -#: ../src/games-scores-dialog.c:478 -msgid "Date" -msgstr "Data" - -#: ../src/games-stock.c:41 -msgid "View help for this game" -msgstr "Mostra la guida di questo gioco" - -#: ../src/games-stock.c:42 -msgid "End the current game" -msgstr "Finisce la partita in corso" - -#: ../src/games-stock.c:43 -msgid "Toggle fullscreen mode" -msgstr "Entra in modalità a schermo intero" - -#: ../src/games-stock.c:44 -msgid "Get a hint for your next move" -msgstr "Mostra un indizio per la tua prossima mossa" - -#: ../src/games-stock.c:45 -msgid "Leave fullscreen mode" -msgstr "Lascia la modalità a schermo intero" - -#: ../src/games-stock.c:46 -msgid "Start a new multiplayer network game" -msgstr "Avvia una nuova partita multi-giocatore in rete" - -#: ../src/games-stock.c:47 -msgid "End the current network game and return to network server" -msgstr "Termina la partita in rete e torna al server" - -#: ../src/games-stock.c:49 -msgid "Pause the game" -msgstr "Mette la partita in pausa" - -#: ../src/games-stock.c:50 -msgid "Show a list of players in the network game" -msgstr "Mostra l'elenco dei giocatori nella partita in rete" - -#: ../src/games-stock.c:51 -msgid "Redo the undone move" -msgstr "Ripete l'ultima mossa" - -#: ../src/games-stock.c:52 -msgid "Restart the game" -msgstr "Ricomincia la partita" - -#: ../src/games-stock.c:53 -msgid "Resume the paused game" -msgstr "Riprende la partita in pausa" - -#: ../src/games-stock.c:54 -msgid "View the scores" -msgstr "Mostra i punteggi" - -#: ../src/games-stock.c:55 -msgid "Undo the last move" -msgstr "Annulla l'ultima mossa" - -#: ../src/games-stock.c:56 -msgid "About this game" -msgstr "Informazioni su questo gioco" - -#: ../src/games-stock.c:57 -msgid "Close this window" -msgstr "Chiude questa finestra" - -#: ../src/games-stock.c:58 -msgid "Configure the game" -msgstr "Configura il gioco" - -#: ../src/games-stock.c:59 -msgid "Quit this game" -msgstr "Esce da questo gioco" - -#: ../src/games-stock.c:247 -msgid "_Contents" -msgstr "_Sommario" - -#: ../src/games-stock.c:248 -msgid "_Fullscreen" -msgstr "Schermo _intero" - -#: ../src/games-stock.c:249 -msgid "_Hint" -msgstr "_Indizio" - -#. Translators: This "_New" is for the menu item 'Game->New', implies "New Game" -#: ../src/games-stock.c:251 -msgid "_New" -msgstr "_Nuovo" - -#. Translators: This "_New Game" is for the game-over dialogue -#: ../src/games-stock.c:253 -msgid "_New Game" -msgstr "_Nuova partita" - -#: ../src/games-stock.c:254 -msgid "_Redo Move" -msgstr "_Ripeti mossa" - -#. Translators: this is the "Reset" scores button in a scores dialogue -#: ../src/games-stock.c:256 -msgid "_Reset" -msgstr "A_zzera" - -#. Translators: "_Restart" is the menu item 'Game->Restart', implies "Restart Game" -#: ../src/games-stock.c:258 -msgid "_Restart" -msgstr "_Ricomincia" - -#: ../src/games-stock.c:259 -msgid "_Undo Move" -msgstr "_Annulla mossa" - -#: ../src/games-stock.c:260 -msgid "_Deal" -msgstr "Di_stribuisci" - -#: ../src/games-stock.c:261 -msgid "_Leave Fullscreen" -msgstr "_Finestra normale" - -#: ../src/games-stock.c:262 -msgid "Network _Game" -msgstr "Partita in _rete" - -#: ../src/games-stock.c:263 -msgid "L_eave Game" -msgstr "Abbandona _partita" - -#: ../src/games-stock.c:264 -msgid "Player _List" -msgstr "Elenco _giocatori" - -#: ../src/games-stock.c:265 -msgid "_Pause" -msgstr "_Pausa" - -#: ../src/games-stock.c:266 -msgid "Res_ume" -msgstr "Ripr_endi" - -#: ../src/games-stock.c:267 -msgid "_Scores" -msgstr "_Punteggi" - -#: ../src/games-stock.c:268 -msgid "_End Game" -msgstr "_Fine gioco" - -#. %s is replaced with the name of the game in gnome-games. -#: ../src/games-stock.c:317 -#, c-format -msgid "" -"%s 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 %d of the License, or (at your option) any later " -"version." -msgstr "" -"%s è software libero; è lecito redistribuirlo o modificarlo secondo i " -"termini della GNU General Public License come pubblicata dalla Free Software " -"Foundation; o la versione %d o (a propria scelta) una versione successiva." - -#: ../src/games-stock.c:322 -#, c-format -msgid "" -"%s 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." -msgstr "" -"%s è distribuito nella speranza che sia utile, ma SENZA ALCUNA GARANZIA; " -"senza neppure la garanzia implicita di NEGOZIABILITÀ o di APPLICABILITÀ PER " -"UN PARTICOLARE SCOPO. Si veda la licenza GNU General Public License per " -"maggiori dettagli." - -#: ../src/games-stock.c:327 -#, c-format -msgid "" -"You should have received a copy of the GNU General Public License along with " -"%s; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, " -"Fifth Floor, Boston, MA 02110-1301 USA" -msgstr "" -"Una copia della licenza GNU General Public License è disponibile con %s; se " -"così non fosse, scrivere alla Free Software Foundation, Inc., 51 Franklin " -"Street, Fifth Floor, Boston, MA 02110-1301 USA" - -#: ../src/games-stock.c:331 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"this program. If not, see <http://www.gnu.org/licenses/>." -msgstr "" -"Una copia della licenza GNU General Public License dovrebbe essere " -"disponibile con questo programma. Se così non fosse, consultare <http://www."; -"gnu.org/licenses/>." - -#: ../src/glines.c:81 +#: ../src/five-or-more.c:80 msgctxt "board size" msgid "Small" msgstr "Piccola" -#: ../src/glines.c:82 +#: ../src/five-or-more.c:81 msgctxt "board size" msgid "Medium" msgstr "Media" -#: ../src/glines.c:83 +#: ../src/five-or-more.c:82 msgctxt "board size" msgid "Large" msgstr "Grande" -#: ../src/glines.c:170 +#: ../src/five-or-more.c:167 msgid "Could not load theme" msgstr "Impossibile caricare il tema" -#: ../src/glines.c:196 +#: ../src/five-or-more.c:193 #, c-format msgid "" "Unable to locate file:\n" @@ -462,7 +241,7 @@ "\n" "Verrà caricato invece il tema predefinito." -#: ../src/glines.c:203 +#: ../src/five-or-more.c:200 #, c-format msgid "" "Unable to locate file:\n" @@ -475,34 +254,28 @@ "\n" "Controllare l'installazione di Cinque o più." -#: ../src/glines.c:413 +#: ../src/five-or-more.c:410 msgid "Match five objects of the same type in a row to score!" msgstr "Allinea cinque oggetti dello stesso tipo per fare punti!" -#: ../src/glines.c:475 -#| msgid "Five or More" +#: ../src/five-or-more.c:471 msgid "Five or More Scores" msgstr "Punteggi Cinque o più" -#: ../src/glines.c:477 +#: ../src/five-or-more.c:473 msgid "_Board size:" msgstr "_Dimensione della tavola:" -#: ../src/glines.c:494 +#: ../src/five-or-more.c:490 msgid "Game Over!" msgstr "Fine gioco!" #. Can't move there! -#: ../src/glines.c:651 -#| msgid "You can't move there!" +#: ../src/five-or-more.c:646 msgid "You can’t move there!" msgstr "Non puoi spostare lì!" -#: ../src/glines.c:1183 -#| msgid "" -#| "GNOME port of the once-popular Color Lines game.\n" -#| "\n" -#| "Five or More is a part of GNOME Games." +#: ../src/five-or-more.c:1176 msgid "" "GNOME port of the once-popular Color Lines game\n" "\n" @@ -512,10 +285,184 @@ "\n" "Cinque o più fa parte dei Giochi di GNOME." -#: ../src/glines.c:1189 +#: ../src/five-or-more.c:1182 msgid "translator-credits" msgstr "" "Milo Casagrande <[email protected]>\n" "Gruppo traduzione Italiano di Ubuntu <[email protected]>\n" "Francesco Marletta <[email protected]>\n" "Fabrizio Stefani <[email protected]>" + +#. Score dialog column header for the score time (e.g. 1 minute) +#: ../src/games-scores-dialog.c:132 +msgctxt "score-dialog" +msgid "Time" +msgstr "Tempo" + +#. Score dialog column header for the score value (e.g. 30 moves) +#: ../src/games-scores-dialog.c:138 +msgctxt "score-dialog" +msgid "Score" +msgstr "Punteggio" + +#. Score format for time based scores. %1$d is the time in minutes, %2$d is the time in seconds +#: ../src/games-scores-dialog.c:225 +#, c-format +msgctxt "score-dialog" +msgid "%1$dm %2$ds" +msgstr "%1$dm %2$ds" + +#. Score dialog column header for the date the score was recorded +#: ../src/games-scores-dialog.c:478 +msgid "Date" +msgstr "Data" + +#~ msgid "Five or More Preferences" +#~ msgstr "Preferenze di Cinque o più" + +#~ msgid "true if the window is fullscren" +#~ msgstr "VERO se la finestra è a schermo intero" + +#~ msgid "View help for this game" +#~ msgstr "Mostra la guida di questo gioco" + +#~ msgid "End the current game" +#~ msgstr "Finisce la partita in corso" + +#~ msgid "Toggle fullscreen mode" +#~ msgstr "Entra in modalità a schermo intero" + +#~ msgid "Get a hint for your next move" +#~ msgstr "Mostra un indizio per la tua prossima mossa" + +#~ msgid "Leave fullscreen mode" +#~ msgstr "Lascia la modalità a schermo intero" + +#~ msgid "Start a new multiplayer network game" +#~ msgstr "Avvia una nuova partita multi-giocatore in rete" + +#~ msgid "End the current network game and return to network server" +#~ msgstr "Termina la partita in rete e torna al server" + +#~ msgid "Pause the game" +#~ msgstr "Mette la partita in pausa" + +#~ msgid "Show a list of players in the network game" +#~ msgstr "Mostra l'elenco dei giocatori nella partita in rete" + +#~ msgid "Redo the undone move" +#~ msgstr "Ripete l'ultima mossa" + +#~ msgid "Restart the game" +#~ msgstr "Ricomincia la partita" + +#~ msgid "Resume the paused game" +#~ msgstr "Riprende la partita in pausa" + +#~ msgid "View the scores" +#~ msgstr "Mostra i punteggi" + +#~ msgid "Undo the last move" +#~ msgstr "Annulla l'ultima mossa" + +#~ msgid "About this game" +#~ msgstr "Informazioni su questo gioco" + +#~ msgid "Close this window" +#~ msgstr "Chiude questa finestra" + +#~ msgid "Configure the game" +#~ msgstr "Configura il gioco" + +#~ msgid "Quit this game" +#~ msgstr "Esce da questo gioco" + +#~ msgid "_Contents" +#~ msgstr "_Sommario" + +#~ msgid "_Fullscreen" +#~ msgstr "Schermo _intero" + +#~ msgid "_Hint" +#~ msgstr "_Indizio" + +#~ msgid "_New" +#~ msgstr "_Nuovo" + +#~ msgid "_Redo Move" +#~ msgstr "_Ripeti mossa" + +#~ msgid "_Reset" +#~ msgstr "A_zzera" + +#~ msgid "_Restart" +#~ msgstr "_Ricomincia" + +#~ msgid "_Undo Move" +#~ msgstr "_Annulla mossa" + +#~ msgid "_Deal" +#~ msgstr "Di_stribuisci" + +#~ msgid "_Leave Fullscreen" +#~ msgstr "_Finestra normale" + +#~ msgid "Network _Game" +#~ msgstr "Partita in _rete" + +#~ msgid "L_eave Game" +#~ msgstr "Abbandona _partita" + +#~ msgid "Player _List" +#~ msgstr "Elenco _giocatori" + +#~ msgid "_Pause" +#~ msgstr "_Pausa" + +#~ msgid "Res_ume" +#~ msgstr "Ripr_endi" + +#~ msgid "_Scores" +#~ msgstr "_Punteggi" + +#~ msgid "_End Game" +#~ msgstr "_Fine gioco" + +#~ msgid "" +#~ "%s 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 %d of the License, or (at your option) any " +#~ "later version." +#~ msgstr "" +#~ "%s è software libero; è lecito redistribuirlo o modificarlo secondo i " +#~ "termini della GNU General Public License come pubblicata dalla Free " +#~ "Software Foundation; o la versione %d o (a propria scelta) una versione " +#~ "successiva." + +#~ msgid "" +#~ "%s 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." +#~ msgstr "" +#~ "%s è distribuito nella speranza che sia utile, ma SENZA ALCUNA GARANZIA; " +#~ "senza neppure la garanzia implicita di NEGOZIABILITÀ o di APPLICABILITÀ " +#~ "PER UN PARTICOLARE SCOPO. Si veda la licenza GNU General Public License " +#~ "per maggiori dettagli." + +#~ msgid "" +#~ "You should have received a copy of the GNU General Public License along " +#~ "with %s; if not, write to the Free Software Foundation, Inc., 51 Franklin " +#~ "Street, Fifth Floor, Boston, MA 02110-1301 USA" +#~ msgstr "" +#~ "Una copia della licenza GNU General Public License è disponibile con %s; " +#~ "se così non fosse, scrivere alla Free Software Foundation, Inc., 51 " +#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" + +#~ msgid "" +#~ "You should have received a copy of the GNU General Public License along " +#~ "with this program. If not, see <http://www.gnu.org/licenses/>." +#~ msgstr "" +#~ "Una copia della licenza GNU General Public License dovrebbe essere " +#~ "disponibile con questo programma. Se così non fosse, consultare <http://"; +#~ "www.gnu.org/licenses/>." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.14.0/src/Makefile.in new/five-or-more-3.14.1/src/Makefile.in --- old/five-or-more-3.14.0/src/Makefile.in 2014-09-22 22:27:35.000000000 +0200 +++ new/five-or-more-3.14.1/src/Makefile.in 2014-10-13 21:37:15.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -415,14 +415,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` five_or_more-five-or-more.o: five-or-more.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(five_or_more_CPPFLAGS) $(CPPFLAGS) $(five_or_more_CFLAGS) $(CFLAGS) -MT five_or_more-five-or-more.o -MD -MP -MF $(DEPDIR)/five_or_more-five-or-more.Tpo -c -o five_or_more-five-or-more.o `test -f 'five-or-more.c' || echo '$(srcdir)/'`five-or-more.c -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
