New upstream version

The only patch we had was merged upstream, so dropping d/patches.

diff --git a/debian/changelog b/debian/changelog
index e477dac38cce75c6f9f430e17932f7d761b00643..645b912bbda0d4e2faac8f031df834084fe75bd1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-tio (1.14-2) UNRELEASED; urgency=medium
+tio (1.18-1) UNRELEASED; urgency=medium

 
 

+  * New upstream version
+  * Drop patch (applied upstream):
+    - config_h_before_standard_headers

   * Lower watchfile version to 3 as infrastructure does not support version 4
     yet and we don't use any features from version 4.
   * Drop now-unneeded build dependency on autotools-dev
   * Lower watchfile version to 3 as infrastructure does not support version 4
     yet and we don't use any features from version 4.
   * Drop now-unneeded build dependency on autotools-dev

diff --git a/debian/patches/config_h_before_standard_headers b/debian/patches/config_h_before_standard_headers
deleted file mode 100644 (file)
index 18943e4..0000000
--- a/debian/patches/config_h_before_standard_headers
+++ /dev/null
@@ -1,75 +0,0 @@
-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
deleted file mode 100644 (file)
index 0aeb1df..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-config_h_before_standard_headers