Control: tags 1066667 + patch Control: tags 1066667 + pending
Dear maintainer, I've prepared an NMU for dia2code (versioned as 0.8.3-4.3) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. I've made some small updates to the general package too, so this NMU is slightly broader than usual. Kind regards, Hugh
diff -Nru dia2code-0.8.3/debian/changelog dia2code-0.8.3/debian/changelog --- dia2code-0.8.3/debian/changelog 2022-04-03 17:55:21.000000000 +1000 +++ dia2code-0.8.3/debian/changelog 2025-01-04 23:30:21.000000000 +1100 @@ -1,3 +1,21 @@ +dia2code (0.8.3-4.3) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control: + + Build-Depend on pkgconf instead of pkg-config. + + Raise Standards-Version to 4.7.0 from 4.6.0 (no changes needed). + + Remove initial indefinite article from the short package description. + * debian/copyright: Update for 2025. + * debian/patches: + + generate_close_java.patch: + - Use fclose() to close FILE *dummyfile (Closes: #1066667). + - Fix spelling error (inheritence -> inheritance) (lintian). + + parse_diagram-header.patch: Add insert_attribute() prototype. + + fprint-arg-ruby.patch: Remove un-needed fprintf() argument without + format specifier. + + -- Hugh McMaster <h...@debian.org> Sat, 04 Jan 2025 23:30:21 +1100 + dia2code (0.8.3-4.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru dia2code-0.8.3/debian/control dia2code-0.8.3/debian/control --- dia2code-0.8.3/debian/control 2022-04-03 17:55:21.000000000 +1000 +++ dia2code-0.8.3/debian/control 2025-01-04 23:22:18.000000000 +1100 @@ -5,9 +5,9 @@ debhelper-compat (= 13), automake, libxml2-dev, - pkg-config + pkgconf Maintainer: Francesco Aloe <francescoaloe4gnuli...@gmail.com> -Standards-Version: 4.6.0 +Standards-Version: 4.7.0 Rules-Requires-Root: no Homepage: https://sourceforge.net/projects/dia2code/ @@ -15,7 +15,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: dia -Description: a dia-UML code generator +Description: dia-UML code generator dia2code is a code generator which uses UML diagrams produced by dia, and turns them into C, C++, Java, Ada, PHP, Python, Shapefile, SQL, and C# files. diff -Nru dia2code-0.8.3/debian/copyright dia2code-0.8.3/debian/copyright --- dia2code-0.8.3/debian/copyright 2022-04-03 17:09:51.000000000 +1000 +++ dia2code-0.8.3/debian/copyright 2025-01-04 23:06:08.000000000 +1100 @@ -23,7 +23,7 @@ 2007 Stefano Zacchiroli 2007, 2010 Francesco Aloe 2020 Sudip Mukherjee - 2022 Hugh McMaster + 2022, 2025 Hugh McMaster License: GPL-2+ Files: dia2code/generate_code_ada.c diff -Nru dia2code-0.8.3/debian/patches/fprint-arg-ruby.patch dia2code-0.8.3/debian/patches/fprint-arg-ruby.patch --- dia2code-0.8.3/debian/patches/fprint-arg-ruby.patch 1970-01-01 10:00:00.000000000 +1000 +++ dia2code-0.8.3/debian/patches/fprint-arg-ruby.patch 2025-01-04 23:17:06.000000000 +1100 @@ -0,0 +1,16 @@ +Description: Remove un-needed fprintf() argument without format specifier +Author: Hugh McMaster <h...@debian.org> +Forwarded: not-needed +Last-Update: 2025-01-04 + +--- a/dia2code/generate_code_ruby.c ++++ b/dia2code/generate_code_ruby.c +@@ -174,7 +174,7 @@ + if ( strlen(tmplist->key->comment) > 0 ) { + fprintf(outfile,"# %s\n",tmplist->key->comment); + } else { +- fprintf(outfile,"# XXX\n",tmplist->key->comment); ++ fprintf(outfile,"# XXX\n"); + } + + if (tmplist->key->isabstract) { diff -Nru dia2code-0.8.3/debian/patches/generate_code_java.patch dia2code-0.8.3/debian/patches/generate_code_java.patch --- dia2code-0.8.3/debian/patches/generate_code_java.patch 1970-01-01 10:00:00.000000000 +1000 +++ dia2code-0.8.3/debian/patches/generate_code_java.patch 2025-01-04 23:29:58.000000000 +1100 @@ -0,0 +1,28 @@ +Description: Fix FTBFS and a lintian issue. + - Use fclose() to close FILE *dummyfile. + - Fix spelling error (inheritence -> inheritance). +Author: Hugh McMaster <h...@debian.org> +Bug-Debian: https://bugs.debian.org/1066667 +Forwarded: not-needed +Last-Update: 2025-01-04 + +--- a/dia2code/generate_code_java.c ++++ b/dia2code/generate_code_java.c +@@ -129,7 +129,7 @@ + if (file_found) + { + d2c_parse_impl(dummyfile, "//", ""); +- close(dummyfile); ++ fclose(dummyfile); + if (d2c_backup(outfilename)) + exit(5); + } +@@ -231,7 +231,7 @@ + // If you want to implement flexibility to add "extends", then the brace must be on the next line. + if (1) // if (dumping_implementations) + d2c_fprintf(outfile, "\n"); +- d2c_dump_impl(outfile, "inheritence", ""); ++ d2c_dump_impl(outfile, "inheritance", ""); + + d2c_open_brace(outfile, ""); + diff -Nru dia2code-0.8.3/debian/patches/parse_diagram-header.patch dia2code-0.8.3/debian/patches/parse_diagram-header.patch --- dia2code-0.8.3/debian/patches/parse_diagram-header.patch 1970-01-01 10:00:00.000000000 +1000 +++ dia2code-0.8.3/debian/patches/parse_diagram-header.patch 2025-01-04 23:00:09.000000000 +1100 @@ -0,0 +1,14 @@ +Description: Add insert_attribute() prototype to fix FTBFS. +Author: Hugh McMaster <h...@debian.org> +Forwarded: not-needed +Last-Update: 2025-01-04 + +--- a/dia2code/parse_diagram.h ++++ b/dia2code/parse_diagram.h +@@ -17,5 +17,6 @@ + + #include "dia2code.h" + ++umlattrlist insert_attribute(umlattrlist, umlattrlist); + umlclasslist parse_diagram(char *diafile); + diff -Nru dia2code-0.8.3/debian/patches/series dia2code-0.8.3/debian/patches/series --- dia2code-0.8.3/debian/patches/series 2022-04-03 17:11:49.000000000 +1000 +++ dia2code-0.8.3/debian/patches/series 2025-01-04 23:27:43.000000000 +1100 @@ -3,3 +3,6 @@ fix_parse_diagram_c.patch fix_manpage.patch pkg-config.patch +generate_code_java.patch +parse_diagram-header.patch +fprint-arg-ruby.patch
