update to remind-4.2.1, from Martin Ziemer (maintainer)

This commit is contained in:
sthen 2022-12-16 10:35:42 +00:00
parent c9c2957719
commit 888c5bd44b
5 changed files with 4 additions and 227 deletions

View File

@ -1,7 +1,7 @@
COMMENT= scripting language for reminders, with a Tk front end
DISTNAME= remind-04.02.00
PKGNAME= remind-4.2.0
DISTNAME= remind-04.02.01
PKGNAME= remind-4.2.1
CATEGORIES= misc

View File

@ -1,2 +1,2 @@
SHA256 (remind-04.02.00.tar.gz) = pkds8N/nG8RmjndGaRAMWNaLaNxszwjKfqn6M0XnJzk=
SIZE (remind-04.02.00.tar.gz) = 486788
SHA256 (remind-04.02.01.tar.gz) = RknG1SyKKYSMLWihR2GM8MVROJx0E0E1gD+vSLv6uk0=
SIZE (remind-04.02.01.tar.gz) = 487960

View File

@ -1,13 +0,0 @@
# Cherry pick https://salsa.debian.org/dskoll/remind/-/commit/8fc19358bbea9429f8bed960ec60937b196751be
Index: src/dosubst.c
--- src/dosubst.c.orig
+++ src/dosubst.c
@@ -244,7 +244,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *
}
}
if (!c) {
- Wprint("Warning: Unterminated %{...} substitution sequence");
+ Wprint("Warning: Unterminated %%{...} substitution sequence");
}
if (UserFuncExists(s) != 3) {
continue;

View File

@ -1,162 +0,0 @@
# Cherry Pick from https://salsa.debian.org/dskoll/remind/-/commit/3692a6b265452d96904f67871325afb1b401c16e#444f828087e44bbf858dd1feeed7d2863b2d4bfc
Index: tests/test.cmp
--- tests/test.cmp.orig
+++ tests/test.cmp
@@ -10334,20 +10334,20 @@ STDOUT is a: PIPE
set a localtoutc('2022-01-01@12:00')
localtoutc(2022-01-01@12:00) => 2022-01-01@17:00
-set a localtoutc('2022-03-13@02:59')
-localtoutc(2022-03-13@02:59) => 2022-03-13@07:59
-set a localtoutc('2022-03-13@03:00')
-localtoutc(2022-03-13@03:00) => 2022-03-13@07:00
-set a localtoutc('2022-03-13@03:01')
-localtoutc(2022-03-13@03:01) => 2022-03-13@07:01
+set a localtoutc('2022-03-13@03:59')
+localtoutc(2022-03-13@03:59) => 2022-03-13@07:59
+set a localtoutc('2022-03-13@04:00')
+localtoutc(2022-03-13@04:00) => 2022-03-13@08:00
+set a localtoutc('2022-03-13@04:01')
+localtoutc(2022-03-13@04:01) => 2022-03-13@08:01
set a localtoutc('2022-06-01@12:00')
localtoutc(2022-06-01@12:00) => 2022-06-01@16:00
-set a localtoutc('2022-11-06@01:59')
-localtoutc(2022-11-06@01:59) => 2022-11-06@05:59
-set a localtoutc('2022-11-06@02:00')
-localtoutc(2022-11-06@02:00) => 2022-11-06@07:00
-set a localtoutc('2022-11-06@02:01')
-localtoutc(2022-11-06@02:01) => 2022-11-06@07:01
+set a localtoutc('2022-11-06@02:59')
+localtoutc(2022-11-06@02:59) => 2022-11-06@07:59
+set a localtoutc('2022-11-06@03:00')
+localtoutc(2022-11-06@03:00) => 2022-11-06@08:00
+set a localtoutc('2022-11-06@03:01')
+localtoutc(2022-11-06@03:01) => 2022-11-06@08:01
set a localtoutc('2022-12-01@12:00')
localtoutc(2022-12-01@12:00) => 2022-12-01@17:00
@@ -10355,10 +10355,10 @@ set b utctolocal('2022-01-01@17:00')
utctolocal(2022-01-01@17:00) => 2022-01-01@12:00
set b utctolocal('2022-03-13@06:00')
utctolocal(2022-03-13@06:00) => 2022-03-13@01:00
-set b utctolocal('2022-03-13@06:01')
-utctolocal(2022-03-13@06:01) => 2022-03-13@01:01
-set b utctolocal('2022-03-13@06:59')
-utctolocal(2022-03-13@06:59) => 2022-03-13@01:59
+set b utctolocal('2022-03-13@07:01')
+utctolocal(2022-03-13@07:01) => 2022-03-13@03:01
+set b utctolocal('2022-03-13@07:59')
+utctolocal(2022-03-13@07:59) => 2022-03-13@03:59
set b utctolocal('2022-03-13@07:00')
utctolocal(2022-03-13@07:00) => 2022-03-13@03:00
set b utctolocal('2022-03-13@07:01')
@@ -10367,20 +10367,20 @@ set b utctolocal('2022-03-13@07:59')
utctolocal(2022-03-13@07:59) => 2022-03-13@03:59
set b utctolocal('2022-06-01@16:00')
utctolocal(2022-06-01@16:00) => 2022-06-01@12:00
-set b utctolocal('2022-11-06@05:59')
-utctolocal(2022-11-06@05:59) => 2022-11-06@01:59
-set b utctolocal('2022-11-06@06:00')
-utctolocal(2022-11-06@06:00) => 2022-11-06@01:00
-set b utctolocal('2022-11-06@06:01')
-utctolocal(2022-11-06@06:01) => 2022-11-06@01:01
-set b utctolocal('2022-11-06@06:59')
-utctolocal(2022-11-06@06:59) => 2022-11-06@01:59
+set b utctolocal('2022-11-06@03:59')
+utctolocal(2022-11-06@03:59) => 2022-11-05@23:59
set b utctolocal('2022-11-06@07:00')
utctolocal(2022-11-06@07:00) => 2022-11-06@02:00
set b utctolocal('2022-11-06@07:01')
utctolocal(2022-11-06@07:01) => 2022-11-06@02:01
-set b utctolocal('2022-12-01@17:00')
-utctolocal(2022-12-01@17:00) => 2022-12-01@12:00
+set b utctolocal('2022-11-06@07:59')
+utctolocal(2022-11-06@07:59) => 2022-11-06@02:59
+set b utctolocal('2022-11-06@08:00')
+utctolocal(2022-11-06@08:00) => 2022-11-06@03:00
+set b utctolocal('2022-11-06@08:01')
+utctolocal(2022-11-06@08:01) => 2022-11-06@03:01
+set b utctolocal('2022-12-01@18:00')
+utctolocal(2022-12-01@18:00) => 2022-12-01@13:00
set c timezone('2022-07-01')
timezone(2022-07-01) => "EDT"
@@ -10392,20 +10392,20 @@ No reminders.
set a localtoutc('2022-01-01@12:00')
localtoutc(2022-01-01@12:00) => 2022-01-01@11:00
-set a localtoutc('2022-03-13@02:59')
-localtoutc(2022-03-13@02:59) => 2022-03-13@01:59
-set a localtoutc('2022-03-13@03:00')
-localtoutc(2022-03-13@03:00) => 2022-03-13@02:00
-set a localtoutc('2022-03-13@03:01')
-localtoutc(2022-03-13@03:01) => 2022-03-13@02:01
+set a localtoutc('2022-03-13@03:59')
+localtoutc(2022-03-13@03:59) => 2022-03-13@02:59
+set a localtoutc('2022-03-13@04:00')
+localtoutc(2022-03-13@04:00) => 2022-03-13@03:00
+set a localtoutc('2022-03-13@04:01')
+localtoutc(2022-03-13@04:01) => 2022-03-13@03:01
set a localtoutc('2022-06-01@12:00')
localtoutc(2022-06-01@12:00) => 2022-06-01@10:00
-set a localtoutc('2022-11-06@01:59')
-localtoutc(2022-11-06@01:59) => 2022-11-06@00:59
-set a localtoutc('2022-11-06@02:00')
-localtoutc(2022-11-06@02:00) => 2022-11-06@01:00
-set a localtoutc('2022-11-06@02:01')
-localtoutc(2022-11-06@02:01) => 2022-11-06@01:01
+set a localtoutc('2022-11-06@02:59')
+localtoutc(2022-11-06@02:59) => 2022-11-06@01:59
+set a localtoutc('2022-11-06@03:00')
+localtoutc(2022-11-06@03:00) => 2022-11-06@02:00
+set a localtoutc('2022-11-06@03:01')
+localtoutc(2022-11-06@03:01) => 2022-11-06@02:01
set a localtoutc('2022-12-01@12:00')
localtoutc(2022-12-01@12:00) => 2022-12-01@11:00
@@ -10413,10 +10413,10 @@ set b utctolocal('2022-01-01@17:00')
utctolocal(2022-01-01@17:00) => 2022-01-01@18:00
set b utctolocal('2022-03-13@06:00')
utctolocal(2022-03-13@06:00) => 2022-03-13@07:00
-set b utctolocal('2022-03-13@06:01')
-utctolocal(2022-03-13@06:01) => 2022-03-13@07:01
-set b utctolocal('2022-03-13@06:59')
-utctolocal(2022-03-13@06:59) => 2022-03-13@07:59
+set b utctolocal('2022-03-13@07:01')
+utctolocal(2022-03-13@07:01) => 2022-03-13@08:01
+set b utctolocal('2022-03-13@07:59')
+utctolocal(2022-03-13@07:59) => 2022-03-13@08:59
set b utctolocal('2022-03-13@07:00')
utctolocal(2022-03-13@07:00) => 2022-03-13@08:00
set b utctolocal('2022-03-13@07:01')
@@ -10425,20 +10425,20 @@ set b utctolocal('2022-03-13@07:59')
utctolocal(2022-03-13@07:59) => 2022-03-13@08:59
set b utctolocal('2022-06-01@16:00')
utctolocal(2022-06-01@16:00) => 2022-06-01@18:00
-set b utctolocal('2022-11-06@05:59')
-utctolocal(2022-11-06@05:59) => 2022-11-06@06:59
-set b utctolocal('2022-11-06@06:00')
-utctolocal(2022-11-06@06:00) => 2022-11-06@07:00
-set b utctolocal('2022-11-06@06:01')
-utctolocal(2022-11-06@06:01) => 2022-11-06@07:01
-set b utctolocal('2022-11-06@06:59')
-utctolocal(2022-11-06@06:59) => 2022-11-06@07:59
+set b utctolocal('2022-11-06@03:59')
+utctolocal(2022-11-06@03:59) => 2022-11-06@04:59
set b utctolocal('2022-11-06@07:00')
utctolocal(2022-11-06@07:00) => 2022-11-06@08:00
set b utctolocal('2022-11-06@07:01')
utctolocal(2022-11-06@07:01) => 2022-11-06@08:01
-set b utctolocal('2022-12-01@17:00')
-utctolocal(2022-12-01@17:00) => 2022-12-01@18:00
+set b utctolocal('2022-11-06@07:59')
+utctolocal(2022-11-06@07:59) => 2022-11-06@08:59
+set b utctolocal('2022-11-06@08:00')
+utctolocal(2022-11-06@08:00) => 2022-11-06@09:00
+set b utctolocal('2022-11-06@08:01')
+utctolocal(2022-11-06@08:01) => 2022-11-06@09:01
+set b utctolocal('2022-12-01@18:00')
+utctolocal(2022-12-01@18:00) => 2022-12-01@19:00
set c timezone('2022-07-01')
timezone(2022-07-01) => "CEST"

View File

@ -1,48 +0,0 @@
# Cerrhy Pick from https://salsa.debian.org/dskoll/remind/-/commit/3692a6b265452d96904f67871325afb1b401c16e#444f828087e44bbf858dd1feeed7d2863b2d4bfc
Index: tests/tz.rem
--- tests/tz.rem.orig
+++ tests/tz.rem
@@ -1,30 +1,30 @@
# Test conversion between local time and UTC
set a localtoutc('2022-01-01@12:00')
-set a localtoutc('2022-03-13@02:59')
-set a localtoutc('2022-03-13@03:00')
-set a localtoutc('2022-03-13@03:01')
+set a localtoutc('2022-03-13@03:59')
+set a localtoutc('2022-03-13@04:00')
+set a localtoutc('2022-03-13@04:01')
set a localtoutc('2022-06-01@12:00')
-set a localtoutc('2022-11-06@01:59')
-set a localtoutc('2022-11-06@02:00')
-set a localtoutc('2022-11-06@02:01')
+set a localtoutc('2022-11-06@02:59')
+set a localtoutc('2022-11-06@03:00')
+set a localtoutc('2022-11-06@03:01')
set a localtoutc('2022-12-01@12:00')
set b utctolocal('2022-01-01@17:00')
set b utctolocal('2022-03-13@06:00')
-set b utctolocal('2022-03-13@06:01')
-set b utctolocal('2022-03-13@06:59')
+set b utctolocal('2022-03-13@07:01')
+set b utctolocal('2022-03-13@07:59')
set b utctolocal('2022-03-13@07:00')
set b utctolocal('2022-03-13@07:01')
set b utctolocal('2022-03-13@07:59')
set b utctolocal('2022-06-01@16:00')
-set b utctolocal('2022-11-06@05:59')
-set b utctolocal('2022-11-06@06:00')
-set b utctolocal('2022-11-06@06:01')
-set b utctolocal('2022-11-06@06:59')
+set b utctolocal('2022-11-06@03:59')
set b utctolocal('2022-11-06@07:00')
set b utctolocal('2022-11-06@07:01')
-set b utctolocal('2022-12-01@17:00')
+set b utctolocal('2022-11-06@07:59')
+set b utctolocal('2022-11-06@08:00')
+set b utctolocal('2022-11-06@08:01')
+set b utctolocal('2022-12-01@18:00')
set c timezone('2022-07-01')
set c timezone('2022-12-01')