Merge remote-tracking branch 'remotes/debian/master' into debian

1 files changed, 0 insertions, 38 deletions

diff --git a/debian/patches/020161125~ad22be4.patch b/debian/patches/020161125~ad22be4.patch
deleted file mode 100644
index 46013bc..0000000
--- a/debian/patches/020161125~ad22be4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Do not fail to build if litesql is not there
-Origin: upstream, https://lab.louiz.org/louiz/biboumi/commit/ad22be4
-Author: louiz’ <louiz@louiz.org>
-Forwarded: yes
-Last-Update: 2016-12-21
-
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -12,7 +12,9 @@
- 
- #include <atomic>
- #include <signal.h>
--#include <litesql.hpp>
-+#ifdef USE_DATABASE
-+# include <litesql.hpp>
-+#endif
- 
- // A flag set by the SIGINT signal handler.
- static std::atomic<bool> stop(false);
-@@ -83,11 +85,14 @@
-   if (hostname.empty())
-     return config_help("hostname");
- 
-+
-+#ifdef USE_DATABASE
-   try {
--      open_database();
--    } catch (const litesql::DatabaseError&) {
--      return 1;
--    }
-+    open_database();
-+  } catch (const litesql::DatabaseError&) {
-+    return 1;
-+  }
-+#endif
- 
-   // Block the signals we want to manage. They will be unblocked only during
-   // the epoll_pwait or ppoll calls. This avoids some race conditions,