Bug#957019: atlc: diff for NMU version 4.6.1-2.1

2020-08-05 Thread Bdale Garbee
Sudip Mukherjee  writes:

> Control: tags 957019 + patch
> Control: tags 957019 + pending
>
> Dear maintainer,
>
> I've prepared an NMU for atlc (versioned as 4.6.1-2.1) and
> uploaded it to DELAYED/5. Please feel free to tell me if I
> should cancel it.

Thank you!

Bdale


signature.asc
Description: PGP signature


Bug#957019: atlc: diff for NMU version 4.6.1-2.1

2020-08-05 Thread Sudip Mukherjee
Control: tags 957019 + patch
Control: tags 957019 + pending

Dear maintainer,

I've prepared an NMU for atlc (versioned as 4.6.1-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should cancel it.

--
Regards
Sudip

diff -Nru atlc-4.6.1/debian/changelog atlc-4.6.1/debian/changelog
--- atlc-4.6.1/debian/changelog 2017-12-30 04:06:57.0 +
+++ atlc-4.6.1/debian/changelog 2020-08-05 12:17:38.0 +0100
@@ -1,3 +1,10 @@
+atlc (4.6.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ftbfs with GCC-10. (Closes: #957019)
+
+ -- Sudip Mukherjee   Wed, 05 Aug 2020 12:17:38 
+0100
+
 atlc (4.6.1-2) unstable; urgency=medium
 
   * remove libgsl0-dev build dependency, closes: #823876
diff -Nru atlc-4.6.1/debian/patches/fix_ftbfs.patch 
atlc-4.6.1/debian/patches/fix_ftbfs.patch
--- atlc-4.6.1/debian/patches/fix_ftbfs.patch   1970-01-01 01:00:00.0 
+0100
+++ atlc-4.6.1/debian/patches/fix_ftbfs.patch   2020-08-05 12:10:16.0 
+0100
@@ -0,0 +1,19 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee 
+Bug-Debian: https://bugs.debian.org/957019
+Forwarded: no
+
+---
+
+--- atlc-4.6.1.orig/src/swap_conductor_voltages.c
 atlc-4.6.1/src/swap_conductor_voltages.c
+@@ -36,7 +36,7 @@ CONDUCTOR_MINUS_ONE_V in definitions.h *
+ #include "definitions.h"
+ 
+ extern int width, height;
+-unsigned char **oddity;
++extern unsigned char **oddity;
+ extern double **Vij;
+ 
+ /* This swaps any conductor orignally at -1 V to +1 V. Any
diff -Nru atlc-4.6.1/debian/patches/series atlc-4.6.1/debian/patches/series
--- atlc-4.6.1/debian/patches/series2017-12-30 04:06:57.0 +
+++ atlc-4.6.1/debian/patches/series2020-08-05 12:08:40.0 +0100
@@ -1,3 +1,4 @@
 atlc.1.patch
 lintian-fixes.diff
 lintian-fixes2.diff
+fix_ftbfs.patch