Dear all,I forgot to attach the debdiff in my last mail, therefore I'm sending it now.
Best regards, Martin
diff -Nru gummi-0.8.1/debian/changelog gummi-0.8.3~really~0.8.1/debian/changelog --- gummi-0.8.1/debian/changelog 2020-03-25 19:27:44.000000000 +0100 +++ gummi-0.8.3~really~0.8.1/debian/changelog 2023-05-02 10:26:49.000000000 +0200 @@ -1,3 +1,17 @@ +gummi (0.8.3~really~0.8.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply patch to fix typesetter parsing (Closes: #1012150) + + -- Martin Dosch <martin@mdosch.de> Tue, 02 May 2023 08:26:49 +0000 + +gummi (0.8.3-1) unstable; urgency=high + + * Team Upload + * New upstream version 0.8.3 (Closes: #1030293, #1012150) + + -- Martin Dosch <martin@mdosch.de> Fri, 21 Apr 2023 05:15:00 +0000 + gummi (0.8.1-1) unstable; urgency=medium * Team Upload diff -Nru gummi-0.8.1/debian/patches/0002-fix-typesetter-parsing gummi-0.8.3~really~0.8.1/debian/patches/0002-fix-typesetter-parsing --- gummi-0.8.1/debian/patches/0002-fix-typesetter-parsing 1970-01-01 01:00:00.000000000 +0100 +++ gummi-0.8.3~really~0.8.1/debian/patches/0002-fix-typesetter-parsing 2023-05-02 10:08:58.000000000 +0200 @@ -0,0 +1,85 @@ +Description: fix typesetter parsing bug +Origin: upstream, https://github.com/alexandervdm/gummi/commit/99a64220ad51308b1bd3e1c938743ff08c9b769b +Bug: https://github.com/alexandervdm/gummi/issues/169 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/external.c ++++ b/src/external.c +@@ -34,8 +34,8 @@ + + /* local functions */ + static gchar* get_version_output (const gchar* command, int linenr); +-static gchar* version_latexmk (const gchar* output); +-static gchar* version_rubber (const gchar* output); ++static gchar* version_latexmk (gchar* output); ++static gchar* version_rubber (gchar* output); + + + static gdouble get_texlive_version (void); +@@ -80,16 +80,19 @@ + } + + gchar* external_version (const gchar* program) { +- const gchar* getversion = g_strdup_printf("%s --version", program); +- Tuple2 cmdgetv = utils_popen_r (getversion, NULL); +- gchar* output = (gchar*)cmdgetv.second; ++ gchar* version_output; ++ gchar* result; + +- gchar* result = g_strdup ("Unknown, please report a bug"); ++ const gchar* version_cmd = g_strdup_printf("%s --version", program); ++ Tuple2 cmdgetv = utils_popen_r (version_cmd, NULL); ++ version_output = (gchar*)cmdgetv.second; + +- if (output == NULL) return result; +- +- gchar** lines = g_strsplit(output, "\n", BUFSIZ); +- result = lines[0]; ++ if (version_output == NULL || g_str_equal (version_output, "")) { ++ return g_strdup_printf("Unknown, please report a bug"); ++ } ++ else { ++ result = g_strstrip (version_output); ++ } + + /* pdfTeX 3.1415926-1.40.10 (TeX Live 2009) + pdfTeX 3.1415926-1.40.11-2.2 (TeX Live 2010) +@@ -101,7 +104,7 @@ + result = version_rubber (result); + } + else if (STR_EQU (program, C_LATEXMK)) { +- result = version_latexmk (lines[1]); ++ result = version_latexmk (result); + } + + return result; +@@ -145,16 +148,20 @@ + return version; + } + +-static gchar* version_rubber (const gchar* output) { +- /* format: Rubber version: 1.1 */ +- gchar** version = g_strsplit (output, " ", BUFSIZ); +- return version[2]; ++static gchar* version_rubber (gchar* output) { ++ // format: Rubber version: 1.1 ++ gchar** outarr = g_strsplit (output, " ", BUFSIZ); ++ gchar* version = g_strdup (outarr [g_strv_length(outarr) - 1]); ++ ++ g_strfreev (outarr); ++ return version; + } + +-static gchar* version_latexmk (const gchar* output) { +- /* latexmk --version seems to print the requested information after a \n +- format: Latexmk, John Collins, 24 March 2011. Version 4.23a */ ++static gchar* version_latexmk (gchar* output) { ++ // format: Latexmk, John Collins, 24 March 2011. Version 4.23a ++ gchar** outarr = g_strsplit (output, " ", BUFSIZ); ++ gchar* version = g_strdup (outarr [g_strv_length(outarr) - 1]); + +- gchar** version = g_strsplit (output, " ", BUFSIZ); +- return version[7]; ++ g_strfreev (outarr); ++ return version; + } diff -Nru gummi-0.8.1/debian/patches/series gummi-0.8.3~really~0.8.1/debian/patches/series --- gummi-0.8.1/debian/patches/series 2020-03-25 19:27:44.000000000 +0100 +++ gummi-0.8.3~really~0.8.1/debian/patches/series 2023-05-02 10:09:26.000000000 +0200 @@ -1 +1,2 @@ 0001-spellings.patch +0002-fix-typesetter-parsing
Attachment:
signature.asc
Description: PGP signature