summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2020-08-30 23:05:33 +0100
committerSudip Mukherjee <sudipm.mukherjee@gmail.com>2020-08-30 23:05:33 +0100
commitfe1ddc2fb0d1b2d2ea26b90874ac29c237a0d59e (patch)
tree590ce84c6c202ea6879ccb1d6c219d312f722668 /debian
parent223af9e01db93049ad216d5979214ce0463d6bcf (diff)
Import Debian changes 0.4.0-1.1
gdigi (0.4.0-1.1) unstable; urgency=medium . * Non-maintainer upload. * Fix ftbfs with GCC-10. (Closes: #957262)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/gcc-10.patch28
-rw-r--r--debian/patches/series1
3 files changed, 36 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 7c3a303..8009b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdigi (0.4.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix ftbfs with GCC-10. (Closes: #957262)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com> Sun, 30 Aug 2020 23:05:33 +0100
+
gdigi (0.4.0-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/gcc-10.patch b/debian/patches/gcc-10.patch
new file mode 100644
index 0000000..299cc3c
--- /dev/null
+++ b/debian/patches/gcc-10.patch
@@ -0,0 +1,28 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Bug-Debian: https://bugs.debian.org/957262
+Forwarded: no
+
+---
+
+--- gdigi-0.4.0.orig/gdigi.h
++++ gdigi-0.4.0/gdigi.h
+@@ -42,7 +42,7 @@ gboolean debug_flag_is_set (debug_flags_
+ #define GNX_CABINET_WARP 263
+ #define GNX_CHANNEL_FS_MODE 264
+
+-unsigned char product_id;
++extern unsigned char product_id;
+
+ enum {
+ GNX3K_WAH_TYPE_CRY = 129,
+@@ -1105,7 +1105,7 @@ enum {
+ GENETX_TYPE_CABINET
+ };
+
+-enum {
++typedef enum {
+ GENETX_CHANNEL1 = 0,
+ GENETX_CHANNEL2 = 1,
+ GENETX_CHANNEL1_CUSTOM = 2,
diff --git a/debian/patches/series b/debian/patches/series
index ff8b79a..82cf20c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-Modify-distclean-and-install-targets.patch
02-Update-categories-in-gdigi-desktop-file.patch
+gcc-10.patch