diff -Nru gmsl-1.1.8/debian/changelog gmsl-1.1.9/debian/changelog --- gmsl-1.1.8/debian/changelog 2018-11-21 20:30:21.000000000 +0000 +++ gmsl-1.1.9/debian/changelog 2020-06-04 02:56:36.000000000 +0000 @@ -1,3 +1,9 @@ +gmsl (1.1.9-1) unstable; urgency=medium + + * New upstream release + + -- Dima Kogan Wed, 03 Jun 2020 19:56:36 -0700 + gmsl (1.1.8-1) unstable; urgency=medium * New upstream release diff -Nru gmsl-1.1.8/debian/copyright gmsl-1.1.9/debian/copyright --- gmsl-1.1.8/debian/copyright 2018-11-21 20:29:27.000000000 +0000 +++ gmsl-1.1.9/debian/copyright 2020-06-04 02:54:53.000000000 +0000 @@ -4,7 +4,7 @@ Upstream-Name: GMSL Files: * -Copyright: 2005-2018 John Graham-Cumming +Copyright: 2005-2020 John Graham-Cumming License: BSD-4clause Files: debian/* diff -Nru gmsl-1.1.8/debian/patches/0001-HTML-docs-no-longer-display-external-images.patch gmsl-1.1.9/debian/patches/0001-HTML-docs-no-longer-display-external-images.patch --- gmsl-1.1.8/debian/patches/0001-HTML-docs-no-longer-display-external-images.patch 2018-11-21 20:28:21.000000000 +0000 +++ gmsl-1.1.9/debian/patches/0001-HTML-docs-no-longer-display-external-images.patch 2020-06-04 02:55:39.000000000 +0000 @@ -8,10 +8,10 @@ 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/index.html b/index.html -index 28fd58d..fec41b7 100644 +index 416f0f4..4f97695 100644 --- a/index.html +++ b/index.html -@@ -703,11 +703,7 @@ Copyright (c) 2005-2014 John Graham-Cumming.John Graham-Cumming. John Graham-Cumming's work on this project was sponsored by Electric diff -Nru gmsl-1.1.8/debian/rules gmsl-1.1.9/debian/rules --- gmsl-1.1.8/debian/rules 2018-11-21 20:28:21.000000000 +0000 +++ gmsl-1.1.9/debian/rules 2020-06-04 02:56:36.000000000 +0000 @@ -4,4 +4,6 @@ dh $@ override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) make -f gmsl-tests +endif diff -Nru gmsl-1.1.8/gmsl gmsl-1.1.9/gmsl --- gmsl-1.1.8/gmsl 2018-05-17 14:08:33.000000000 +0000 +++ gmsl-1.1.9/gmsl 2020-04-03 10:08:11.000000000 +0000 @@ -5,7 +5,7 @@ # A library of functions to be used with GNU Make's $(call) that # provides functionality not available in standard GNU Make. # -# Copyright (c) 2005-2018 John Graham-Cumming +# Copyright (c) 2005-2020 John Graham-Cumming # # This file is part of GMSL # diff -Nru gmsl-1.1.8/__gmsl gmsl-1.1.9/__gmsl --- gmsl-1.1.8/__gmsl 2018-05-17 14:16:16.000000000 +0000 +++ gmsl-1.1.9/__gmsl 2020-04-03 10:08:11.000000000 +0000 @@ -5,7 +5,7 @@ # A library of functions to be used with GNU Make's $(call) that # provides functionality not available in standard GNU Make. # -# Copyright (c) 2005-2018 John Graham-Cumming +# Copyright (c) 2005-2020 John Graham-Cumming # # This file is part of GMSL # @@ -42,7 +42,7 @@ # This is the GNU Make Standard Library version number as a list with # three items: major, minor, revision -gmsl_version := 1 1 8 +gmsl_version := 1 1 9 __gmsl_name := GNU Make Standard Library @@ -109,10 +109,10 @@ # See if we have native or and and (GNU Make 3.81 and above) -__gmsl_have_or := $(if $(filter-out undefined, \ - $(origin or)),$(call or,$(true),$(false))) -__gmsl_have_and := $(if $(filter-out undefined, \ - $(origin and)),$(call and,$(true),$(true))) +__or_tt := /$(or $(true),$(true))/$(or $(true),$(false))/$(or $(false),$(true))/$(or $(false),$(false))/ +__and_tt := /$(and $(true),$(true))/$(and $(true),$(false))/$(and $(false),$(true))/$(and $(false),$(false))/ +__gmsl_have_or := $(if $(filter /T/T/T//,$(__or_tt)),$(true),$(false)) +__gmsl_have_and := $(if $(filter /T////,$(__and_tt)),$(true),$(false)) ifneq ($(__gmsl_have_eval),$(true)) $(call __gmsl_warning,Your make version $(MAKE_VERSION) does not support $$$$(eval): some functions disabled) @@ -396,8 +396,8 @@ # This results in __gmsl_space containing just a space -__gmsl_space := -__gmsl_space += +__gmsl_empty := +__gmsl_space := $(__gmsl_empty) $(__gmsl_empty) strlen = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(strip $(eval __temp := $(subst $(__gmsl_space),x,$1))$(foreach a,$(__gmsl_characters),$(eval __temp := $$(subst $$a,x,$(__temp))))$(eval __temp := $(subst x,x ,$(__temp)))$(words $(__temp))) @@ -913,6 +913,16 @@ # ########################################################################### # ---------------------------------------------------------------------------- +# Target: gmsl-echo-% +# Arguments: The % should be replaced by the name of a variable that you +# wish to print out. +# Action: Echos the value of the variable that matches the %. +# For example, 'make gmsl-echo-SHELL' will output the value of +# the SHELL variable. +# ---------------------------------------------------------------------------- +gmsl-echo-%: ; @echo $($*) + +# ---------------------------------------------------------------------------- # Target: gmsl-print-% # Arguments: The % should be replaced by the name of a variable that you # wish to print out. diff -Nru gmsl-1.1.8/gmsl-tests gmsl-1.1.9/gmsl-tests --- gmsl-1.1.8/gmsl-tests 2018-05-17 14:12:31.000000000 +0000 +++ gmsl-1.1.9/gmsl-tests 2020-04-03 10:08:11.000000000 +0000 @@ -4,7 +4,7 @@ # # Test suite for the GMSL # -# Copyright (c) 2005-2018 John Graham-Cumming +# Copyright (c) 2005-2020 John Graham-Cumming # # This file is part of GMSL # @@ -816,7 +816,8 @@ $(call test_assert,$(call gmsl_compatible,1 1 6),$(true)) $(call test_assert,$(call gmsl_compatible,1 1 7),$(true)) $(call test_assert,$(call gmsl_compatible,1 1 8),$(true)) -$(call test_assert,$(call gmsl_compatible,1 1 9),) +$(call test_assert,$(call gmsl_compatible,1 1 9),$(true)) +$(call test_assert,$(call gmsl_compatible,1 1 10),) $(call test_assert,$(call gmsl_compatible,1 2 0),) $(call test_assert,$(call gmsl_compatible,2 0 0),) $(call stop_test) diff -Nru gmsl-1.1.8/index.html gmsl-1.1.9/index.html --- gmsl-1.1.8/index.html 2018-05-17 14:08:38.000000000 +0000 +++ gmsl-1.1.9/index.html 2020-04-03 10:08:11.000000000 +0000 @@ -22,7 +22,7 @@ you have the right version of gmsl use the gmsl_compatible function (see -below). The current version is 1 1 6.
+below). The current version is 1 1 9.

The GMSL package also includes a test suite for GMSL.  Just run make -f gmsl-tests.

Logical Operators

GMSL has boolean $(true) (a non-empty string) @@ -662,6 +662,19 @@            the SHELL variable
+
gmsl-echo-% (target not a function)
+
+Arguments: The % should be +replaced by the name of a variable that you
+           wish to +print out.
+Action:    Echos the value of the variable that matches +the %.
+           For +example, 'make gmsl-echo-SHELL' will output the value of
+           the SHELL +variable
+

assert

Arguments: 1: A boolean that must @@ -715,7 +728,7 @@

-Copyright (c) 2005-2018
John Graham-Cumming.
+Copyright (c) 2005-2020 John Graham-Cumming.

Binary files /tmp/tmpFu3eQl/mph7feKJH8/gmsl-1.1.8/README and /tmp/tmpFu3eQl/7eSdfEdzgL/gmsl-1.1.9/README differ