Your message dated Sun, 25 Apr 2021 09:41:44 +0200
with message-id
<cam8zjqvej3ioft8xxkeoatz7q0i8zz89ewgvg9sf3g3s074...@mail.gmail.com>
and subject line Re: Bug#987510: unblock: cqrlog/2.5.1-2
has caused the Debian Bug report #987510,
regarding unblock: cqrlog/2.5.1-2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
987510: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987510
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Debian Hamradio Maintainers <debian-h...@lists.debian.org>
Please unblock package cqrlog.
[ Reason ]
The new version fixes import of .adif files which is the standard
hamradio logbook interchange format. (#987032)
[ Impact ]
This logbook program wouldn't be able to read logbooks.
[ Tests ]
Manual testing by Federico Grau.
[ Risks ]
The change was tested and the patch is small.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock cqrlog/2.5.1-2
Thanks,
Christoph
No differences were encountered between the control files
diff -Nru cqrlog-2.5.1/debian/changelog cqrlog-2.5.1/debian/changelog
--- cqrlog-2.5.1/debian/changelog 2021-02-02 12:46:56.000000000 +0100
+++ cqrlog-2.5.1/debian/changelog 2021-04-17 20:23:46.000000000 +0200
@@ -1,3 +1,10 @@
+cqrlog (2.5.1-2) unstable; urgency=medium
+
+ * Team upload.
+ * Patch from upstream commits to fix ADIF import (Closes: #987032)
+
+ -- Federico Grau <donf...@casagrau.org> Sat, 17 Apr 2021 14:23:46 -0400
+
cqrlog (2.5.1-1) unstable; urgency=medium
* New upstream version 2.5.1.
diff -Nru cqrlog-2.5.1/debian/patches/adif_import_regex_fix_2021-04-17.patch cqrlog-2.5.1/debian/patches/adif_import_regex_fix_2021-04-17.patch
--- cqrlog-2.5.1/debian/patches/adif_import_regex_fix_2021-04-17.patch 1970-01-01 01:00:00.000000000 +0100
+++ cqrlog-2.5.1/debian/patches/adif_import_regex_fix_2021-04-17.patch 2021-04-17 20:23:46.000000000 +0200
@@ -0,0 +1,27 @@
+Patch to fix Debian#987032: cqrlog: Importing ADIF-logs results in 0 byte logs - https://bugs.debian.org/987032
+Applies upstream commits:
+ 42d1ad402affd0af0f3087562c101fc34940ffc5
+ Original_Author: Petr Hlozek <p...@ok2cqr.com>
+ Date: Sun Feb 7 07:19:57 2021 +0100
+
+ fix: workaround for 'TRegExpr exec: empty input string' error in fpc compiler
+Author: donf...@casagrau.org
+diff --git a/src/fAdifImport.pas b/src/fAdifImport.pas
+index 2481086..934b158 100644
+--- a/src/fAdifImport.pas
++++ b/src/fAdifImport.pas
+@@ -420,8 +420,12 @@ begin
+ d.IOTA := UpperCase(d.IOTA);
+ d.NAME := Copy(d.NAME, 1 ,40);
+ d.QTH := Copy(d.QTH, 1, 60);
+- d.DARC_DOK := ReplaceRegExpr('Ø', d.DARC_DOK, '0', True);
+- d.DARC_DOK := LeftStr(Uppercase(ReplaceRegExpr('[^a-zA-Z0-9]',d.DARC_DOK, '', True)), 12);
++ //workaround for 'TRegExpr exec: empty input string' error in fpc compiler
++ if (trim(d.DARC_DOK) <> '') then
++ begin
++ d.DARC_DOK := ReplaceRegExpr('Ø', d.DARC_DOK, '0', True);
++ d.DARC_DOK := LeftStr(Uppercase(ReplaceRegExpr('[^a-zA-Z0-9]',d.DARC_DOK, '', True)), 12);
++ end;
+
+ d.QSL_VIA := UpperCase(d.QSL_VIA);
+ if Pos('QSL VIA',d.QSL_VIA) > 0 then
diff -Nru cqrlog-2.5.1/debian/patches/series cqrlog-2.5.1/debian/patches/series
--- cqrlog-2.5.1/debian/patches/series 2021-02-02 12:46:56.000000000 +0100
+++ cqrlog-2.5.1/debian/patches/series 2021-04-17 20:23:46.000000000 +0200
@@ -1,2 +1,3 @@
apparmor-fix.patch
icon-patch
+adif_import_regex_fix_2021-04-17.patch
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---
