diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-05-21 11:54:01 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-05-21 11:54:01 +0200 |
| commit | 7b472d5129162a50a991174ce3c6317ab50b3c29 (patch) | |
| tree | f22474377f384366ea1c9b63e86dfeba10927936 /debian | |
| parent | d653efcc3dc6db803a838c78a821b1cef9e618d2 (diff) | |
| download | biboumi-7b472d5129162a50a991174ce3c6317ab50b3c29.tar.gz biboumi-7b472d5129162a50a991174ce3c6317ab50b3c29.tar.bz2 biboumi-7b472d5129162a50a991174ce3c6317ab50b3c29.tar.xz biboumi-7b472d5129162a50a991174ce3c6317ab50b3c29.zip | |
Drop patch cherry-picked upstream and now applied.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/020161125~ad22be4.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 39 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, diff --git a/debian/patches/series b/debian/patches/series index ae6b213..f6c33bb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -020161125~ad22be4.patch 020161204~eb8f1cb.patch 2001_cmake_ignore_git.patch 2002_fix_default_locale.patch |