prepare to upload with Paul's version of the mingw fix

diff --git a/debian/changelog b/debian/changelog
index 50c546eda09243af5d19f634f32f4aea1201d8b4..f64efcc65dc92a754e54e350664985e68017e826 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ gzip (1.9-2) unstable; urgency=medium
 
   * move to upstream's less-ugly fix for mingw compilation failure
 
- -- Bdale Garbee <bdale@gag.com>  Sat, 04 Aug 2018 18:03:03 +0800
+ -- Bdale Garbee <bdale@gag.com>  Sun, 05 Aug 2018 08:30:09 +0800
 
 gzip (1.9-1) unstable; urgency=medium
 

diff --git a/debian/patches/fix-mingw-compile.diff b/debian/patches/fix-mingw-compile.diff
deleted file mode 100644 (file)
index 96d63b0..0000000
--- a/debian/patches/fix-mingw-compile.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- gzip-1.9/gzip.c    2018-01-07 13:05:21.000000000 +0800
-+++ /tmp/gzip.c        2018-07-29 14:37:00.228844928 +0800
-@@ -1910,6 +1910,11 @@
-     return OK;
- }
- 
-+#ifdef __MINGW32__
-+typedef int uid_t;
-+typedef int gid_t;
-+#endif
-+
- /* Change the owner and group of a file.  FD is a file descriptor for
-    the file and NAME its name.  Change it to user UID and to group GID.
-    If UID or GID is -1, though, do not change the corresponding user
-@@ -1917,13 +1922,15 @@
- static void
- do_chown (int fd, char const *name, uid_t uid, gid_t gid)
- {
--#ifndef NO_CHOWN
-+#ifndef __MINGW32__
-+#ifndef NO_CHOWN 
- # if HAVE_FCHOWN
-   ignore_value (fchown (fd, uid, gid));
- # else
-   ignore_value (chown (name, uid, gid));
- # endif
- #endif
-+#endif
- }
- 
- /* ========================================================================