[SCM] sndobj/master: Import Debian patch 2.6.6.1-5.1

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4f9a17db75219c8a3b74594a208d358e110ac574
Author: Johannes Brandstätter <jbrandst at 2ds.eu>
Date:   Sat Sep 24 15:30:54 2016 +0200

    Import Debian patch 2.6.6.1-5.1

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b408e6c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.pc
diff --git a/debian/changelog b/debian/changelog
index dcabc92..8a5dab9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sndobj (2.6.6.1-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch from Philip Chung to fix compilation with GCC 6. (fixes #811743)
+
+ -- Johannes Brandstätter <jbrandst at 2ds.eu>  Sat, 24 Sep 2016 15:30:54 +0200
+
 sndobj (2.6.6.1-5) unstable; urgency=medium
 
   * Upload to unstable
diff --git a/debian/patches/05-gcc6.patch b/debian/patches/05-gcc6.patch
new file mode 100644
index 0000000..71ade7f
--- /dev/null
+++ b/debian/patches/05-gcc6.patch
@@ -0,0 +1,26 @@
+Description: Change GUID definition to prevent FTBFS with GCC 6
+Author: Philip Chung <philipchung1995 at yahoo.com>
+Bug-Debian: https://bugs.debian.org/811743
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ src/SndWaveX.h |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- SndObj-2.6.6.orig/src/SndWaveX.h
++++ SndObj-2.6.6/src/SndWaveX.h
+@@ -66,10 +66,10 @@
+ #ifndef WIN
+ struct GUID 
+ { 
+-  int			Data1; 
+-  short			Data2; 
+-  short			Data3; 
+-  unsigned char	Data4[8]; 
++  unsigned int   Data1;
++  unsigned short Data2;
++  unsigned short Data3;
++  unsigned char  Data4[8];
+ };
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 204eead..3cccecf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_shlib.patch
 03-gcc43.patch
 04-gcc44.patch
+05-gcc6.patch
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes

-- 
sndobj packaging