diff -Nru hitori-3.20.0/configure hitori-3.22.0/configure --- hitori-3.20.0/configure 2016-03-21 19:03:59.000000000 +0000 +++ hitori-3.22.0/configure 2016-09-20 15:27:29.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Hitori 3.20.0. +# Generated by GNU Autoconf 2.69 for Hitori 3.22.0. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='Hitori' PACKAGE_TARNAME='hitori' -PACKAGE_VERSION='3.20.0' -PACKAGE_STRING='Hitori 3.20.0' +PACKAGE_VERSION='3.22.0' +PACKAGE_STRING='Hitori 3.22.0' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=hitori' PACKAGE_URL='https://wiki.gnome.org/Apps/Hitori' @@ -693,7 +693,10 @@ GLIB_COMPILE_RESOURCES CODE_COVERAGE_RULES CODE_COVERAGE_LDFLAGS +CODE_COVERAGE_LIBS +CODE_COVERAGE_CXXFLAGS CODE_COVERAGE_CFLAGS +CODE_COVERAGE_CPPFLAGS GENHTML LCOV GCOV @@ -1400,7 +1403,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 Hitori 3.20.0 to adapt to many kinds of systems. +\`configure' configures Hitori 3.22.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1470,7 +1473,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Hitori 3.20.0:";; + short | recursive ) echo "Configuration of Hitori 3.22.0:";; esac cat <<\_ACEOF @@ -1609,7 +1612,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Hitori configure 3.20.0 +Hitori configure 3.22.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1887,7 +1890,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Hitori $as_me 3.20.0, which was +It was created by Hitori $as_me 3.22.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2763,7 +2766,7 @@ # Define the identity of the package. PACKAGE='hitori' - VERSION='3.20.0' + VERSION='3.22.0' cat >>confdefs.h <<_ACEOF @@ -13187,7 +13190,7 @@ fi # List of supported lcov versions. - lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11" + lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11 1.12" # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 @@ -13305,8 +13308,14 @@ fi - CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" - CODE_COVERAGE_LDFLAGS="-lgcov" + CODE_COVERAGE_CPPFLAGS="-DNDEBUG" + CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_LIBS="-lgcov -lgcov" + CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS" + + + @@ -13318,6 +13327,7 @@ # # Optional: # - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. +# Multiple directories may be specified, separated by whitespace. # (Default: $(top_builddir)) # - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated # by lcov for code coverage. (Default: @@ -13325,13 +13335,26 @@ # - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage # reports to be created. (Default: # $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage, +# set to 0 to disable it and leave empty to stay with the default. +# (Default: empty) +# - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov +# instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) +# - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov +# instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) # - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov -# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance. -# (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) -# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. -# (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the +# collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov +# instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +# - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering +# lcov instance. (Default: empty) +# - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov +# instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +# - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the +# genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) # - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml -# instance. (Default: empty) +# instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) # - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore # # The generated report will be titled using the $(PACKAGE_NAME) and @@ -13342,21 +13365,44 @@ CODE_COVERAGE_DIRECTORY ?= $(top_builddir) CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage +CODE_COVERAGE_BRANCH_COVERAGE ?= +CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) -CODE_COVERAGE_GENHTML_OPTIONS ?= +CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?= +CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\ +$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULTS) CODE_COVERAGE_IGNORE_PATTERN ?= +code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V)) +code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_cap_0 = @echo " LCOV --capture"\ + $(CODE_COVERAGE_OUTPUT_FILE); +code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V)) +code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_ign_0 = @echo " LCOV --remove /tmp/*"\ + $(CODE_COVERAGE_IGNORE_PATTERN); +code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V)) +code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_genhtml_0 = @echo " GEN " $(CODE_COVERAGE_OUTPUT_DIRECTORY); code_coverage_quiet = $(code_coverage_quiet_$(V)) code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) code_coverage_quiet_0 = --quiet +# sanitizes the test-name: replaces with underscores: dashes and dots +code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1))) + # Use recursive makes in order to ignore errors during check check-code-coverage: ifeq ($(CODE_COVERAGE_ENABLED),yes) - -$(MAKE) $(AM_MAKEFLAGS) -k check - $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture + -$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check + $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture else @echo "Need to reconfigure with --enable-code-coverage" endif @@ -13364,10 +13410,10 @@ # Capture code coverage data code-coverage-capture: code-coverage-capture-hook ifeq ($(CODE_COVERAGE_ENABLED),yes) - $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) - $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" + $(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS) + $(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS) -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp - LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + $(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" else @echo "Need to reconfigure with --enable-code-coverage" @@ -13378,17 +13424,18 @@ ifeq ($(CODE_COVERAGE_ENABLED),yes) clean: code-coverage-clean +distclean: code-coverage-clean code-coverage-clean: -$(LCOV) --directory $(top_builddir) -z -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) - -find . -name "*.gcda" -o -name "*.gcov" -delete + -find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete endif GITIGNOREFILES ?= GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) -DISTCHECK_CONFIGURE_FLAGS ?= -DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage +A''M_DISTCHECK_CONFIGURE_FLAGS ?= +A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage .PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean ' @@ -15321,7 +15368,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Hitori $as_me 3.20.0, which was +This file was extended by Hitori $as_me 3.22.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15388,7 +15435,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Hitori config.status 3.20.0 +Hitori config.status 3.22.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru hitori-3.20.0/configure.ac hitori-3.22.0/configure.ac --- hitori-3.20.0/configure.ac 2016-03-21 18:59:59.000000000 +0000 +++ hitori-3.22.0/configure.ac 2016-09-20 15:24:49.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([Hitori],[3.20.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=hitori],[hitori],[https://wiki.gnome.org/Apps/Hitori]) +AC_INIT([Hitori],[3.22.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=hitori],[hitori],[https://wiki.gnome.org/Apps/Hitori]) AX_IS_RELEASE([git-directory]) AM_INIT_AUTOMAKE([check-news dist-xz no-dist-gzip subdir-objects]) diff -Nru hitori-3.20.0/data/org.gnome.Hitori.appdata.xml.in hitori-3.22.0/data/org.gnome.Hitori.appdata.xml.in --- hitori-3.20.0/data/org.gnome.Hitori.appdata.xml.in 2016-03-08 23:58:42.000000000 +0000 +++ hitori-3.22.0/data/org.gnome.Hitori.appdata.xml.in 2016-09-19 17:04:07.000000000 +0000 @@ -31,6 +31,7 @@ https://bugzilla.gnome.org/enter_bug.cgi?product=hitori http://www.gnome.org/friends/ https://help.gnome.org/users/hitori/stable/ + https://wiki.gnome.org/TranslationProject/LocalisationGuide philip_at_tecnocode.co.uk GNOME @@ -40,4 +41,26 @@ UserDocs hitori + + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + diff -Nru hitori-3.20.0/debian/changelog hitori-3.22.0/debian/changelog --- hitori-3.20.0/debian/changelog 2016-03-25 19:28:02.000000000 +0000 +++ hitori-3.22.0/debian/changelog 2016-09-22 17:07:39.000000000 +0000 @@ -1,3 +1,13 @@ +hitori (3.22.0-1) unstable; urgency=medium + + * Team upload. + * New upstream version 3.22.0. + * Switch to compat level 10. + Remove autotools-dev build-dependency. + * Declare compliance with Debian Policy 3.9.8. + + -- Markus Koschany Thu, 22 Sep 2016 19:07:39 +0200 + hitori (3.20.0-1) unstable; urgency=medium * Team upload. diff -Nru hitori-3.20.0/debian/compat hitori-3.22.0/debian/compat --- hitori-3.20.0/debian/compat 2016-03-25 19:28:02.000000000 +0000 +++ hitori-3.22.0/debian/compat 2016-09-22 17:07:39.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru hitori-3.20.0/debian/control hitori-3.22.0/debian/control --- hitori-3.20.0/debian/control 2016-03-25 19:28:02.000000000 +0000 +++ hitori-3.22.0/debian/control 2016-09-22 17:07:39.000000000 +0000 @@ -4,12 +4,11 @@ Maintainer: Debian Games Team Uploaders: Peter De Wachter Build-Depends: - autotools-dev, - debhelper (>= 9), + debhelper (>= 10), intltool, libgtk-3-dev (>= 3.15.0), yelp-tools -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Homepage: https://wiki.gnome.org/Apps/Hitori Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/hitori/ Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/hitori/ diff -Nru hitori-3.20.0/debian/rules hitori-3.22.0/debian/rules --- hitori-3.20.0/debian/rules 2016-03-25 19:28:02.000000000 +0000 +++ hitori-3.22.0/debian/rules 2016-09-22 17:07:39.000000000 +0000 @@ -4,7 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autotools_dev + dh $@ override_dh_auto_configure: dh_auto_configure -- \ diff -Nru hitori-3.20.0/help/Makefile.in hitori-3.22.0/help/Makefile.in --- hitori-3.20.0/help/Makefile.in 2016-03-21 19:04:00.000000000 +0000 +++ hitori-3.22.0/help/Makefile.in 2016-09-20 15:27:30.000000000 +0000 @@ -152,8 +152,11 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff -Nru hitori-3.20.0/help/sv/index.page hitori-3.22.0/help/sv/index.page --- hitori-3.20.0/help/sv/index.page 2016-03-21 19:04:07.000000000 +0000 +++ hitori-3.22.0/help/sv/index.page 2016-09-20 15:18:01.000000000 +0000 @@ -8,7 +8,7 @@ 2008–2010 -

Det här programmet är licensierat under Creative Commons Attribution-Share Alike 3.0 Unported License.

+

Det här verket är licensierat under licensen Creative Commons Erkännande-DelaLika 3.0 Unported.

 diff -Nru hitori-3.20.0/help/sv/legal.xml hitori-3.22.0/help/sv/legal.xml --- hitori-3.20.0/help/sv/legal.xml 2016-03-21 19:04:07.000000000 +0000 +++ hitori-3.22.0/help/sv/legal.xml 2016-09-20 15:18:01.000000000 +0000 @@ -1,6 +1,6 @@ -

Det här programmet är licensierat under Creative Commons Attributen-ShareAlike 3.0 Unported License.

+

Det här verket är licensierat under licensen Creative Commons Erkännande-DelaLika 3.0 Unported.

 diff -Nru hitori-3.20.0/help/sv/sv.po hitori-3.22.0/help/sv/sv.po --- hitori-3.20.0/help/sv/sv.po 2016-03-08 23:58:42.000000000 +0000 +++ hitori-3.22.0/help/sv/sv.po 2016-06-15 20:07:59.000000000 +0000 @@ -1,16 +1,16 @@ msgid "" msgstr "" "Project-Id-Version: Hitori-Doc\n" -"POT-Creation-Date: 2015-05-31 10:06+0000\n" -"PO-Revision-Date: 2015-05-31 18:44+0100\n" -"Last-Translator: Erik Sköldås \n" +"POT-Creation-Date: 2016-05-05 19:54+0000\n" +"PO-Revision-Date: 2016-06-14 22:17+0200\n" +"Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\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.7.5\n" +"X-Generator: Poedit 1.8.8\n" #. Put one translator per line, in the form NAME , YEAR1, YEAR2 msgctxt "_" @@ -157,9 +157,9 @@ "licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 Unported " "License." msgstr "" -"Det här programmet är licensierat under Creative Commons Attribution-Share Alike 3.0 " -"Unported License." +"Det här verket är licensierat under licensen Creative Commons Erkännande-" +"DelaLika 3.0 Unported." #. (itstool) path: page/title #: C/index.page:15 @@ -179,12 +179,12 @@ #. (itstool) path: p/link #: C/legal.xml:5 msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License" -msgstr "Creative Commons Attributen-ShareAlike 3.0 Unported License" +msgstr "Creative Commons Erkännande-DelaLika 3.0 Unported" #. (itstool) path: license/p #: C/legal.xml:4 msgid "This work is licensed under a <_:link-1/>." -msgstr "Det här programmet är licensierat under <_:link-1/>." +msgstr "Det här verket är licensierat under licensen <_:link-1/>." #. (itstool) path: info/desc #: C/playing.page:6 diff -Nru hitori-3.20.0/m4/ax_append_compile_flags.m4 hitori-3.22.0/m4/ax_append_compile_flags.m4 --- hitori-3.20.0/m4/ax_append_compile_flags.m4 2016-03-09 00:11:58.000000000 +0000 +++ hitori-3.22.0/m4/ax_append_compile_flags.m4 2016-09-20 15:17:22.000000000 +0000 @@ -4,7 +4,7 @@ # # SYNOPSIS # -# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS]) +# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) # # DESCRIPTION # @@ -20,6 +20,8 @@ # the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to # force the compiler to issue an error when a bad flag is given. # +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# # NOTE: This macro depends on the AX_APPEND_FLAG and # AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with # AX_APPEND_LINK_FLAGS. @@ -54,12 +56,12 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 4 +#serial 5 AC_DEFUN([AX_APPEND_COMPILE_FLAGS], [AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) for flag in $1; do - AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3]) + AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4]) done ])dnl AX_APPEND_COMPILE_FLAGS diff -Nru hitori-3.20.0/m4/ax_append_link_flags.m4 hitori-3.22.0/m4/ax_append_link_flags.m4 --- hitori-3.20.0/m4/ax_append_link_flags.m4 2016-03-09 00:11:58.000000000 +0000 +++ hitori-3.22.0/m4/ax_append_link_flags.m4 2016-09-20 15:17:22.000000000 +0000 @@ -4,7 +4,7 @@ # # SYNOPSIS # -# AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS]) +# AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) # # DESCRIPTION # @@ -19,6 +19,8 @@ # EXTRA-FLAGS FLAG". This can for example be used to force the linker to # issue an error when a bad flag is given. # +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# # NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG. # Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS. # @@ -52,12 +54,12 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 4 +#serial 5 AC_DEFUN([AX_APPEND_LINK_FLAGS], [AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) for flag in $1; do - AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3]) + AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4]) done ])dnl AX_APPEND_LINK_FLAGS diff -Nru hitori-3.20.0/m4/ax_code_coverage.m4 hitori-3.22.0/m4/ax_code_coverage.m4 --- hitori-3.20.0/m4/ax_code_coverage.m4 2016-03-09 00:11:58.000000000 +0000 +++ hitori-3.22.0/m4/ax_code_coverage.m4 2016-09-20 15:17:22.000000000 +0000 @@ -8,14 +8,15 @@ # # DESCRIPTION # -# Defines CODE_COVERAGE_CFLAGS and CODE_COVERAGE_LDFLAGS which should be -# included in the CFLAGS and LIBS/LDFLAGS variables of every build target -# (program or library) which should be built with code coverage support. -# Also defines CODE_COVERAGE_RULES which should be substituted in your -# Makefile; and $enable_code_coverage which can be used in subsequent -# configure output. CODE_COVERAGE_ENABLED is defined and substituted, and -# corresponds to the value of the --enable-code-coverage option, which -# defaults to being disabled. +# Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS, +# CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be +# included in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of +# every build target (program or library) which should be built with code +# coverage support. Also defines CODE_COVERAGE_RULES which should be +# substituted in your Makefile; and $enable_code_coverage which can be +# used in subsequent configure output. CODE_COVERAGE_ENABLED is defined +# and substituted, and corresponds to the value of the +# --enable-code-coverage option, which defaults to being disabled. # # Test also for gcov program and create GCOV variable that could be # substituted. @@ -32,8 +33,10 @@ # Makefile.am: # # @CODE_COVERAGE_RULES@ -# my_program_LIBS = ... $(CODE_COVERAGE_LDFLAGS) ... +# my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ... +# my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ... # my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ... +# my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ... # # This results in a "check-code-coverage" rule being added to any # Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module @@ -42,12 +45,17 @@ # (`make check`) and build a code coverage report detailing the code which # was touched, then print the URI for the report. # +# In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined +# instead of CODE_COVERAGE_LIBS. They are both still defined, but use of +# CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is +# deprecated. They have the same value. +# # This code was derived from Makefile.decl in GLib, originally licenced # under LGPLv2.1+. # # LICENSE # -# Copyright (c) 2012 Philip Withnall +# Copyright (c) 2012, 2016 Philip Withnall # Copyright (c) 2012 Xan Lopez # Copyright (c) 2012 Christian Persch # Copyright (c) 2012 Paolo Borelli @@ -67,7 +75,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see . -#serial 5 +#serial 17 AC_DEFUN([AX_CODE_COVERAGE],[ dnl Check for --enable-code-coverage @@ -104,7 +112,7 @@ ]) # List of supported lcov versions. - lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11" + lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11 1.12" AC_CHECK_PROG([LCOV], [lcov], [lcov]) AC_CHECK_PROG([GENHTML], [genhtml], [genhtml]) @@ -137,18 +145,26 @@ ]) dnl Build the code coverage flags + dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility + CODE_COVERAGE_CPPFLAGS="-DNDEBUG" CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" - CODE_COVERAGE_LDFLAGS="-lgcov" + CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_LIBS="-lgcov -lgcov" + CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS" + AC_SUBST([CODE_COVERAGE_CPPFLAGS]) AC_SUBST([CODE_COVERAGE_CFLAGS]) + AC_SUBST([CODE_COVERAGE_CXXFLAGS]) + AC_SUBST([CODE_COVERAGE_LIBS]) AC_SUBST([CODE_COVERAGE_LDFLAGS]) ]) -CODE_COVERAGE_RULES=' +[CODE_COVERAGE_RULES=' # Code coverage # # Optional: # - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. +# Multiple directories may be specified, separated by whitespace. # (Default: $(top_builddir)) # - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated # by lcov for code coverage. (Default: @@ -156,13 +172,26 @@ # - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage # reports to be created. (Default: # $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage, +# set to 0 to disable it and leave empty to stay with the default. +# (Default: empty) +# - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov +# instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) +# - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov +# instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) # - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov -# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance. -# (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) -# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. -# (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the +# collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov +# instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +# - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering +# lcov instance. (Default: empty) +# - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov +# instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +# - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the +# genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) # - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml -# instance. (Default: empty) +# instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) # - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore # # The generated report will be titled using the $(PACKAGE_NAME) and @@ -173,21 +202,44 @@ CODE_COVERAGE_DIRECTORY ?= $(top_builddir) CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage +CODE_COVERAGE_BRANCH_COVERAGE ?= +CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) -CODE_COVERAGE_GENHTML_OPTIONS ?= +CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?= +CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\ +$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULTS) CODE_COVERAGE_IGNORE_PATTERN ?= +code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V)) +code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_cap_0 = @echo " LCOV --capture"\ + $(CODE_COVERAGE_OUTPUT_FILE); +code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V)) +code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_ign_0 = @echo " LCOV --remove /tmp/*"\ + $(CODE_COVERAGE_IGNORE_PATTERN); +code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V)) +code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_genhtml_0 = @echo " GEN " $(CODE_COVERAGE_OUTPUT_DIRECTORY); code_coverage_quiet = $(code_coverage_quiet_$(V)) code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) code_coverage_quiet_0 = --quiet +# sanitizes the test-name: replaces with underscores: dashes and dots +code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1))) + # Use recursive makes in order to ignore errors during check check-code-coverage: ifeq ($(CODE_COVERAGE_ENABLED),yes) - -$(MAKE) $(AM_MAKEFLAGS) -k check - $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture + -$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check + $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture else @echo "Need to reconfigure with --enable-code-coverage" endif @@ -195,10 +247,10 @@ # Capture code coverage data code-coverage-capture: code-coverage-capture-hook ifeq ($(CODE_COVERAGE_ENABLED),yes) - $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) - $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" + $(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS) + $(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS) -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp - LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + $(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" else @echo "Need to reconfigure with --enable-code-coverage" @@ -209,20 +261,21 @@ ifeq ($(CODE_COVERAGE_ENABLED),yes) clean: code-coverage-clean +distclean: code-coverage-clean code-coverage-clean: -$(LCOV) --directory $(top_builddir) -z -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) - -find . -name "*.gcda" -o -name "*.gcov" -delete + -find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete endif GITIGNOREFILES ?= GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) -DISTCHECK_CONFIGURE_FLAGS ?= -DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage +A''M_DISTCHECK_CONFIGURE_FLAGS ?= +A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage .PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean -' +'] AC_SUBST([CODE_COVERAGE_RULES]) m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])]) diff -Nru hitori-3.20.0/m4/nls.m4 hitori-3.22.0/m4/nls.m4 --- hitori-3.20.0/m4/nls.m4 2016-03-09 00:11:58.000000000 +0000 +++ hitori-3.22.0/m4/nls.m4 2016-09-20 15:17:22.000000000 +0000 @@ -1,6 +1,6 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, -dnl Inc. +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software +dnl 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. diff -Nru hitori-3.20.0/m4/pkg.m4 hitori-3.22.0/m4/pkg.m4 --- hitori-3.20.0/m4/pkg.m4 2016-03-09 00:11:58.000000000 +0000 +++ hitori-3.22.0/m4/pkg.m4 2016-09-20 15:17:22.000000000 +0000 @@ -1,29 +1,60 @@ -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -45,18 +76,19 @@ PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -66,8 +98,10 @@ $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -79,10 +113,11 @@ else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -90,19 +125,17 @@ else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl @@ -156,16 +189,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -176,16 +233,18 @@ AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -196,13 +255,15 @@ AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -211,4 +272,4 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR diff -Nru hitori-3.20.0/Makefile.in hitori-3.22.0/Makefile.in --- hitori-3.20.0/Makefile.in 2016-03-21 19:04:00.000000000 +0000 +++ hitori-3.22.0/Makefile.in 2016-09-20 15:27:30.000000000 +0000 @@ -312,8 +312,11 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ diff -Nru hitori-3.20.0/NEWS hitori-3.22.0/NEWS --- hitori-3.20.0/NEWS 2016-03-21 19:03:21.000000000 +0000 +++ hitori-3.22.0/NEWS 2016-09-20 15:26:05.000000000 +0000 @@ -1,5 +1,15 @@ Major new features in version... +3.22.0: +* Various AppData fixes +* Translations: +** fa (Arash Mousavi) +** fur (Fabio Tomat) +** oc (Cédric Valmary) +** pl (Piotr Drąg) +** pt (Sérgio Cardeira) +** sv (Anders Jonsson) + 3.20.0: * Various AppData fixes * Fix a GTK+ warning about styling with newer GTK+ versions diff -Nru hitori-3.20.0/po/ca@valencia.po hitori-3.22.0/po/ca@valencia.po --- hitori-3.20.0/po/ca@valencia.po 2014-09-16 22:35:21.000000000 +0000 +++ hitori-3.22.0/po/ca@valencia.po 2016-08-12 10:28:21.000000000 +0000 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2014-09-05 00:21+0200\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" diff -Nru hitori-3.20.0/po/en_GB.po hitori-3.22.0/po/en_GB.po --- hitori-3.20.0/po/en_GB.po 2016-03-21 18:58:11.000000000 +0000 +++ hitori-3.22.0/po/en_GB.po 2016-08-12 10:28:21.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2007-09-03 16:09+0100\n" "Last-Translator: Philip Withnall \n" "Language-Team: British English \n" -"Language: \n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru hitori-3.20.0/po/es.po hitori-3.22.0/po/es.po --- hitori-3.20.0/po/es.po 2015-01-31 19:42:26.000000000 +0000 +++ hitori-3.22.0/po/es.po 2016-08-12 10:28:21.000000000 +0000 @@ -13,7 +13,7 @@ "PO-Revision-Date: 2014-12-22 12:27+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español; Castellano \n" -"Language: \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru hitori-3.20.0/po/fa.po hitori-3.22.0/po/fa.po --- hitori-3.20.0/po/fa.po 1970-01-01 00:00:00.000000000 +0000 +++ hitori-3.22.0/po/fa.po 2016-09-19 17:02:15.000000000 +0000 @@ -0,0 +1,182 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Arash Mousavi , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=hitori&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2016-09-14 11:27+0430\n" +"PO-Revision-Date: 2016-09-14 11:37+0430\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.9\n" +"Last-Translator: Arash Mousavi \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: fa_IR\n" + +#: ../data/org.gnome.Hitori.desktop.in.h:1 ../data/hitori.ui.h:1 +#: ../src/main.c:101 +msgid "Hitori" +msgstr "هیتوری" + +#. Translators: the brief summary of the application as it appears in a software center. +#: ../data/org.gnome.Hitori.desktop.in.h:2 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:4 +msgid "Play the Hitori puzzle game" +msgstr "بازی پازلِ هیتوری را بازی کنید" + +#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list MUST also end with a semicolon! +#: ../data/org.gnome.Hitori.desktop.in.h:4 +msgid "puzzle;game;logic;grid;" +msgstr "puzzle;game;logic;grid;پازل;بازی;منطق;شبکه;" + +#. Translators: the name of the application as it appears in a software center +#: ../data/org.gnome.Hitori.appdata.xml.in.h:2 +msgid "GNOME Hitori" +msgstr "گنوم هیتوری" + +#. Translators: These are the application description paragraphs in the AppData file. +#: ../data/org.gnome.Hitori.appdata.xml.in.h:6 +msgid "Hitori is a logic game similar to the popular game of Sudoku." +msgstr "هیتوری یک بازی منطق است مشابه بازی معروف سودوکو." + +#: ../data/org.gnome.Hitori.appdata.xml.in.h:7 +msgid "" +"You play the game against the clock, aiming to eliminate all the duplicate " +"numbers in each row and column in the fastest time. Multiple sizes of game " +"board are supported, and you can place markers on cells to help work out the " +"solution. If you get stuck, the game can give you a hint." +msgstr "" +"شما این بازی را در مقابل زمان انجام می‌دهید، با هدف اینکه در سریع‌ترین زمان " +"ممکن تمام اعداد تکراری در هر ردیف و ستون را حذف کنید. اندازه‌های متفاوتی از " +"تخته بازی پشتیبانی می‌شوند، و شما می‌توانید علامت‌هایی در خانه‌های جدول قرار " +"دهید تا برای پیدا کردن راه حل شما را کمک کنند. اگر گیر کردید، بازی می‌تواند " +"شما را راهنمایی کند." + +#: ../data/hitori-menus.ui.h:1 ../src/main.c:305 +msgid "_New Game" +msgstr "_بازی جدید" + +#: ../data/hitori-menus.ui.h:2 +msgid "Board _Size" +msgstr "ا_ندازه تخته" + +#: ../data/hitori-menus.ui.h:3 +msgid "5×5" +msgstr "۵×۵" + +#: ../data/hitori-menus.ui.h:4 +msgid "6×6" +msgstr "۶×۶" + +#: ../data/hitori-menus.ui.h:5 +msgid "7×7" +msgstr "۷×۷" + +#: ../data/hitori-menus.ui.h:6 +msgid "8×8" +msgstr "۸×۸" + +#: ../data/hitori-menus.ui.h:7 +msgid "9×9" +msgstr "۹×۹" + +#: ../data/hitori-menus.ui.h:8 +msgid "10×10" +msgstr "۱۰×۱۰" + +#: ../data/hitori-menus.ui.h:9 +msgid "_Help" +msgstr "_راهنما" + +#: ../data/hitori-menus.ui.h:10 +msgid "_About" +msgstr "_درباره" + +#: ../data/hitori-menus.ui.h:11 ../src/rules.c:272 +msgid "_Quit" +msgstr "_خروج" + +#: ../data/hitori.ui.h:2 +msgid "Undo your last move" +msgstr "برگرداندن آخرین حرکت خود" + +#: ../data/hitori.ui.h:3 +msgid "Redo a move" +msgstr "انجام دوباره حرکت" + +#: ../data/hitori.ui.h:4 +msgid "Get a hint for your next move" +msgstr "یک راهنمایی در مورد حرکت بعدی خود بگیرید" + +#: ../data/org.gnome.hitori.gschema.xml.h:1 +msgid "Board size" +msgstr "اندازه تخته" + +#: ../data/org.gnome.hitori.gschema.xml.h:2 +msgid "The size of the board, in cells." +msgstr "اندازه تخته بر اساس تعداد خانه‌ها." + +#: ../src/interface.c:635 +msgid "The help contents could not be displayed" +msgstr "محتویات راهنما نمی‌تواند نمایش داده شود." + +#: ../src/interface.c:659 +msgid "Copyright © 2007–2010 Philip Withnall" +msgstr "حق رونوشت © ۲۰۰۷-۲۰۱۰ فیلیپ ویتنال" + +#: ../src/interface.c:660 +msgid "A logic puzzle originally designed by Nikoli" +msgstr "یک بازی پازل منطق که در ابتدا توسط Nikoli ساخته شده است" + +#: ../src/interface.c:662 +msgid "translator-credits" +msgstr "آرش موسوی " + +#: ../src/interface.c:666 +msgid "Hitori Website" +msgstr "پایگاه وب هیتوری" + +#: ../src/main.c:209 +msgid "Enable debug mode" +msgstr "فعال‌سازی حالت رفع‌اشکال" + +#. Translators: This means to choose a number as the "seed" for random number generation used when creating a board +#: ../src/main.c:211 +msgid "Seed the board generation" +msgstr "عدد اتفاقی برای ساخت تخته بازی" + +#. Options +#: ../src/main.c:225 +msgid "- Play a game of Hitori" +msgstr "- انجام یک بازی هیتوری" + +#. Print an error +#: ../src/main.c:235 +#, c-format +msgid "Command line options could not be parsed: %s\n" +msgstr "گزینه‌های خط فرمان را نمی‌توان تجزیه کرد: %s\n" + +#: ../src/main.c:301 +msgid "Do you want to stop the current game?" +msgstr "آیا می‌خواهید که بازی فعلی را متوقف کنید؟" + +#: ../src/main.c:304 +msgid "Keep _Playing" +msgstr "ادامه دادن _بازی" + +#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; the second parameter is +#. * the number of seconds. +#: ../src/rules.c:267 +#, c-format +msgid "You’ve won in a time of %02u:%02u!" +msgstr "شما در زمان %I02u:%I02u برنده شدید!" + +#: ../src/rules.c:273 +msgid "_Play Again" +msgstr "_بازی مجدد" diff -Nru hitori-3.20.0/po/fr.po hitori-3.22.0/po/fr.po --- hitori-3.20.0/po/fr.po 2015-04-13 21:17:12.000000000 +0000 +++ hitori-3.22.0/po/fr.po 2016-08-12 10:28:21.000000000 +0000 @@ -15,7 +15,7 @@ "PO-Revision-Date: 2015-02-24 01:49+0100\n" "Last-Translator: Erwan GEORGET \n" "Language-Team: Français >\n" -"Language: fr \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru hitori-3.20.0/po/fur.po hitori-3.22.0/po/fur.po --- hitori-3.20.0/po/fur.po 2015-04-13 21:17:12.000000000 +0000 +++ hitori-3.22.0/po/fur.po 2016-06-15 20:07:59.000000000 +0000 @@ -8,41 +8,43 @@ "Project-Id-Version: hitori master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=hitori&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2015-04-11 21:58+0000\n" -"PO-Revision-Date: 2015-04-12 09:33+0100\n" +"POT-Creation-Date: 2016-04-08 00:20+0000\n" +"PO-Revision-Date: 2016-04-08 10:19+0200\n" "Last-Translator: Fabio Tomat \n" "Language-Team: Friulian \n" "Language: fur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" -#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:1 ../src/main.c:101 +#: ../data/org.gnome.Hitori.desktop.in.h:1 ../data/hitori.ui.h:1 +#: ../src/main.c:101 msgid "Hitori" msgstr "Hitori" #. Translators: the brief summary of the application as it appears in a software center. -#: ../data/hitori.desktop.in.h:2 ../data/hitori.appdata.xml.in.h:4 +#: ../data/org.gnome.Hitori.desktop.in.h:2 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:4 msgid "Play the Hitori puzzle game" msgstr "Zuie al berdei Hitori" #. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list MUST also end with a semicolon! -#: ../data/hitori.desktop.in.h:4 +#: ../data/org.gnome.Hitori.desktop.in.h:4 msgid "puzzle;game;logic;grid;" msgstr "puzzle;zûc;logjiche;gridele;" #. Translators: the name of the application as it appears in a software center -#: ../data/hitori.appdata.xml.in.h:2 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:2 msgid "GNOME Hitori" msgstr "GNOME Hitori" #. Translators: These are the application description paragraphs in the AppData file. -#: ../data/hitori.appdata.xml.in.h:6 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:6 msgid "Hitori is a logic game similar to the popular game of Sudoku." msgstr "Hitori al è un zûc di logjiche simil al Sudoku." -#: ../data/hitori.appdata.xml.in.h:7 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:7 msgid "" "You play the game against the clock, aiming to eliminate all the duplicate " "numbers in each row and column in the fastest time. Multiple sizes of game " @@ -117,23 +119,23 @@ msgid "The size of the board, in cells." msgstr "La dimension de taule in celis." -#: ../src/interface.c:630 +#: ../src/interface.c:635 msgid "The help contents could not be displayed" -msgstr "I contignûts dal jutori a no puedin sedi mostrâts" +msgstr "I contignûts dal jutori no puedin jessi mostrâts" -#: ../src/interface.c:654 +#: ../src/interface.c:659 msgid "Copyright © 2007–2010 Philip Withnall" msgstr "Copyright © 2007–2010 Philip Withnall" -#: ../src/interface.c:655 +#: ../src/interface.c:660 msgid "A logic puzzle originally designed by Nikoli" msgstr "Un berdei di logjiche progjetât in origjin di Nikoli" -#: ../src/interface.c:657 +#: ../src/interface.c:662 msgid "translator-credits" msgstr "Fabio Tomat " -#: ../src/interface.c:661 +#: ../src/interface.c:666 msgid "Hitori Website" msgstr "Sît web di Hitori" diff -Nru hitori-3.20.0/po/LINGUAS hitori-3.22.0/po/LINGUAS --- hitori-3.20.0/po/LINGUAS 2016-03-08 23:58:42.000000000 +0000 +++ hitori-3.22.0/po/LINGUAS 2016-09-19 17:02:15.000000000 +0000 @@ -15,6 +15,7 @@ eo es eu +fa fi fr fur diff -Nru hitori-3.20.0/po/ne.po hitori-3.22.0/po/ne.po --- hitori-3.20.0/po/ne.po 2014-10-25 15:13:42.000000000 +0000 +++ hitori-3.22.0/po/ne.po 2016-08-12 10:28:21.000000000 +0000 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2014-09-23 21:56+0400\n" "Last-Translator: Pawan Chitrakar \n" "Language-Team: Nepali Translation Team \n" -"Language: \n" +"Language: ne\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru hitori-3.20.0/po/oc.po hitori-3.22.0/po/oc.po --- hitori-3.20.0/po/oc.po 2016-03-08 23:58:42.000000000 +0000 +++ hitori-3.22.0/po/oc.po 2016-06-15 20:07:59.000000000 +0000 @@ -3,15 +3,16 @@ # This file is distributed under the same license as the hitori package. # Cédric Valmary , 2015. # Cédric Valmary (Tot en òc) , 2015. +# Cédric Valmary (totenoc.eu) , 2016. msgid "" msgstr "" "Project-Id-Version: hitori.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=hitori&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2016-01-26 23:24+0000\n" -"PO-Revision-Date: 2015-10-31 09:14+0200\n" -"Last-Translator: Cédric Valmary (Tot en òc) \n" -"Language-Team: Tot en òc (totenoc.eu)\n" +"POT-Creation-Date: 2016-05-05 19:54+0000\n" +"PO-Revision-Date: 2016-05-05 21:46+0200\n" +"Last-Translator: Cédric Valmary (totenoc.eu) \n" +"Language-Team: Tot En Òc\n" "Language: oc\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -123,23 +124,23 @@ msgid "The size of the board, in cells." msgstr "Talha del platèu, en cellulas" -#: ../src/interface.c:630 +#: ../src/interface.c:635 msgid "The help contents could not be displayed" msgstr "Impossible d'afichar lo contengut de l'ajuda" -#: ../src/interface.c:654 +#: ../src/interface.c:659 msgid "Copyright © 2007–2010 Philip Withnall" msgstr "Copyright © 2007–2010 Philip Withnall" -#: ../src/interface.c:655 +#: ../src/interface.c:660 msgid "A logic puzzle originally designed by Nikoli" msgstr "Un copacap de logica concebut a l'origina per Nikoli." -#: ../src/interface.c:657 +#: ../src/interface.c:662 msgid "translator-credits" -msgstr "Cédric Valmary (totenoc.eu) , 2015" +msgstr "Cédric Valmary (totenoc.eu) , 2016" -#: ../src/interface.c:661 +#: ../src/interface.c:666 msgid "Hitori Website" msgstr "Site Web de Hitori" @@ -195,10 +196,10 @@ #~ "Software Foundation, either version 3 of the License, or (at your option) " #~ "any later version." #~ msgstr "" -#~ "Hitori es un logicial libre ; podètz lo redistribuer et/ou lo modifier " -#~ "segon les termes de la Licéncia Publica Generala GNU, telle que publiée " -#~ "per la Free Software Foundation ; version 3 de la licence, o (à votre " -#~ "discrétion) tota version ulteriora." +#~ "Hitori es un logicial liure ; podètz lo redistribuer et/ou lo modificar " +#~ "segon los tèrmes de la Licéncia Publica Generala GNU, tala coma publicada " +#~ "per la Free Software Foundation ; version 3 de la licéncia, o (coma " +#~ "voldretz) tota version ulteriora." #~ msgid "" #~ "Hitori is distributed in the hope that it will be useful, but WITHOUT ANY " @@ -206,15 +207,15 @@ #~ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " #~ "details." #~ msgstr "" -#~ "Hitori es distribuit dins l'espoir qu'il vous serà utile, mas SANS " -#~ "AUCUNE GARANTIE ; sens même la garantie implicite de VALEUR MARCHANDE o " -#~ "D'ADÉQUATION A UN BESONH PARTICULAR. Consultatz la Licéncia Publica " -#~ "Generala GNU per plus de detalhs." +#~ "Hitori es distribuit dins l'esper que vos serà utile, mas SENS CAP DE " +#~ "GARANTIDA ; sens la quita garantida implicita de VALOR MERCANDA o " +#~ "D'ADEQÜACION A UN BESONH PARTICULAR. Consultatz la Licéncia Publica " +#~ "Generala GNU per mai de detalhs." #~ msgid "" #~ "You should have received a copy of the GNU General Public License along " #~ "with Hitori. If not, see ." #~ msgstr "" -#~ "Vous devez aver recebut una còpia de la Licéncia Publica Generala GNU en " -#~ "même temps que Hitori. Siquenon, consultatz ." +#~ "Vos cal aver recebut una còpia de la Licéncia Publica Generala GNU en " +#~ "meteis temps que Hitori. Siquenon, consultatz ." diff -Nru hitori-3.20.0/po/pa.po hitori-3.22.0/po/pa.po --- hitori-3.20.0/po/pa.po 2009-11-06 20:17:49.000000000 +0000 +++ hitori-3.22.0/po/pa.po 2016-08-12 10:28:21.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2009-06-16 06:36+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" +"Language: pa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru hitori-3.20.0/po/pl.po hitori-3.22.0/po/pl.po --- hitori-3.20.0/po/pl.po 2016-03-08 23:58:42.000000000 +0000 +++ hitori-3.22.0/po/pl.po 2016-09-19 17:02:15.000000000 +0000 @@ -1,63 +1,61 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Piotr Drąg , 2012-2015. -# Aviary.pl , 2012-2015. +# Polish translation for hitori. +# Copyright © 2012-2016 the hitori authors. +# This file is distributed under the same license as the hitori package. +# Piotr Drąg , 2012-2016. +# Aviary.pl , 2012-2016. +# msgid "" msgstr "" "Project-Id-Version: hitori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 14:30+0200\n" -"PO-Revision-Date: 2015-08-25 14:31+0200\n" +"POT-Creation-Date: 2016-08-22 21:12+0200\n" +"PO-Revision-Date: 2016-08-22 21:13+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" -#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:1 ../src/main.c:101 +#: ../data/org.gnome.Hitori.desktop.in.h:1 ../data/hitori.ui.h:1 +#: ../src/main.c:101 msgid "Hitori" msgstr "Hitori" #. Translators: the brief summary of the application as it appears in a software center. -#: ../data/hitori.desktop.in.h:2 ../data/hitori.appdata.xml.in.h:4 +#: ../data/org.gnome.Hitori.desktop.in.h:2 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:4 msgid "Play the Hitori puzzle game" msgstr "Gra logiczna Hitori" #. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list MUST also end with a semicolon! -#: ../data/hitori.desktop.in.h:4 +#: ../data/org.gnome.Hitori.desktop.in.h:4 msgid "puzzle;game;logic;grid;" msgstr "puzzle;puzle;gra;logiczna;siatka;" #. Translators: the name of the application as it appears in a software center -#: ../data/hitori.appdata.xml.in.h:2 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:2 msgid "GNOME Hitori" msgstr "GNOME Hitori" #. Translators: These are the application description paragraphs in the AppData file. -#: ../data/hitori.appdata.xml.in.h:6 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:6 msgid "Hitori is a logic game similar to the popular game of Sudoku." msgstr "Hitori to gra logiczna, podobna do popularnej gry Sudoku." -#: ../data/hitori.appdata.xml.in.h:7 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:7 msgid "" "You play the game against the clock, aiming to eliminate all the duplicate " "numbers in each row and column in the fastest time. Multiple sizes of game " "board are supported, and you can place markers on cells to help work out the " "solution. If you get stuck, the game can give you a hint." msgstr "" -"Należy jak najszybciej wyeliminować podwójne liczby w każdym rzędzie i " -"kolumnie przed upływem określonego czasu. Obsługiwane są różne rozmiary " -"planszy, a na komórkach można umieszczać znaczniki ułatwiające znalezienie " -"rozwiązania. Gra może wyświetlić podpowiedź w razie utknięcia." +"Należy jak najszybciej wyeliminować podwójne liczby w każdym rzędzie " +"i kolumnie przed upływem określonego czasu. Obsługiwane są różne rozmiary " +"planszy, a na komórkach można umieszczać znaczniki ułatwiające znalezienie " +"rozwiązania. Gra może wyświetlić podpowiedź w razie utknięcia." #: ../data/hitori-menus.ui.h:1 ../src/main.c:305 msgid "_New Game" @@ -97,7 +95,7 @@ #: ../data/hitori-menus.ui.h:10 msgid "_About" -msgstr "_O grze" +msgstr "_O grze" #: ../data/hitori-menus.ui.h:11 ../src/rules.c:272 msgid "_Quit" @@ -121,27 +119,27 @@ #: ../data/org.gnome.hitori.gschema.xml.h:2 msgid "The size of the board, in cells." -msgstr "Rozmiar planszy w komórkach." +msgstr "Rozmiar planszy w komórkach." -#: ../src/interface.c:630 +#: ../src/interface.c:635 msgid "The help contents could not be displayed" msgstr "Nie można wyświetlić treści pomocy" -#: ../src/interface.c:654 +#: ../src/interface.c:659 msgid "Copyright © 2007–2010 Philip Withnall" -msgstr "Copyright © 2007–2010 Philip Withnall" +msgstr "Copyright © 2007-2010 Philip Withnall" -#: ../src/interface.c:655 +#: ../src/interface.c:660 msgid "A logic puzzle originally designed by Nikoli" msgstr "Logiczna układanka oryginalnie zaprojektowana przez firmę Nikoli." -#: ../src/interface.c:657 +#: ../src/interface.c:662 msgid "translator-credits" msgstr "" -"Piotr Drąg , 2012-2015\n" -"Aviary.pl , 2012-2015" +"Piotr Drąg , 2012-2016\n" +"Aviary.pl , 2012-2016" -#: ../src/interface.c:661 +#: ../src/interface.c:666 msgid "Hitori Website" msgstr "Witryna gry Hitori" @@ -178,7 +176,7 @@ #: ../src/rules.c:267 #, c-format msgid "You’ve won in a time of %02u:%02u!" -msgstr "Wygrano w czasie %02u∶%02u!" +msgstr "Wygrano w czasie %02u∶%02u!" #: ../src/rules.c:273 msgid "_Play Again" diff -Nru hitori-3.20.0/po/pt.po hitori-3.22.0/po/pt.po --- hitori-3.20.0/po/pt.po 2016-03-08 23:58:42.000000000 +0000 +++ hitori-3.22.0/po/pt.po 2016-06-15 20:07:59.000000000 +0000 @@ -2,49 +2,52 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Pedro Albuquerque , 2015. +# Sérgio Cardeira , 2016. # msgid "" msgstr "" "Project-Id-Version: Hitori\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=hitori&keywords=I18N+L10N&component=General\n" -"POT-Creation-Date: 2015-06-07 22:08+0000\n" -"PO-Revision-Date: 2015-06-27 08:38+0100\n" -"Last-Translator: Pedro Albuquerque \n" -"Language-Team: Português \n" +"POT-Creation-Date: 2016-02-21 00:47+0000\n" +"PO-Revision-Date: 2016-02-21 02:57-0100\n" +"Last-Translator: Sérgio Cardeira \n" +"Language-Team: Português \n" "Language: pt\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: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" "X-Project-Style: gnome\n" -#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:1 ../src/main.c:101 +#: ../data/org.gnome.Hitori.desktop.in.h:1 ../data/hitori.ui.h:1 +#: ../src/main.c:101 msgid "Hitori" msgstr "Hitori" #. Translators: the brief summary of the application as it appears in a software center. -#: ../data/hitori.desktop.in.h:2 ../data/hitori.appdata.xml.in.h:4 +#: ../data/org.gnome.Hitori.desktop.in.h:2 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:4 msgid "Play the Hitori puzzle game" msgstr "Jogue os puzzles Hitori" #. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list MUST also end with a semicolon! -#: ../data/hitori.desktop.in.h:4 +#: ../data/org.gnome.Hitori.desktop.in.h:4 msgid "puzzle;game;logic;grid;" msgstr "puzzle;jogo;lógica;grelha;" #. Translators: the name of the application as it appears in a software center -#: ../data/hitori.appdata.xml.in.h:2 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:2 msgid "GNOME Hitori" msgstr "GNOME Hitori" #. Translators: These are the application description paragraphs in the AppData file. -#: ../data/hitori.appdata.xml.in.h:6 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:6 msgid "Hitori is a logic game similar to the popular game of Sudoku." msgstr "O Hitori é um jogo de lógica similar ao popular Sudoku." -#: ../data/hitori.appdata.xml.in.h:7 +#: ../data/org.gnome.Hitori.appdata.xml.in.h:7 msgid "" "You play the game against the clock, aiming to eliminate all the duplicate " "numbers in each row and column in the fastest time. Multiple sizes of game " @@ -90,7 +93,7 @@ #: ../data/hitori-menus.ui.h:9 msgid "_Help" -msgstr "A_Juda" +msgstr "A_juda" #: ../data/hitori-menus.ui.h:10 msgid "_About" diff -Nru hitori-3.20.0/po/sl.po hitori-3.22.0/po/sl.po --- hitori-3.20.0/po/sl.po 2015-02-22 20:12:27.000000000 +0000 +++ hitori-3.22.0/po/sl.po 2016-08-12 10:28:21.000000000 +0000 @@ -14,7 +14,7 @@ "PO-Revision-Date: 2015-02-15 21:17+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" -"Language: sl_SI\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru hitori-3.20.0/po/sr@latin.po hitori-3.22.0/po/sr@latin.po --- hitori-3.20.0/po/sr@latin.po 2015-04-13 21:17:12.000000000 +0000 +++ hitori-3.22.0/po/sr@latin.po 2016-08-12 10:28:21.000000000 +0000 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2015-03-04 20:47+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru hitori-3.20.0/po/vi.po hitori-3.22.0/po/vi.po --- hitori-3.20.0/po/vi.po 2011-06-18 18:36:04.000000000 +0000 +++ hitori-3.22.0/po/vi.po 2016-08-12 10:28:21.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2011-05-05 20:53+0700\n" "Last-Translator: Lê Trường An \n" "Language-Team: Vietnamese \n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru hitori-3.20.0/po/zh_HK.po hitori-3.22.0/po/zh_HK.po --- hitori-3.20.0/po/zh_HK.po 2014-08-28 23:41:58.000000000 +0000 +++ hitori-3.22.0/po/zh_HK.po 2016-08-12 10:28:21.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2014-08-19 20:26+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" -"Language: zh_TW\n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"