tags 811594 patch thanks The following patch should fix things up. Sending it upstream as well.
--- debian/changelog | 7 +++++ debian/patches/fix-ftbfs-in-gcc-6.patch | 51 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 59 insertions(+) create mode 100644 debian/patches/fix-ftbfs-in-gcc-6.patch diff --git a/debian/changelog b/debian/changelog index 26a8e39..7ac9767 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +chordii (4.3+repack-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix confusing indentation in src/a2crd.c. (Closes: #811594) + + -- Mike Gerow <ge...@mgerow.com> Thu, 07 Jul 2016 18:57:11 +0200 + chordii (4.3+repack-2) unstable; urgency=low [ Malcolm Locke ] diff --git a/debian/patches/fix-ftbfs-in-gcc-6.patch b/debian/patches/fix-ftbfs-in-gcc-6.patch new file mode 100644 index 0000000..9be31cf --- /dev/null +++ b/debian/patches/fix-ftbfs-in-gcc-6.patch @@ -0,0 +1,51 @@ +--- a/src/a2crd.c ++++ b/src/a2crd.c +@@ -353,27 +353,27 @@ + } + + +- if (optind == argc) +- { +- debug ("Reading stdin"); +- strcpy(source, "stdin"); +- process_file (stdin); +- } +- else +- { +- for ( ; optind < argc; optind++ ) +- { +- sprintf (mesg, "Ready to process file \"%s\"\n", argv[optind]); +- debug (mesg); +- +- strcpy(source, argv[optind]); +- +- sprintf (mesg, "Calling read_input_file on \"%s\"\n", source); +- debug (mesg); +- +- read_input_file(source, source_fd); +- } +- } ++if (optind == argc) ++ { ++ debug ("Reading stdin"); ++ strcpy(source, "stdin"); ++ process_file (stdin); ++ } ++else ++ { ++ for ( ; optind < argc; optind++ ) ++ { ++ sprintf (mesg, "Ready to process file \"%s\"\n", argv[optind]); ++ debug (mesg); ++ ++ strcpy(source, argv[optind]); ++ ++ sprintf (mesg, "Calling read_input_file on \"%s\"\n", source); ++ debug (mesg); ++ ++ read_input_file(source, source_fd); ++ } ++ } + + return(0); + } diff --git a/debian/patches/series b/debian/patches/series index 0f99d38..7a51209 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ fix-manpage.patch fix-spelling-error.patch remove-surplus-man-mans-rule.diff +fix-ftbfs-in-gcc-6.patch -- 2.8.1 -- Mike Gerow ge...@mgerow.com
signature.asc
Description: PGP signature