Control: tags 1074722 + patch Dear maintainer,
I've prepared an NMU for xtrkcad (versioned as 1:5.2.0Beta2.1-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru xtrkcad-5.2.0Beta2.1/debian/changelog xtrkcad-5.2.0Beta2.1/debian/changelog --- xtrkcad-5.2.0Beta2.1/debian/changelog 2024-04-03 10:41:33.000000000 +0200 +++ xtrkcad-5.2.0Beta2.1/debian/changelog 2024-11-11 19:07:28.000000000 +0100 @@ -1,3 +1,11 @@ +xtrkcad (1:5.2.0Beta2.1-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Remove invalid c-format specifier in fi.po to fix a FTBFS. (Closes: + #1074722.) + + -- Tobias Frost <t...@debian.org> Mon, 11 Nov 2024 19:07:28 +0100 + xtrkcad (1:5.2.0Beta2.1-2) unstable; urgency=medium * debian/patches: diff -Nru xtrkcad-5.2.0Beta2.1/debian/patches/0901-implicit-function-declaration.patch xtrkcad-5.2.0Beta2.1/debian/patches/0901-implicit-function-declaration.patch --- xtrkcad-5.2.0Beta2.1/debian/patches/0901-implicit-function-declaration.patch 2024-04-03 10:41:33.000000000 +0200 +++ xtrkcad-5.2.0Beta2.1/debian/patches/0901-implicit-function-declaration.patch 2024-11-11 19:07:28.000000000 +0100 @@ -1,3 +1,12 @@ +Description: Fix FTBFS for a po message string marked as c-format, but not using variables + to avoid that msgfmt will bail out. +Author: Tobias Frost <t...@debian.org> +Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074722 +Forwarded: not-needed, fixed already with new upstream version. +Last-Update: 2024-11-11 <YYYY-MM-DD, last update of the meta-information, optional> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/app/bin/ctext.c +++ b/app/bin/ctext.c @@ -36,6 +36,7 @@ diff -Nru xtrkcad-5.2.0Beta2.1/debian/patches/0902-fix-bug-1074722.patch xtrkcad-5.2.0Beta2.1/debian/patches/0902-fix-bug-1074722.patch --- xtrkcad-5.2.0Beta2.1/debian/patches/0902-fix-bug-1074722.patch 1970-01-01 01:00:00.000000000 +0100 +++ xtrkcad-5.2.0Beta2.1/debian/patches/0902-fix-bug-1074722.patch 2024-11-11 19:07:28.000000000 +0100 @@ -0,0 +1,10 @@ +--- a/app/i18n/fi.po ++++ b/app/i18n/fi.po +@@ -12813,7 +12813,6 @@ + + #. i18n: C:/Users/mf/Documents/XTrackCAD/src/work/app/lib/demos/dmhelix.xtr:28 + #: ../../../../build/work/app/i18n/custmsg.h:627 +-#, c-format + msgid "" + "We will be creating a helix with a Elevation Difference of 12\", Grade of " + "1.5% and limit the Vertical Separation to at least 2\".\n" diff -Nru xtrkcad-5.2.0Beta2.1/debian/patches/series xtrkcad-5.2.0Beta2.1/debian/patches/series --- xtrkcad-5.2.0Beta2.1/debian/patches/series 2024-04-03 10:41:33.000000000 +0200 +++ xtrkcad-5.2.0Beta2.1/debian/patches/series 2024-11-11 19:07:28.000000000 +0100 @@ -1,2 +1,3 @@ 0900-spelling-errors.patch 0901-implicit-function-declaration.patch +0902-fix-bug-1074722.patch
