[med-svn] [Git][med-team/edfbrowser][master] 5 commits: d/watch: more fixups to version mangling.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Sat Nov 15 09:53:44 GMT 2025
Étienne Mollier pushed to branch master at Debian Med / edfbrowser
Commits:
96d60498 by Étienne Mollier at 2025-11-15T10:37:10+01:00
d/watch: more fixups to version mangling.
- - - - -
fcd8b985 by Étienne Mollier at 2025-11-15T10:37:39+01:00
New upstream version 2.14+dfsg
- - - - -
6295971a by Étienne Mollier at 2025-11-15T10:37:41+01:00
Update upstream source from tag 'upstream/2.14+dfsg'
Update to upstream version '2.14+dfsg'
with Debian dir 09ebdf03f0c89f30745a35e224bda0cea3c07369
- - - - -
b175d2da by Étienne Mollier at 2025-11-15T10:52:52+01:00
d/s/lintian-overrides: new: flag false positive on version mangling.
- - - - -
47b4c666 by Étienne Mollier at 2025-11-15T10:53:10+01:00
d/changelog: ready for upload to unstable.
- - - - -
8 changed files:
- README
- cnvs/ascii_export.cpp
- debian/changelog
- + debian/source/lintian-overrides
- debian/watch
- doc/manual.html
- global.h
- version.txt
Changes:
=====================================
README
=====================================
@@ -43,7 +43,7 @@ Compiling and installing on Fedora
====================================
sudo dnf update
-sudo dnf groupinstall "Development Tools" "Development Libraries"
+sudo dnf group install "development-tools"
sudo dnf install g++ qt5-qtbase qt5-qtbase-devel
git clone https://gitlab.com/Teuniz/EDFbrowser.git
cd EDFbrowser
=====================================
cnvs/ascii_export.cpp
=====================================
@@ -134,7 +134,9 @@ void UI_AsciiExportwindow::ExportButtonClicked()
long long data_record_duration,
elapsedtime,
time_tmp,
- d_tmp;
+ d_tmp,
+ onset_tmp,
+ starttime_subsecond=0LL;
double value_tmp;
@@ -353,15 +355,13 @@ void UI_AsciiExportwindow::ExportButtonClicked()
free(scratchpad);
- max_tal_ln = 0;
+ max_tal_ln = 128;
for(r=0; r<nr_annot_chns; r++)
{
if(max_tal_ln<edfparamascii[annot_ch[r]].smp_per_record * samplesize) max_tal_ln = edfparamascii[annot_ch[r]].smp_per_record * samplesize;
}
- if(max_tal_ln<128) max_tal_ln = 128;
-
scratchpad = (char *)calloc(1, max_tal_ln + 3);
if(scratchpad==NULL)
{
@@ -655,6 +655,10 @@ void UI_AsciiExportwindow::ExportButtonClicked()
}
scratchpad[k] = 0;
elapsedtime = atoll_x(scratchpad, FP_SCALING);
+ if(i == 0)
+ {
+ starttime_subsecond = elapsedtime % FP_SCALING;
+ }
/* process annotations */
@@ -736,6 +740,16 @@ void UI_AsciiExportwindow::ExportButtonClicked()
scratchpad[m] = '.';
}
}
+ if(starttime_subsecond)
+ {
+ onset_tmp = atoll_x(time_in_txt, FP_SCALING) - starttime_subsecond;
+#ifdef Q_OS_WIN32
+ __mingw_snprintf(time_in_txt, max_tal_ln + 3, "%lli.%09lli", onset_tmp / FP_SCALING, onset_tmp % FP_SCALING);
+#else
+ snprintf(time_in_txt, max_tal_ln + 3, "%lli.%09lli", onset_tmp / FP_SCALING, onset_tmp % FP_SCALING);
+#endif
+ remove_trailing_zeros(time_in_txt);
+ }
fprintf(annotationfile, "%s,%s,%s\n", time_in_txt, duration_in_txt, scratchpad);
}
n = 0;
=====================================
debian/changelog
=====================================
@@ -1,10 +1,12 @@
-edfbrowser (2.13+dfsg-2) UNRELEASED; urgency=medium
+edfbrowser (2.14+dfsg-1) unstable; urgency=medium
+ * New upstream version 2.14+dfsg
* d/rules: flag -U_FORTIFY_SOURCE for blhc.
This change also packs a bit the d/rules file.
- * d/watch: align UVersion-Mangle to +dfsg suffix.
+ * d/watch: more fixups to version mangling.
+ * d/s/lintian-overrides: new: flag false positive on version mangling.
- -- Étienne Mollier <emollier at debian.org> Thu, 02 Oct 2025 21:49:10 +0200
+ -- Étienne Mollier <emollier at debian.org> Sat, 15 Nov 2025 10:51:15 +0100
edfbrowser (2.13+dfsg-1) unstable; urgency=medium
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# This feels like a false positive, given the presence of
+# dversionmangle: auto in the file.
+debian-watch-not-mangling-version [debian/watch:*]
=====================================
debian/watch
=====================================
@@ -4,7 +4,7 @@ Version: 5
Source: https://www.teuniz.net/edfbrowser/
Matching-Pattern: edfbrowser_(\d+)_source.tar.gz
Compression: xz
-Dversionmangle: s/\(\d\).\(\d\+\)\+dfsg/$1$2/g
+Dversionmangle: auto
Repack: yes
Repacksuffix: +dfsg
-Uversionmangle: s/(\d\d)$/.$1+dfsg/g
+Uversionmangle: s/(\d\d)$/.$1/g
=====================================
doc/manual.html
=====================================
@@ -21,7 +21,7 @@
</style>
</head><body>
-<h1>EDFbrowser 2.13 manual</h1>
+<h1>EDFbrowser 2.14 manual</h1>
<p><br></p>
=====================================
global.h
=====================================
@@ -67,7 +67,7 @@
#endif
#define PROGRAM_NAME "EDFbrowser"
-#define PROGRAM_VERSION "2.13"
+#define PROGRAM_VERSION "2.14"
#define PROGRAM_BETA_SUFFIX ""
#define MINIMUM_QT4_VERSION (0x040807)
#define MINIMUM_QT5_VERSION (0x050C06)
=====================================
version.txt
=====================================
@@ -1,4 +1,11 @@
+ version 2.14 October 26, 2025
+ --------------
+
+ - Fixed a bug in the EDF to ASCII converter that caused wrong onset times for the annotations
+ in case the starttime of the recording had a decimal fraction for the seconds.
+
+
version 2.13 July 2, 2025
--------------
View it on GitLab: https://salsa.debian.org/med-team/edfbrowser/-/compare/6e9cbd0fd1a2f8ad4c723dfd1c71f0e6464cb2aa...47b4c6665627f20d720775d16d6bcea6c0d57b1b
--
View it on GitLab: https://salsa.debian.org/med-team/edfbrowser/-/compare/6e9cbd0fd1a2f8ad4c723dfd1c71f0e6464cb2aa...47b4c6665627f20d720775d16d6bcea6c0d57b1b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20251115/5a71f1f2/attachment-0001.htm>
More information about the debian-med-commit
mailing list