From e3c9712d0e85afe54f9cc83f047b7c4331680a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 9 Jul 2018 22:24:08 +0200 Subject: New debian/patches/0100-spelling.patch --- debian/changelog | 1 + debian/copyright | 8 ++++---- debian/patches/0100-spelling.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 debian/patches/0100-spelling.patch diff --git a/debian/changelog b/debian/changelog index eb7015f..9671751 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ bitz-server (2.0.0-1) UNRELEASED; urgency=medium - Use secure copyright format URI. - Add new sections for lib/spdlog. - Bump years to 2018. + * New debian/patches/0100-spelling.patch. -- Jörg Frings-Fürst Wed, 27 Jun 2018 16:59:48 +0200 diff --git a/debian/copyright b/debian/copyright index c5bbbfd..b78aa13 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,6 +6,10 @@ Files: * Copyright: 2012-2017 Uditha Atukorala License: GPL-3+ +Files: lib/spdlog/* +Copyright: 2015-2016 Gabi Melman +License: MIT + Files: lib/spdlog/fmt/bundled/* Copyright: 2012-2016 Victor Zverovich License: BSD-2 @@ -23,10 +27,6 @@ Files: lib/spdlog/sinks/windebug_sink.h Copyright: 2017 Alexander Dalshov License: MIT -Files: lib/spdlog/* -Copyright: 2015-2016 Gabi Melman -License: MIT - Files: debian/* Copyright: 2014-2018 Jörg Frings-Fürst License: GPL-3+ diff --git a/debian/patches/0100-spelling.patch b/debian/patches/0100-spelling.patch new file mode 100644 index 0000000..2e3e112 --- /dev/null +++ b/debian/patches/0100-spelling.patch @@ -0,0 +1,18 @@ +Description: Correct spelling +Author: Jörg Frings-Fürst +Forwarded: no +Last-Update: 2018-07-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/spdlog/common.h +=================================================================== +--- trunk.orig/lib/spdlog/common.h ++++ trunk/lib/spdlog/common.h +@@ -183,6 +183,6 @@ using filename_t = std::string; + } \ + catch (...) \ + { \ +- _err_handler("Unknown exeption in logger"); \ ++ _err_handler("Unknown exception in logger"); \ + } + } // namespace spdlog diff --git a/debian/patches/series b/debian/patches/series index 537cd0a..0405e13 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-disable_search_doc.patch 0600-man_page_spelling.patch +0100-spelling.patch -- cgit v1.2.3