From: Bdale Garbee <bdale@gag.com>
Date: Sat, 10 Aug 2013 20:48:20 +0000 (+0200)
Subject: should include the actual patch and debian/changelog entry, too
X-Git-Tag: debian/1.6-2~2
X-Git-Url: https://git.gag.com/?p=debian%2Fgzip;a=commitdiff_plain;h=b8c0c87559530503ecb0e4c534030fb00140123a

should include the actual patch and debian/changelog entry, too
---

diff --git a/debian/changelog b/debian/changelog
index 69c2cf7..edae134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gzip (1.6-2) UNRELEASED; urgency=low
+
+  * patch to update included gnulib for mingw-w64 changes, closes: #713950
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 10 Aug 2013 22:47:47 +0200
+
 gzip (1.6-1) unstable; urgency=low
 
   * new upstream version, closes: #704689, #690583, #521432, #96195, #693463
diff --git a/debian/patches/gnulib-mingw-w64.diff b/debian/patches/gnulib-mingw-w64.diff
new file mode 100644
index 0000000..ce7b176
--- /dev/null
+++ b/debian/patches/gnulib-mingw-w64.diff
@@ -0,0 +1,35 @@
+Description: Use __cdecl instead of cdecl
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Origin: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=86725346a1b116f3c2da26c124288f5f4495bf69
+
+diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c
+index ef2b860..1873e23 100644
+--- a/lib/msvc-inval.c
++++ b/lib/msvc-inval.c
+@@ -28,7 +28,7 @@
+ 
+ # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
+ 
+-static void cdecl
++static void __cdecl
+ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
+                                    const wchar_t *function,
+                                    const wchar_t *file,
+@@ -45,7 +45,7 @@ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
+ 
+ #  if defined _MSC_VER
+ 
+-static void cdecl
++static void __cdecl
+ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
+                                    const wchar_t *function,
+                                    const wchar_t *file,
+@@ -94,7 +94,7 @@ gl_msvc_inval_current (void)
+     }
+ }
+ 
+-static void cdecl
++static void __cdecl
+ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
+                                    const wchar_t *function,
+                                    const wchar_t *file,