Drop two patches (taken from upstream or fixed identically), refresh one (offset).

diff --git a/debian/patches/json-c.patch b/debian/patches/json-c.patch
deleted file mode 100644 (file)
index ef1797e..0000000
--- a/debian/patches/json-c.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: adjust to json-c in Debian
-Origin: vendor
-Forwarded: not-needed
-Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2013-12-08
-Applied: https://github.com/gregkh/bti/commit/97903ba5504223b7177cfe23292d49ae577e1665
-
---- a/bti.c
-+++ b/bti.c
-@@ -32,7 +32,7 @@
- #include <libxml/xmlmemory.h>
- #include <libxml/parser.h>
- #include <libxml/tree.h>
--#include <json/json.h>
-+#include <json-c/json.h>
- #include <pcre.h>
- #include <termios.h>
- #include <dlfcn.h>
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,7 @@
- PKG_CHECK_MODULES(LIBPCRE, libpcre)
- PKG_CHECK_MODULES([LIBCURL], [libcurl])
- PKG_CHECK_MODULES([XML], [libxml-2.0])
--PKG_CHECK_MODULES([JSON], [json])
-+PKG_CHECK_MODULES([JSON], [json-c])
- 
- AC_SEARCH_LIBS([dlopen], [dl])
- 

diff --git a/debian/patches/manpage-debian.patch b/debian/patches/manpage-debian.patch
index f07653b..58f1fad 100644 (file)
--- a/debian/patches/manpage-debian.patch
+++ b/debian/patches/manpage-debian.patch
@@ -3,11 +3,11 @@ Description: change the pointer to the example config file on Debian systems
 Origin: vendor
 Forwarded: not-needed
 Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2013-06-28
+Last-Update: 2014-01-15
 
 --- a/bti.xml
 +++ b/bti.xml
-@@ -408,9 +408,9 @@
+@@ -399,9 +399,9 @@
             </varlistentry>
          </variablelist>
           <para>

diff --git a/debian/patches/series b/debian/patches/series
index 08f0fd1..ff0222f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 manpage-debian.patch
-json-c.patch
 spelling.patch
-use-EIO-instead-of-EREMOTEIO.patch

diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index f6348fa..9c25788 100644 (file)
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -3,7 +3,7 @@ Origin: vendor
 Bug: https://github.com/gregkh/bti/issues/28
 Forwarded: https://github.com/gregkh/bti/issues/28
 Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2013-06-28
+Last-Update: 2014-01-15
 
 --- a/bti.xml
 +++ b/bti.xml

diff --git a/debian/patches/use-EIO-instead-of-EREMOTEIO.patch b/debian/patches/use-EIO-instead-of-EREMOTEIO.patch
deleted file mode 100644 (file)
index c7540e5..0000000
--- a/debian/patches/use-EIO-instead-of-EREMOTEIO.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Origin: upstream git, https://github.com/gregkh/bti
-Bug-Debian: http://bugs.debian.org/714335
-Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2013-06-28
-
-From 7dc7db4f2b52a02f9fd960e0980b33082f65883c Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Thu, 27 Jun 2013 20:13:09 -0700
-Subject: [PATCH] use -EIO instead of -EREMOTEIO
-
-The BSDs don't have EREMOTEIO, and all we really care about is an error
-occurred, so use one that all systems should have.
----
- bti.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/bti.c b/bti.c
-index 3138e02..f8cc151 100644
---- a/bti.c
-+++ b/bti.c
-@@ -685,7 +685,7 @@ static int parse_response_json(char *document, struct session *session)
-                               results.code, results.message);
-               fprintf(stderr, "error condition detected: %d = %s\n",
-                       results.code, results.message);
--              return -EREMOTEIO;
-+              return -EIO;
-       }
-       return 0;
- }
-@@ -727,13 +727,13 @@ static int parse_response_xml(char *document, struct session *session)
-                               "response.xml", NULL,
-                               XML_PARSE_NOERROR);
-       if (doc == NULL)
--              return -EREMOTEIO;
-+              return -EIO;
- 
-       current = xmlDocGetRootElement(doc);
-       if (current == NULL) {
-               fprintf(stderr, "empty document\n");
-               xmlFreeDoc(doc);
--              return -EREMOTEIO;
-+              return -EIO;
-       }
- 
-       if (xmlStrcmp(current->name, (const xmlChar *) "status")) {
-@@ -742,7 +742,7 @@ static int parse_response_xml(char *document, struct session *session)
-                               && xmlStrcmp(current->name, (const xmlChar *) "errors")) {
-                               fprintf(stderr, "unexpected document type\n");
-                               xmlFreeDoc(doc);
--                              return -EREMOTEIO;
-+                              return -EIO;
-                       } else {
-                               xmlChar *text=NULL;
-                               while (current != NULL) {
-@@ -764,7 +764,7 @@ static int parse_response_xml(char *document, struct session *session)
-                                       fprintf(stderr, "unknown error condition\n");
- 
-                               xmlFreeDoc(doc);
--                              return -EREMOTEIO;
-+                              return -EIO;
-                       }
-               }
-       }
--- 
-1.8.1.6
-