diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/bitz-server-doc.docs | 1 | ||||
| -rw-r--r-- | debian/changelog | 22 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rw-r--r-- | debian/copyright | 75 | ||||
| -rw-r--r-- | debian/patches/0100-spelling.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 |
8 files changed, 122 insertions, 11 deletions
diff --git a/debian/bitz-server-doc.docs b/debian/bitz-server-doc.docs deleted file mode 100644 index 42061c0..0000000 --- a/debian/bitz-server-doc.docs +++ /dev/null @@ -1 +0,0 @@ -README.md
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 2a2779a..240effb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +bitz-server (2.0.0-1) unstable; urgency=medium + + * New upstream release: + - Switch from log4cpp to spdlog. + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. + * Declare compliance with Debian Policy 4.1.5 (No changes needed). + * debian/control: + - Switch Vcs-* to new location. + - Change Build-Depends from liblog4cpp5-dev to libspdlog-dev. + * debian/rules: + - Switch from deprecated dh_systemd_enable to dh_installsystemd. + * debian/copyright: + - Use secure copyright format URI. + - Add new sections for lib/spdlog. + - Bump years to 2018. + * New debian/patches/0100-spelling.patch. + * Remove debian/bitz-server-doc.docs to prevent twin install of README.md. + + -- Jörg Frings-Fürst <debian@jff.email> Tue, 10 Jul 2018 20:15:54 +0200 + bitz-server (1.0.2-1) unstable; urgency=medium * New upstream release: diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 843180f..7a631d0 100644 --- a/debian/control +++ b/debian/control @@ -4,19 +4,19 @@ Priority: optional Maintainer: Jörg Frings-Fürst <debian@jff.email> Uploaders: Uditha Atukorala <ua@nuked.zone> Build-Depends: - debhelper (>= 10), + debhelper (>= 11), dh-python, libconfig++-dev, - liblog4cpp5-dev, + libspdlog-dev, libpsocksxx-dev, python-dev, libpython-dev Build-Depends-Indep: doxygen -Standards-Version: 4.1.2.0 +Standards-Version: 4.1.5 Homepage: https://github.com/uditha-atukorala/bitz-server -Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/bitz-server.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/bitz-server.git +Vcs-Git: git://jff.email/opt/git/bitz-server.git +Vcs-Browser: https://jff.email/cgit/bitz-server.git/ Package: bitz-server Architecture: any diff --git a/debian/copyright b/debian/copyright index 443ff37..b78aa13 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: bitz-server Source: https://github.com/uditha-atukorala/bitz-server @@ -6,8 +6,29 @@ Files: * Copyright: 2012-2017 Uditha Atukorala <ua@nuked.zone> 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 + +Files: lib/spdlog/sinks/dist_sink.h +Copyright: 2015 David Schury, Gabi Melman +License: MIT + +Files: lib/spdlog/sinks/ansicolor_sink.h + lib/spdlog/sinks/wincolor_sink.h +Copyright: 2016-2017 spdlog authors +License: MIT + +Files: lib/spdlog/sinks/windebug_sink.h +Copyright: 2017 Alexander Dalshov +License: MIT + Files: debian/* -Copyright: 2014-2017 Jörg Frings-Fürst <debian@jff.email> +Copyright: 2014-2018 Jörg Frings-Fürst <debian@jff.email> License: GPL-3+ License: GPL-3+ @@ -26,3 +47,53 @@ License: GPL-3+ . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +License: BSD-2 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: MIT + All rights reserved. No part of this source code may be reproduced, + stored in a retrieval system, or transmitted, in any form or by any + means, electronic, mechanical, photocopying, recording or otherwise, + except as stated in the end-user licence agreement, without the prior + permission of the copyright owners. + . + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of OSF, UI or X/Open not be used in + advertising or publicity pertaining to distribution of the software + without specific, written prior permission. OSF, UI and X/Open make + no representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + . + OSF, UI and X/Open DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL OSF, UI or X/Open BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. 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 <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/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 diff --git a/debian/rules b/debian/rules index c0918f1..8e8a98a 100755 --- a/debian/rules +++ b/debian/rules @@ -38,5 +38,5 @@ override_dh_makeshlibs: dh_makeshlibs dpkg-gensymbols -v$(VERSION) -plibicap1 -override_dh_systemd_enable: - dh_systemd_enable -pbitz-server --no-enable bitz-server.service +override_dh_installsystemd: + dh_installsystemd -pbitz-server --no-enable --name=bitz-server bitz-server.service |