Pick 82063b7 as config_h_before_standard_headers

diff --git a/debian/changelog b/debian/changelog
index 02641c4577fa479fcaa06b520de8c979b53268b8..7df5495015ce8911f07f1c24b0a143ba3fa35119 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ tio (1.14-1) UNRELEASED; urgency=medium
   * New upstream version
   * Fix short license name in debian/copyright
   * Use autoreconf
   * New upstream version
   * Fix short license name in debian/copyright
   * Use autoreconf

+  * New patch:
+    - config_h_before_standard_headers (cherry-picked 82063b7)

 
  -- Jakob Haufe <sur5r@sur5r.net>  Sat, 07 May 2016 18:31:10 +0200
 
 
  -- Jakob Haufe <sur5r@sur5r.net>  Sat, 07 May 2016 18:31:10 +0200
 

diff --git a/debian/patches/config_h_before_standard_headers b/debian/patches/config_h_before_standard_headers
new file mode 100644 (file)
index 0000000..18943e4
--- /dev/null
+++ b/debian/patches/config_h_before_standard_headers
@@ -0,0 +1,75 @@
+Description: Include config.h before standard headers
+ This makes use of 8d6d202 (Enable large file support) for real.
+
+Origin: https://github.com/sur5r/tio/commit/82063b73fbdc9ce60a6cad9558ba63a27435e8f9
+Bug: https://github.com/tio/tio/pull/38
+Forwarded: not-needed
+
+--- tio-1.14.orig/src/error.c
++++ tio-1.14/src/error.c
+@@ -19,6 +19,7 @@
+  * 02110-1301, USA.
+  */
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- tio-1.14.orig/src/log.c
++++ tio-1.14/src/log.c
+@@ -19,6 +19,7 @@
+  * 02110-1301, USA.
+  */
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- tio-1.14.orig/src/main.c
++++ tio-1.14/src/main.c
+@@ -19,6 +19,7 @@
+  * 02110-1301, USA.
+  */
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+--- tio-1.14.orig/src/options.c
++++ tio-1.14/src/options.c
+@@ -19,6 +19,7 @@
+  * 02110-1301, USA.
+  */
+ 
++#include "config.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <string.h>
+@@ -28,7 +29,6 @@
+ #include <getopt.h>
+ #include <termios.h>
+ #include <limits.h>
+-#include "config.h"
+ #include "tio/options.h"
+ #include "tio/error.h"
+ 
+--- tio-1.14.orig/src/time.c
++++ tio-1.14/src/time.c
+@@ -19,6 +19,7 @@
+  * 02110-1301, USA.
+  */
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
+--- tio-1.14.orig/src/tty.c
++++ tio-1.14/src/tty.c
+@@ -19,6 +19,7 @@
+  * 02110-1301, USA.
+  */
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..0aeb1df
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+config_h_before_standard_headers