Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gbrainy for openSUSE:Factory checked in at 2022-05-19 22:49:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gbrainy (Old) and /work/SRC/openSUSE:Factory/.gbrainy.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gbrainy" Thu May 19 22:49:34 2022 rev:65 rq:978057 version:2.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gbrainy/gbrainy.changes 2021-04-15 16:58:52.110812073 +0200 +++ /work/SRC/openSUSE:Factory/.gbrainy.new.1538/gbrainy.changes 2022-05-19 22:50:07.402396668 +0200 @@ -1,0 +2,6 @@ +Thu May 19 06:52:55 UTC 2022 - Dominique Leuenberger <[email protected]> + +- Update to version 2.4.4: + + Updated translations. + +------------------------------------------------------------------- Old: ---- gbrainy-2.4.3.tar.gz New: ---- gbrainy-2.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gbrainy.spec ++++++ --- /var/tmp/diff_new_pack.ws8fvd/_old 2022-05-19 22:50:07.958397381 +0200 +++ /var/tmp/diff_new_pack.ws8fvd/_new 2022-05-19 22:50:07.966397391 +0200 @@ -1,7 +1,7 @@ # # spec file for package gbrainy # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gbrainy -Version: 2.4.3 +Version: 2.4.4 Release: 0 Summary: A brain teaser game and trainer License: GPL-2.0-or-later ++++++ gbrainy-2.4.3.tar.gz -> gbrainy-2.4.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/Makefile.in new/gbrainy-2.4.4/Makefile.in --- old/gbrainy-2.4.3/Makefile.in 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/Makefile.in 2022-01-06 08:57:29.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -154,9 +154,6 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/src/Clients/WebForms/AssemblyInfo.cs.in \ @@ -201,6 +198,8 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -224,6 +223,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -235,6 +236,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GBRAINY_CFLAGS = @GBRAINY_CFLAGS@ @@ -575,7 +577,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -722,7 +723,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/NEWS new/gbrainy-2.4.4/NEWS --- old/gbrainy-2.4.3/NEWS 2021-01-01 10:54:15.000000000 +0100 +++ new/gbrainy-2.4.4/NEWS 2022-01-06 08:55:17.000000000 +0100 @@ -1,5 +1,8 @@ gbrainy NEWS +Version 2.4.4 +* Updated translations + Version 2.4.3 * Updated & fixes in translations * Fixes crash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/aclocal.m4 new/gbrainy-2.4.4/aclocal.m4 --- old/gbrainy-2.4.3/aclocal.m4 2021-01-01 10:18:03.000000000 +0100 +++ new/gbrainy-2.4.4/aclocal.m4 2022-01-06 08:57:28.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.2 -*- Autoconf -*- +# generated automatically by aclocal 1.16.4 -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -24,7 +24,7 @@ # Owen Taylor 1997-2001 # Increment this whenever this file is changed. -#serial 3 +#serial 4 dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, @@ -116,7 +116,7 @@ dnl checks the results of pkg-config to some extent) dnl rm -f conf.glibtest - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <glib.h> #include <stdio.h> #include <stdlib.h> @@ -184,7 +184,7 @@ } return 1; } -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +]])],[],[no_glib=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"]) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi @@ -206,10 +206,10 @@ ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <glib.h> #include <stdio.h> -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], +]], [[ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ]])], [ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLib or finding the wrong" echo "*** version of GLib. If it is not finding GLib, you'll need to set your" @@ -1978,11 +1978,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -9967,19 +9967,19 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software -dnl Foundation, Inc. +# nls.m4 serial 6 (gettext-0.20.2) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2020 Free +dnl Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public +dnl the GNU General Public License or the GNU Lesser General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU +dnl by the GNU Lesser General Public License, and the rest of the GNU dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. @@ -10496,7 +10496,7 @@ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) ]) -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10511,7 +10511,7 @@ [am__api_version='1.16' 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.16.2], [], +m4_if([$1], [1.16.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -10527,14 +10527,14 @@ # 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.16.2])dnl +[AM_AUTOMAKE_VERSION([1.16.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10586,7 +10586,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10617,7 +10617,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10808,7 +10808,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10876,7 +10876,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10940,7 +10940,7 @@ [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -10992,6 +10992,20 @@ [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -11073,7 +11087,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11094,7 +11108,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11116,7 +11130,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11151,7 +11165,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11194,7 +11208,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11215,12 +11229,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -11235,7 +11244,7 @@ # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11262,7 +11271,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11291,7 +11300,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11338,7 +11347,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11357,7 +11366,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11438,7 +11447,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11498,7 +11507,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11526,7 +11535,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2020 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11545,7 +11554,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2020 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/compile new/gbrainy-2.4.4/compile --- old/gbrainy-2.4.3/compile 2020-09-13 19:36:06.000000000 +0200 +++ new/gbrainy-2.4.4/compile 2021-09-10 02:21:31.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/configure new/gbrainy-2.4.4/configure --- old/gbrainy-2.4.3/configure 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/configure 2022-01-06 08:57:29.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gbrainy 2.4.3. +# Generated by GNU Autoconf 2.69 for gbrainy 2.4.4. # # Report bugs to <https://gitlab.gnome.org/GNOME/gbrainy/issues/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='gbrainy' PACKAGE_TARNAME='gbrainy' -PACKAGE_VERSION='2.4.3' -PACKAGE_STRING='gbrainy 2.4.3' +PACKAGE_VERSION='2.4.4' +PACKAGE_STRING='gbrainy 2.4.4' PACKAGE_BUGREPORT='https://gitlab.gnome.org/GNOME/gbrainy/issues/' PACKAGE_URL='' @@ -773,6 +773,9 @@ AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +CSCOPE +ETAGS +CTAGS am__untar am__tar AMTAR @@ -1436,7 +1439,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 gbrainy 2.4.3 to adapt to many kinds of systems. +\`configure' configures gbrainy 2.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1507,7 +1510,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gbrainy 2.4.3:";; + short | recursive ) echo "Configuration of gbrainy 2.4.4:";; esac cat <<\_ACEOF @@ -1658,7 +1661,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gbrainy configure 2.4.3 +gbrainy configure 2.4.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2027,7 +2030,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gbrainy $as_me 2.4.3, which was +It was created by gbrainy $as_me 2.4.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2379,7 +2382,7 @@ # Version for assemblies: Major.Minor.Build.Revision -ASSEMBLY_VERSION=2.4.3.0 +ASSEMBLY_VERSION=2.4.4.0 ac_config_headers="$ac_config_headers config.h" @@ -2590,12 +2593,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -2900,7 +2898,7 @@ # Define the identity of the package. PACKAGE='gbrainy' - VERSION='2.4.3' + VERSION='2.4.4' cat >>confdefs.h <<_ACEOF @@ -3066,6 +3064,20 @@ +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi + +if test -z "$ETAGS"; then + ETAGS=etags +fi + +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi + + # 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 @@ -8141,11 +8153,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + 10.0,*86*-darwin8*|10.0,*-darwin[912]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[012][,.]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -15150,7 +15162,7 @@ fi -COPYRIGHT="(c) 2007-2021 Jordi Mas i Hernandez" +COPYRIGHT="(c) 2007-2022 Jordi Mas i Hernandez" @@ -15721,7 +15733,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gbrainy $as_me 2.4.3, which was +This file was extended by gbrainy $as_me 2.4.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15787,7 +15799,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gbrainy config.status 2.4.3 +gbrainy config.status 2.4.4 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/gbrainy-2.4.3/configure.ac new/gbrainy-2.4.4/configure.ac --- old/gbrainy-2.4.3/configure.ac 2021-01-01 10:17:53.000000000 +0100 +++ new/gbrainy-2.4.4/configure.ac 2022-01-06 08:55:19.000000000 +0100 @@ -1,7 +1,7 @@ # Define gbrainy version m4_define([gbrainy_version_major], [2]) m4_define([gbrainy_version_minor], [4]) -m4_define([gbrainy_version_revision], [3]) +m4_define([gbrainy_version_revision], [4]) m4_define([concat], $1$2$3$4) @@ -138,7 +138,7 @@ dnl --- Assembly information -COPYRIGHT="(c) 2007-2021 Jordi Mas i Hernandez" +COPYRIGHT="(c) 2007-2022 Jordi Mas i Hernandez" AC_SUBST(COPYRIGHT) dnl --- Prologue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/data/Makefile.in new/gbrainy-2.4.4/data/Makefile.in --- old/gbrainy-2.4.3/data/Makefile.in 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/data/Makefile.in 2022-01-06 08:57:29.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -177,6 +177,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -188,6 +190,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GBRAINY_CFLAGS = @GBRAINY_CFLAGS@ @@ -641,7 +644,6 @@ cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/data/gbrainy.appdata.xml.in new/gbrainy-2.4.4/data/gbrainy.appdata.xml.in --- old/gbrainy-2.4.3/data/gbrainy.appdata.xml.in 2021-01-01 10:14:53.000000000 +0100 +++ new/gbrainy-2.4.4/data/gbrainy.appdata.xml.in 2022-01-06 08:55:14.000000000 +0100 @@ -19,7 +19,12 @@ </_p> </description> <releases> - <release version="2.4.3" type="stable" date="2021-1-1"> + <release version="2.4.4" type="stable" date="2022-1-6"> + <description> + <p>Update translations</p> + </description> + </release> + <release version="2.4.3" date="2021-1-1"> </release> </releases> <kudos> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/help/Makefile.in new/gbrainy-2.4.4/help/Makefile.in --- old/gbrainy-2.4.3/help/Makefile.in 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/help/Makefile.in 2022-01-06 08:57:29.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -149,6 +151,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GBRAINY_CFLAGS = @GBRAINY_CFLAGS@ @@ -364,7 +367,6 @@ cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/help/ca/ca.po new/gbrainy-2.4.4/help/ca/ca.po --- old/gbrainy-2.4.3/help/ca/ca.po 2020-12-31 08:49:16.000000000 +0100 +++ new/gbrainy-2.4.4/help/ca/ca.po 2021-07-25 22:56:29.000000000 +0200 @@ -43,7 +43,7 @@ #. (itstool) path: page/title #: C/customgame.page:20 msgid "Custom games selection" -msgstr "Selecci?? dels jocs per una partida personalitzada" +msgstr "Seleccionar els jocs per a una partida personalitzada" #. (itstool) path: page/p #: C/customgame.page:21 @@ -289,7 +289,7 @@ #. (itstool) path: section/title #: C/pause.page:23 msgid "Pause and resume a game" -msgstr "Fer pausa o continuar una partida" +msgstr "Fer pausa o reprendre una partida" #. (itstool) path: section/p #: C/pause.page:24 @@ -332,7 +332,7 @@ #. (itstool) path: section/title #: C/pause.page:58 msgid "End a game" -msgstr "Finalitza una partida" +msgstr "Finalitzar una partida" #. (itstool) path: section/p #: C/pause.page:59 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/help/ca/customgame.page new/gbrainy-2.4.4/help/ca/customgame.page --- old/gbrainy-2.4.3/help/ca/customgame.page 2021-01-01 10:56:25.000000000 +0100 +++ new/gbrainy-2.4.4/help/ca/customgame.page 2022-01-06 08:51:30.000000000 +0100 @@ -22,7 +22,7 @@ </mal:credit> </info> - <title>Selecci?? dels jocs per una partida personalitzada</title> + <title>Seleccionar els jocs per a una partida personalitzada</title> <p>??s possible jugar a una selecci?? personalitzada de jocs amb el <app>gbrainy</app>.</p> <p>Per a fer-ho, procediu de la manera seg??ent:</p> <steps> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/help/ca/pause.page new/gbrainy-2.4.4/help/ca/pause.page --- old/gbrainy-2.4.3/help/ca/pause.page 2021-01-01 10:56:25.000000000 +0100 +++ new/gbrainy-2.4.4/help/ca/pause.page 2022-01-06 08:51:30.000000000 +0100 @@ -25,7 +25,7 @@ <title>Fer pausa o finalitzar una partida</title> <section id="pause-pause"> - <title>Fer pausa o continuar una partida</title> + <title>Fer pausa o reprendre una partida</title> <p>Per a fer pausa a una partida i aix?? poder continuar-la al mateix punt m??s endavant, feu una de les accions seg??ents:</p> <list> <item> @@ -47,7 +47,7 @@ </section> <section id="pause-stop"> - <title>Finalitza una partida</title> + <title>Finalitzar una partida</title> <p>Per a finalitzar la partida, feu una de les accions seg??ents:</p> <list> <item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/help/es/es.po new/gbrainy-2.4.4/help/es/es.po --- old/gbrainy-2.4.3/help/es/es.po 2019-05-25 20:36:18.000000000 +0200 +++ new/gbrainy-2.4.4/help/es/es.po 2021-09-12 18:32:36.000000000 +0200 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gbrainy.help.master\n" -"POT-Creation-Date: 2018-03-11 09:21+0000\n" +"POT-Creation-Date: 2020-07-18 16:33+0000\n" "PO-Revision-Date: 2018-04-03 11:23+0200\n" "Last-Translator: Daniel Mustieles <[email protected]>\n" "Language-Team: es <[email protected]>\n" @@ -40,9 +40,9 @@ #. (itstool) path: license/p #: C/customgame.page:16 C/gametypes.page:13 C/pause.page:16 C/tips.page:16 -#: C/difficulty.page:16 C/history.page:13 C/multiplayer.page:15 -#: C/score.page:15 C/gameplay.page:16 C/index.page:19 C/newgame.page:18 -#: C/times.page:15 C/export.page:14 +#: C/difficulty.page:16 C/history.page:13 C/multiplayer.page:15 C/score.page:15 +#: C/gameplay.page:16 C/index.page:19 C/newgame.page:18 C/times.page:15 +#: C/export.page:14 msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Compartir Igual 3.0" @@ -199,7 +199,7 @@ "Unported license." msgstr "" "Este trabajo est?? licenciado bajo una Licencia Creative Commons Atribuci??n - " -"Compartir igual 3.0 sin soporte." +"Compartir igual 3.0 no portada." #. (itstool) path: page/p #: C/license.page:18 @@ -796,13 +796,6 @@ #. (itstool) path: page/p #: C/gameplay.page:30 -#| msgid "" -#| "You can choose different difficulty levels making <app>gbrainy</app> " -#| "enjoyable for kids, adults or senior citizens. It also features a game " -#| "history, personal records, tips and fullscreen mode support. " -#| "<app>gbrainy</app> can also be <link href=\"https://wiki.gnome.org/" -#| "gbrainy/Extending\">extended</link> easily with new games developed by " -#| "third parties." msgid "" "You can choose different difficulty levels making <app>gbrainy</app> " "enjoyable for kids, adults or senior citizens. It also features a game " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/help/es/license.page new/gbrainy-2.4.4/help/es/license.page --- old/gbrainy-2.4.3/help/es/license.page 2021-01-01 10:56:26.000000000 +0100 +++ new/gbrainy-2.4.4/help/es/license.page 2022-01-06 08:51:31.000000000 +0100 @@ -20,7 +20,7 @@ </info> <title>Licencia</title> - <p>Este trabajo est?? licenciado bajo una Licencia Creative Commons Atribuci??n - Compartir igual 3.0 sin soporte.</p> + <p>Este trabajo est?? licenciado bajo una Licencia Creative Commons Atribuci??n - Compartir igual 3.0 no portada.</p> <p>Es libre de:</p> <terms> <item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/install-sh new/gbrainy-2.4.4/install-sh --- old/gbrainy-2.4.3/install-sh 2020-09-13 19:36:06.000000000 +0200 +++ new/gbrainy-2.4.4/install-sh 2021-09-10 02:21:31.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to [email protected]. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -488,6 +493,13 @@ then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -502,9 +514,9 @@ # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/ltmain.sh new/gbrainy-2.4.4/ltmain.sh --- old/gbrainy-2.4.3/ltmain.sh 2019-05-25 20:36:24.000000000 +0200 +++ new/gbrainy-2.4.4/ltmain.sh 2022-01-06 08:51:06.000000000 +0100 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-10" +VERSION="2.4.6 Debian-2.4.6-15" package_revision=2.4.6 @@ -387,7 +387,7 @@ # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -2141,7 +2141,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-10 + version: $progname $scriptversion Debian-2.4.6-15 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -7368,10 +7368,12 @@ # -stdlib=* select c++ std lib with clang # -fsanitize=* Clang/GCC memory and address sanitizer # -fuse-ld=* Linker select flags for GCC + # -static-* direct GCC to link specific libraries statically + # -fcilkplus Cilk Plus language extension features for C/C++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*) + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/missing new/gbrainy-2.4.4/missing --- old/gbrainy-2.4.3/missing 2020-09-13 19:36:06.000000000 +0200 +++ new/gbrainy-2.4.4/missing 2021-09-10 02:21:31.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/po/ca.po new/gbrainy-2.4.4/po/ca.po --- old/gbrainy-2.4.3/po/ca.po 2020-12-29 23:09:16.000000000 +0100 +++ new/gbrainy-2.4.4/po/ca.po 2021-11-29 10:28:59.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: gbrainy\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-02-14 16:20+0100\n" -"PO-Revision-Date: 2018-01-28 09:11+0100\n" +"PO-Revision-Date: 2021-08-08 09:11+0100\n" "Last-Translator: Jordi Mas <[email protected]>\n" "Language-Team: Softcatal??\n" "Language: ca\n" @@ -637,7 +637,7 @@ #: ../data/games.xml.h:115 msgid "She was born 31st of December and she said this on 1st of January." -msgstr "Va n??ixer al 31 de desembre i va dir aix?? l'1 de gener." +msgstr "Va n??ixer el 31 de desembre i va dir aix?? l'1 de gener." #: ../data/games.xml.h:116 ../data/verbal_analogies.xml.h:376 msgid "Direction" @@ -703,7 +703,7 @@ "gbrainy is a game to train memory, arithmetical and logical capabilities " "with many sorts of exercises of different difficulty levels" msgstr "" -"gbrainy ??s un joc per a exercitar la mem??ria, i les vostres habilitats " +"gbrainy ??s un joc per a exercitar la mem??ria i les habilitats " "aritm??tiques i l??giques amb molts tipus d'exercicis de diferents nivells de " "dificultat" @@ -712,7 +712,7 @@ "gbrainy is a game to train memory, arithmetical and logical capabilities " "with many sorts of exercises of different difficulty levels." msgstr "" -"gbrainy ??s un joc per a exercitar la mem??ria, i les vostres habilitats " +"gbrainy ??s un joc per a exercitar la mem??ria i les habilitats " "aritm??tiques i l??giques amb molts tipus d'exercicis de diferents nivells de " "dificultat." @@ -809,7 +809,7 @@ #: ../data/verbal_analogies.xml.h:16 msgid "Dog and horse are species and terrier and pony are breeds." -msgstr "Gos i cavall s??n especies i terrier i poni s??n races." +msgstr "Gos i cavall s??n esp??cies i terrier i poni s??n races." #: ../data/verbal_analogies.xml.h:17 msgid "The word 'taxidermist' is used to define a person that?" @@ -3717,7 +3717,7 @@ #: ../src/Core/Views/FinishView.cs:175 msgid "For details on how gbrainy's scoring works refer to the help." msgstr "" -"Per detalls de com funciona la puntuaci?? del gbrainy consulteu l'ajuda." +"Per a detalls de com funciona la puntuaci?? del gbrainy consulteu l'ajuda." #: ../src/Core/Views/FinishView.cs:187 msgid "Tips for your next games" @@ -4523,7 +4523,7 @@ "in common, then rotate the resulting figure 45 degrees." msgstr "" "Superposeu la primera i la segona figura i suprimiu les l??nies que tenen en " -"com?? i gireu la figura resultant 45 graus." +"com??, llavors gireu la figura resultant 45 graus." #: ../src/Games/Logic/PuzzleFigures.cs:56 msgid "Figures" @@ -5564,10 +5564,10 @@ "{0} hours ago it was as long after {1:h tt} as it was before {2:h tt} on the " "same day. What is the time now? Answer using the hour (e.g.: {3:h tt})" msgstr[0] "" -"Fa {0} hora est??vem tant lluny de les {1:%H} com de les {2:%H} al mateix " +"Fa {0} hora est??vem tan lluny de les {1:%H} com de les {2:%H} al mateix " "dia. Quina hora ??s ara? Responeu usant l'hora (p. ex.: {3:%H})" msgstr[1] "" -"Fa {0} hores est??vem tant lluny de les {1:%H} com de les {2:%H} al mateix " +"Fa {0} hores est??vem tan lluny de les {1:%H} com de les {2:%H} al mateix " "dia. Quina hora ??s ara? Responeu usant l'hora (p. ex.: {3:%H})" #: ../src/Games/Logic/PuzzleTimeNow.cs:52 @@ -5580,10 +5580,10 @@ "to convert it to the present time." msgstr[0] "" "Heu de calcular l'hora que est?? a mig cam?? entre les hores donades, i " -"llavors afegir {0} hora per a convertir-ho al temps present." +"llavors afegir-hi {0} hora per a convertir-la al temps present." msgstr[1] "" "Heu de calcular l'hora que est?? a mig cam?? entre les hores donades, i " -"llavors afegir {0} hores per a convertir-ho al temps present." +"llavors afegir-hi {0} hores per a convertir-la al temps present." #. TimeNow Puzzle. Translators: {0} is used to check the hour answered by the user. #. Use the right time format specification for your culture @@ -5606,7 +5606,7 @@ #: ../src/Games/Logic/PuzzleTrains.cs:50 msgid "The distance formula is 'distance = rate x time'." -msgstr "La f??rmula de la dist??ncia ??s ??dist??ncia = rati x temps??." +msgstr "La f??rmula de la dist??ncia ??s ??dist??ncia = velocitat x temps??." #. Translators: #. - mph (miles per hour). You must localize this using the right unit of speed for your locale @@ -5640,7 +5640,7 @@ "the time and dividing it by the difference of speeds." msgstr "" "Per a calcular la resposta, multipliqueu la velocitat del primer tren pel " -"temps i dividint-la per la difer??ncia de les velocitats." +"temps i dividiu-la per la difer??ncia de les velocitats." #. Translators: #. - mph (miles per hour) and miles must be localized this using the right unit of speed for your locale @@ -6105,7 +6105,7 @@ #: ../src/Games/Memory/MemoryWords.cs:92 msgid "bear" -msgstr "??s" +msgstr "os" #: ../src/Games/Memory/MemoryWords.cs:93 msgid "wolf" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/po/es.po new/gbrainy-2.4.4/po/es.po --- old/gbrainy-2.4.3/po/es.po 2020-11-27 22:53:49.000000000 +0100 +++ new/gbrainy-2.4.4/po/es.po 2021-08-08 22:21:08.000000000 +0200 @@ -6,21 +6,21 @@ # Eduardo Retamales <[email protected]>, 2007, 2008. # Joaqu??n Ignacio Aramend??a <[email protected]>, 2011. # Jorge Gonz??lez <[email protected]>, 2007, 2008, 2010, 2011. -# Daniel Mustieles <[email protected]>, 2010-2019. +# Daniel Mustieles <[email protected]>, 2010-2021. # msgid "" msgstr "" "Project-Id-Version: gbrainy.master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gbrainy/issues\n" -"POT-Creation-Date: 2020-07-18 16:33+0000\n" -"PO-Revision-Date: 2019-02-14 14:49+0100\n" +"POT-Creation-Date: 2021-01-01 09:53+0000\n" +"PO-Revision-Date: 2021-05-17 10:46+0200\n" "Last-Translator: Daniel Mustieles <[email protected]>\n" -"Language-Team: es <[email protected]>\n" -"Language: es\n" +"Language-Team: Spanish - Spain <[email protected]>\n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 3.31.90\n" +"X-Generator: Gtranslator 40.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/games.xml.h:1 @@ -262,18 +262,19 @@ "[legs] legs. How many horses are present?" msgstr[0] "" "En una carrera de caballos hay personas y caballos. Puedes contar [eyes] ojo " -"y [legs] pierna. ??Cu??ntos caballos hay?" +"y [legs] pierna/pata. ??Cu??ntos caballos hay?" msgstr[1] "" "En una carrera de caballos hay personas y caballos. Puedes contar [eyes] " -"ojos y [legs] piernas. ??Cu??ntos caballos hay?" +"ojos y [legs] piernas/patas. ??Cu??ntos caballos hay?" #: ../data/games.xml.h:45 msgid "" "Every person has two legs and every horse four (2 * [men] + [horses] * 4). " "Every person and every horse have also two eyes (2 * [men] + 2 * [horses])." msgstr "" -"Cada persona tiene dos piernas y cada caballo, cuatro (2 * [men] + [horses] " -"* 4). Cada persona y cada caballo tienen dos ojos (2 * [men] + 2 * [horses])." +"Cada persona tiene dos piernas y cada caballo, cuatro patas (2 * [men] + " +"[horses] * 4). Cada persona y cada caballo tienen dos ojos (2 * [men] + 2 * " +"[horses])." #: ../data/games.xml.h:46 msgid "Lever" @@ -293,7 +294,7 @@ "Consider the sentence attributed to Archimedes: 'Give me a lever long enough " "and a place to stand and I can move the Earth'." msgstr "" -"Considera la afirmaci??n atribu??da a Arqu??medes: ??dadme una palanca lo " +"Considera la afirmaci??n atribuida a Arqu??medes: ??dadme una palanca lo " "suficientemente larga y un punto de apoyo donde situarla y mover?? la Tierra??." #: ../data/games.xml.h:49 @@ -2962,7 +2963,7 @@ msgid "Resume" msgstr "Reanudar" -#: ../src/Clients/Classical/gbrainy.cs:753 +#: ../src/Clients/Classical/gbrainy.cs:748 #, csharp-format msgid "Startup time {0}" msgstr "Tiempo de inicio {0}" @@ -3053,18 +3054,14 @@ msgstr "??nd_ice" #: ../src/Clients/Classical/gbrainy.ui.h:25 -msgid "How to Extend gbrainy's Functionality" -msgstr "C??mo extender las funcionalidades de gbrainy" - -#: ../src/Clients/Classical/gbrainy.ui.h:26 msgid "Answer:" msgstr "Respuesta:" -#: ../src/Clients/Classical/gbrainy.ui.h:27 +#: ../src/Clients/Classical/gbrainy.ui.h:26 msgid "_Next" msgstr "_Siguiente" -#: ../src/Clients/Classical/gbrainy.ui.h:28 +#: ../src/Clients/Classical/gbrainy.ui.h:27 msgid "_Tip" msgstr "_Pista" @@ -4130,7 +4127,7 @@ "How many two digit numbers occur where the first digit is larger than the " "second (e.g.: 20 and 21)?" msgstr "" -"??Cua??tos n??meros de dos d??gitos existen donde el primer d??gito es mayor que " +"??Cu??ntos n??meros de dos d??gitos existen donde el primer d??gito es mayor que " "el segundo (ej. 20 y 21)?" #: ../src/Games/Logic/PuzzleCountSeries.cs:72 @@ -5901,7 +5898,7 @@ #: ../src/Games/Memory/MemoryWords.cs:86 msgid "rainbow" -msgstr "arcoiris" +msgstr "arco??ris" #. Animals #: ../src/Games/Memory/MemoryWords.cs:89 @@ -6115,6 +6112,9 @@ "doble de tiempo. ??Cu??ntas horas tardar??n en limpiar el almac??n si trabajan " "juntos? [option_answers]" +#~ msgid "How to Extend gbrainy's Functionality" +#~ msgstr "C??mo extender las funcionalidades de gbrainy" + #~ msgid "Add-in Manager" #~ msgstr "Gestor de complementos" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/src/Clients/Classical/Makefile.in new/gbrainy-2.4.4/src/Clients/Classical/Makefile.in --- old/gbrainy-2.4.3/src/Clients/Classical/Makefile.in 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/src/Clients/Classical/Makefile.in 2022-01-06 08:57:29.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -171,6 +171,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -182,6 +184,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GBRAINY_CFLAGS = @GBRAINY_CFLAGS@ @@ -516,7 +519,6 @@ cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/src/Core/Makefile.in new/gbrainy-2.4.4/src/Core/Makefile.in --- old/gbrainy-2.4.3/src/Core/Makefile.in 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/src/Core/Makefile.in 2022-01-06 08:57:29.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -149,6 +151,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GBRAINY_CFLAGS = @GBRAINY_CFLAGS@ @@ -443,7 +446,6 @@ cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/src/Games/Makefile.in new/gbrainy-2.4.4/src/Games/Makefile.in --- old/gbrainy-2.4.3/src/Games/Makefile.in 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/src/Games/Makefile.in 2022-01-06 08:57:29.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -149,6 +151,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GBRAINY_CFLAGS = @GBRAINY_CFLAGS@ @@ -451,7 +454,6 @@ cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/src/Makefile.in new/gbrainy-2.4.4/src/Makefile.in --- old/gbrainy-2.4.3/src/Makefile.in 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/src/Makefile.in 2022-01-06 08:57:29.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,8 +149,6 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -198,6 +196,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -209,6 +209,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GBRAINY_CFLAGS = @GBRAINY_CFLAGS@ @@ -496,7 +497,6 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/tests/Makefile.in new/gbrainy-2.4.4/tests/Makefile.in --- old/gbrainy-2.4.3/tests/Makefile.in 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/tests/Makefile.in 2022-01-06 08:57:29.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -149,6 +151,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GBRAINY_CFLAGS = @GBRAINY_CFLAGS@ @@ -392,7 +395,6 @@ cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gbrainy-2.4.3/tools/Makefile.in new/gbrainy-2.4.4/tools/Makefile.in --- old/gbrainy-2.4.3/tools/Makefile.in 2021-01-01 10:18:04.000000000 +0100 +++ new/gbrainy-2.4.4/tools/Makefile.in 2022-01-06 08:57:29.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -138,6 +138,8 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CSC = @CSC@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -149,6 +151,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GBRAINY_CFLAGS = @GBRAINY_CFLAGS@ @@ -370,7 +373,6 @@ cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am
