Merge branch 'feature/upstream' into develop

8 files changed, 16 insertions, 41 deletions

diff --git a/changelog b/changelog
index edecea6..62f726d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,6 @@
+2.0.1 - 11th July 2018
+	*   Fix spelling mistakes
+
 2.0.0 - 15th June 2018
 	*   Use spdlog instead of log4cpp as the logger (issue #6)
 
diff --git a/configure.ac b/configure.ac
index 199e35a..c594e34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([bitz-server], [2.0.0], [https://github.com/uditha-atukorala/bitz-server/issues])
+AC_INIT([bitz-server], [2.0.1], [https://github.com/uditha-atukorala/bitz-server/issues])
 AC_CONFIG_AUX_DIR([aux-build])
 AC_CONFIG_MACRO_DIR([aux-build/m4])
 AC_CONFIG_HEADERS([include/config.h])
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
diff --git a/doc/bitz-server.conf.man b/doc/bitz-server.conf.man
index 6bac421..ec4ca34 100644
--- a/doc/bitz-server.conf.man
+++ b/doc/bitz-server.conf.man
@@ -7,7 +7,7 @@ bitz-server.conf \- bitz-server configuration file
 .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/lib/spdlog/common.h b/lib/spdlog/common.h
index e02cb0b..3731c92 100644
--- a/lib/spdlog/common.h
+++ b/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