From 7327c3426e5fbc2d53446c9df3985dd76c9d6d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 15 Jul 2018 09:59:13 +0200 Subject: New upstream version 2.0.1 --- changelog | 3 +++ configure.ac | 2 +- doc/bitz-server.conf.man | 2 +- lib/spdlog/common.h | 2 +- 4 files changed, 6 insertions(+), 3 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/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 -- cgit v1.2.3 From f28c4e10d4bf0597ec370aaebd83c630864426bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 15 Jul 2018 13:50:01 +0200 Subject: Remove upstream applied patches --- debian/changelog | 8 ++++++++ debian/patches/0100-spelling.patch | 18 ------------------ debian/patches/0600-man_page_spelling.patch | 18 ------------------ debian/patches/series | 4 ++-- 4 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 debian/patches/0100-spelling.patch delete mode 100644 debian/patches/0600-man_page_spelling.patch 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 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 -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 -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 -- cgit v1.2.3 From dbeb566eed5085782944dc4f2d47f9a8ba3fed28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 3 Aug 2018 19:52:17 +0200 Subject: d/changelog: change date/time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a13ce9b..1e95ec6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -bitz-server (2.0.1-1) UNRELEASED; urgency=medium +bitz-server (2.0.1-1) unstable; urgency=medium * New upstream release: - Remove upstream applied patches 0600-man_page_spelling.patch and 0100-spelling.patch - -- Jörg Frings-Fürst Sun, 15 Jul 2018 09:59:32 +0200 + -- Jörg Frings-Fürst Fri, 03 Aug 2018 19:34:54 +0200 bitz-server (2.0.0-1) unstable; urgency=medium -- cgit v1.2.3 From b5d1a44c8a6b401ec6d23ed849ed733f192292e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 00:15:11 +0200 Subject: fix missing CXXFLAGS and LDFLAGS --- debian/changelog | 6 +++++- debian/rules | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1e95ec6..aced019 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,12 @@ bitz-server (2.0.1-1) unstable; urgency=medium * New upstream release: - Remove upstream applied patches 0600-man_page_spelling.patch and 0100-spelling.patch + * debian/rules: + - Add "export DEB_CXXFLAGS_MAINT_APPEND = -fPIE" and + "export DEB_LDFLAGS_MAINT_APPEND = -fPIE -pie" to fix missing CXXFLAGS + and LDFLAGS. - -- Jörg Frings-Fürst Fri, 03 Aug 2018 19:34:54 +0200 + -- Jörg Frings-Fürst Sun, 05 Aug 2018 00:14:26 +0200 bitz-server (2.0.0-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 8e8a98a..14b3671 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,8 @@ #export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_CXXFLAGS_MAINT_APPEND = -fPIE +export DEB_LDFLAGS_MAINT_APPEND = -fPIE -pie VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/') -- cgit v1.2.3