diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-15 13:50:01 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-15 13:50:01 +0200 |
| commit | f28c4e10d4bf0597ec370aaebd83c630864426bd (patch) | |
| tree | c70121856d74322844f45a2b3047fa68ea604148 | |
| parent | 4ecd0ccba82aaffe18468380d7659f6c877cdb99 (diff) | |
Remove upstream applied patches
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/0100-spelling.patch | 18 | ||||
| -rw-r--r-- | debian/patches/0600-man_page_spelling.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 4 |
4 files changed, 10 insertions, 38 deletions
diff --git a/debian/changelog b/debian/changelog index 240effb..a13ce9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +bitz-server (2.0.1-1) UNRELEASED; urgency=medium + + * New upstream release: + - Remove upstream applied patches 0600-man_page_spelling.patch and + 0100-spelling.patch + + -- Jörg Frings-Fürst <debian@jff.email> Sun, 15 Jul 2018 09:59:32 +0200 + bitz-server (2.0.0-1) unstable; urgency=medium * New upstream release: diff --git a/debian/patches/0100-spelling.patch b/debian/patches/0100-spelling.patch deleted file mode 100644 index 2e3e112..0000000 --- a/debian/patches/0100-spelling.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Correct spelling -Author: Jörg Frings-Fürst <debian@jff.email> -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/0600-man_page_spelling.patch b/debian/patches/0600-man_page_spelling.patch deleted file mode 100644 index 187628b..0000000 --- a/debian/patches/0600-man_page_spelling.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: correct spelling -Author: Jörg Frings-Fürst <debian@jff-webhosting.net> -Last-Update: 2016-01-30 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/doc/bitz-server.conf.man -=================================================================== ---- trunk.orig/doc/bitz-server.conf.man -+++ trunk/doc/bitz-server.conf.man -@@ -7,7 +7,7 @@ bitz-server.conf \- bitz-server configur - .BR bitz-server (1) - obtains configuration data from a config file, the location of which is specified - at compile-time and can be overridden by command-line options during run-time. --.SS Grammer -+.SS Grammar - Below is the BNF grammar for configuration files. Comments and include directives - are not part of the grammar, so they are not included here. See libconfig manual - at http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-File-Grammar diff --git a/debian/patches/series b/debian/patches/series index 0405e13..9331ec5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ 0001-disable_search_doc.patch -0600-man_page_spelling.patch -0100-spelling.patch +#0600-man_page_spelling.patch +#0100-spelling.patch |