diff -Nru gmsl-1.1.7/debian/changelog gmsl-1.1.8/debian/changelog --- gmsl-1.1.7/debian/changelog 2016-06-21 04:35:31.000000000 +0000 +++ gmsl-1.1.8/debian/changelog 2018-11-21 20:30:21.000000000 +0000 @@ -1,9 +1,17 @@ +gmsl (1.1.8-1) unstable; urgency=medium + + * New upstream release + * d/copyright: Use https protocol in Format field + * d/watch: Use https protocol + + -- Dima Kogan Wed, 21 Nov 2018 12:30:21 -0800 + gmsl (1.1.7-1) unstable; urgency=medium * New upstream release - new function set_is_not_member - -- Dima Kogan Mon, 20 Jun 2016 21:35:30 -0700 + -- Dima Kogan Mon, 24 Aug 2015 20:48:06 -0700 gmsl (1.1.5-1) unstable; urgency=medium diff -Nru gmsl-1.1.7/debian/compat gmsl-1.1.8/debian/compat --- gmsl-1.1.7/debian/compat 2012-11-18 01:37:12.000000000 +0000 +++ gmsl-1.1.8/debian/compat 2018-11-21 20:28:21.000000000 +0000 @@ -1 +1 @@ -7 +11 diff -Nru gmsl-1.1.7/debian/control gmsl-1.1.8/debian/control --- gmsl-1.1.7/debian/control 2015-08-25 03:53:33.000000000 +0000 +++ gmsl-1.1.8/debian/control 2018-11-21 20:30:21.000000000 +0000 @@ -1,12 +1,12 @@ Source: gmsl Section: devel Priority: optional -Build-Depends: debhelper (>= 7.0.50~) -Maintainer: Dima Kogan -Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 11) +Maintainer: Dima Kogan +Standards-Version: 4.1.4 Homepage: http://gmsl.sourceforge.net/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/dkogan-guest/gmsl.git -Vcs-Git: git://anonscm.debian.org/users/dkogan-guest/gmsl.git +Vcs-Browser: https://salsa.debian.org/debian/gmsl +Vcs-Git: https://salsa.debian.org/debian/gmsl.git Package: gmsl Architecture: all diff -Nru gmsl-1.1.7/debian/copyright gmsl-1.1.8/debian/copyright --- gmsl-1.1.7/debian/copyright 2015-08-25 03:56:29.000000000 +0000 +++ gmsl-1.1.8/debian/copyright 2018-11-21 20:29:27.000000000 +0000 @@ -1,10 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://gmsl.sourceforge.net/ Upstream-Contact: John Graham-Cumming Upstream-Name: GMSL Files: * -Copyright: 2005-2014 John Graham-Cumming +Copyright: 2005-2018 John Graham-Cumming License: BSD-4clause Files: debian/* diff -Nru gmsl-1.1.7/debian/watch gmsl-1.1.8/debian/watch --- gmsl-1.1.7/debian/watch 2012-11-18 01:37:12.000000000 +0000 +++ gmsl-1.1.8/debian/watch 2018-11-21 20:28:53.000000000 +0000 @@ -1,2 +1,2 @@ version = 3 -http://sf.net/gmsl/gmsl-(.+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) +https://sf.net/gmsl/gmsl-(.+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) diff -Nru gmsl-1.1.7/gmsl gmsl-1.1.8/gmsl --- gmsl-1.1.7/gmsl 2014-12-22 11:50:01.000000000 +0000 +++ gmsl-1.1.8/gmsl 2018-05-17 14:08:33.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-2014 John Graham-Cumming +# Copyright (c) 2005-2018 John Graham-Cumming # # This file is part of GMSL # diff -Nru gmsl-1.1.7/__gmsl gmsl-1.1.8/__gmsl --- gmsl-1.1.7/__gmsl 2014-12-22 11:50:01.000000000 +0000 +++ gmsl-1.1.8/__gmsl 2018-05-17 14:16:16.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-2014 John Graham-Cumming +# Copyright (c) 2005-2018 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 7 +gmsl_version := 1 1 8 __gmsl_name := GNU Make Standard Library @@ -510,7 +510,7 @@ # Returns: Returns the integer for human consumption that is represented # by the string of x's # ---------------------------------------------------------------------------- -int_decode = $(__gmsl_tr1)$(words $1) +int_decode = $(__gmsl_tr1)$(if $1,$(if $(call seq,$(word 1,$1),x),$(words $1),$1),0) # ---------------------------------------------------------------------------- # Function: int_encode @@ -602,8 +602,7 @@ # by argument 2 in x's representation # ---------------------------------------------------------------------------- int_divide = $(__gmsl_tr2)$(strip $(if $1,$(if $2, \ - $(if $(call int_gte,$1,$2), \ - x $(call int_divide,$(call int_subtract,$1,$2),$2),), \ + $(subst M,x,$(filter-out x,$(subst $2,M,$1))), \ $(call __gmsl_error,Division by zero)))) # ---------------------------------------------------------------------------- @@ -615,6 +614,26 @@ divide = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_divide,$1,$2) # ---------------------------------------------------------------------------- +# Function: int_modulo +# Arguments: 1: A number in x's representation +# 2: Another number in x's represntation +# Returns: Returns the remainder of integer division of argument 1 divided +# by argument 2 in x's representation +# ---------------------------------------------------------------------------- +int_modulo = $(__gmsl_tr2)$(strip $(if $1,$(if $2, \ + $(filter-out M,$(subst $2,M,$1)), \ + $(call __gmsl_error,Division by zero)))) + +# ---------------------------------------------------------------------------- +# Function: modulo (wrapped version of int_modulo) +# Arguments: 1: An integer +# 2: Another integer +# Returns: Returns the remainder of integer division of the first argument +# by the second +# ---------------------------------------------------------------------------- +modulo = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_modulo,$1,$2) + +# ---------------------------------------------------------------------------- # Function: int_max, int_min # Arguments: 1: A number in x's representation # 2: Another number in x's represntation diff -Nru gmsl-1.1.7/gmsl-tests gmsl-1.1.8/gmsl-tests --- gmsl-1.1.7/gmsl-tests 2014-12-22 11:50:01.000000000 +0000 +++ gmsl-1.1.8/gmsl-tests 2018-05-17 14:12:31.000000000 +0000 @@ -4,7 +4,7 @@ # # Test suite for the GMSL # -# Copyright (c) 2005-2014 John Graham-Cumming +# Copyright (c) 2005-2018 John Graham-Cumming # # This file is part of GMSL # @@ -170,11 +170,22 @@ $(call test_assert,$(call seq,aa% bb% cc,xx yy zz),) $(call test_assert,$(call seq,x x,),) $(call test_assert,$(call seq, xx x,x xx),) +$(call test_assert,$(call seq, x xx,x xx),) +$(call test_assert,$(call seq,$(__gmsl_space)x xx,x xx),) +$(call test_assert,$(call seq, , ),) +$(call test_assert,$(call seq, , ),) +$(call test_assert,$(call seq, , ),) +$(call test_assert,$(call seq, , ),) +$(call test_assert,$(call seq, , ),) $(call test_assert,$(call seq, , ),T) $(call test_assert,$(call seq,, ),) $(call test_assert,$(call seq, ,),) $(call test_assert,$(call seq,y,xy),) $(call test_assert,$(call seq,$(__gmsl_space),$(__gmsl_tab)),) +$(call test_assert,$(call seq, $(__gmsl_space) , $(__gmsl_space) ),T) +$(call test_assert,$(call seq,$(__gmsl_tab),$(__gmsl_tab)),T) +$(call test_assert,$(call seq,yy,yyyy),) +$(call test_assert,$(call seq,yyyy,yy),) $(call stop_test) $(call start_test,sne) @@ -423,16 +434,36 @@ $(call test_assert,$(call int_divide,$(call int_encode,1),$(call int_encode,0)),Division by zero) $(call stop_test) -__gmsl_error = x x x x x x x x x x +$(call start_test,int_modulo) +$(call test_assert,$(call int_modulo,$(call int_encode,3),$(call int_encode,4)),$(call int_encode,3)) +$(call test_assert,$(call int_modulo,$(call int_encode,4),$(call int_encode,3)),$(call int_encode,1)) +$(call test_assert,$(call int_modulo,$(call int_encode,31),$(call int_encode,3)),$(call int_encode,1)) +$(call test_assert,$(call int_modulo,$(call int_encode,30),$(call int_encode,3)),$(call int_encode,0)) +$(call test_assert,$(call int_modulo,$(call int_encode,29),$(call int_encode,3)),$(call int_encode,2)) +$(call test_assert,$(call int_modulo,$(call int_encode,0),$(call int_encode,1)),$(call int_encode,0)) +$(call test_assert,$(call int_modulo,$(call int_encode,1),$(call int_encode,0)),Division by zero) +$(call stop_test) + +__gmsl_error = $1 $(call start_test,divide) $(call test_assert,$(call divide,3,4),0) $(call test_assert,$(call divide,4,3),1) $(call test_assert,$(call divide,21,2),10) $(call test_assert,$(call divide,20,2),10) $(call test_assert,$(call divide,19,2),9) -$(call test_assert,$(call divide,1,0),10) +$(call test_assert,$(call divide,1,0),Division by zero) $(call stop_test) +$(call start_test,modulo) +$(call test_assert,$(call modulo,3,4),3) +$(call test_assert,$(call modulo,4,3),1) +$(call test_assert,$(call modulo,21,2),1) +$(call test_assert,$(call modulo,20,2),0) +$(call test_assert,$(call modulo,17,3),2) +$(call test_assert,$(call modulo,1,0),Division by zero) +$(call stop_test) + + $(call start_test,dec2hex) $(call test_assert,$(call dec2hex,0),0) $(call test_assert,$(call dec2hex,1),1) @@ -784,7 +815,8 @@ $(call test_assert,$(call gmsl_compatible,1 1 5),$(true)) $(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),) +$(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 2 0),) $(call test_assert,$(call gmsl_compatible,2 0 0),) $(call stop_test) diff -Nru gmsl-1.1.7/index.html gmsl-1.1.8/index.html --- gmsl-1.1.7/index.html 2014-12-22 11:50:01.000000000 +0000 +++ gmsl-1.1.8/index.html 2018-05-17 14:08:38.000000000 +0000 @@ -393,6 +393,25 @@ Returns:   Returns the integer division of the first argument by the second
+
int_modulo
+
+Arguments: 1: A number in x's +representation
+           2: Another +number in x's represntation
+Returns:   Returns the remainder of integer division of +argument 1 divided
+           by +argument 2 in x's representation
+ +
modulo (wrapped version of int_modulo)
+
+Arguments: 1: An integer
+           2: Another +integer
+Returns:   Returns the remainder of integer division of the first +argument by the second
+
int_max, int_min

Arguments: 1: A number in x's @@ -696,7 +715,7 @@
-Copyright (c) 2005-2014 John Graham-Cumming.
+Copyright (c) 2005-2018 John Graham-Cumming.
Binary files /tmp/tmpnkE7Oo/eq8vg0k3e3/gmsl-1.1.7/README and /tmp/tmpnkE7Oo/GzqoTiRykg/gmsl-1.1.8/README differ