From dfb3a6edfacf2f16a8a63690b3e8058b6295d1a3 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sun, 23 Oct 2016 21:07:16 +0530 Subject: Initial debian packaging. --- debian/changelog | 6 ++++++ debian/compat | 1 + debian/control | 34 ++++++++++++++++++++++++++++++++++ debian/control.in | 26 ++++++++++++++++++++++++++ debian/copyright | 12 ++++++++++++ debian/copyright_hints | 0 debian/rules | 10 ++++++++++ debian/source/format | 1 + debian/watch | 2 ++ 9 files changed, 92 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/control.in create mode 100644 debian/copyright create mode 100644 debian/copyright_hints create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..8985617 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +biboumi (3.0-1) unstable; urgency=medium + + * Initial Release. + Closes: bug#841773. + + -- Vasudev Kamath Sun, 23 Oct 2016 20:36:23 +0530 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f11c82a --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 \ No newline at end of file diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..04b3f28 --- /dev/null +++ b/debian/control @@ -0,0 +1,34 @@ +Source: biboumi +Section: net +Priority: optional +Build-Depends: cdbs, + debhelper, + dh-buildinfo, + licensecheck, + uuid-dev, + libexpat1-dev, + libidn11-dev, + libsystemd-dev, + libc-ares-dev +Maintainer: Debian VoIP Team +Uploaders: Vasudev Kamath + Jonas Smedegaard +Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git +Homepage: https://lab.louiz.org/louiz/biboumi/ + +Package: biboumi +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: XMPP gateway to connect to IRC servers + This package translates between XMPP and IRC protocols. It can be used to + connect to IRC channels using any XMPP client as if these channels were XMPP + MUCs. + . + The goal is to provide a way to access most of IRC features using any XMPP + client. It doesn’t however try to provide a complete mapping of the features of + both worlds simply because this is not useful and most probably impossible. + . + If IRC is the limiting factor then biboumi doesn’t try to work around this + issue. An important goal of the tool is to keep the software light and simple. \ No newline at end of file diff --git a/debian/control.in b/debian/control.in new file mode 100644 index 0000000..7df5321 --- /dev/null +++ b/debian/control.in @@ -0,0 +1,26 @@ +Source: biboumi +Section: net +Priority: optional +Build-Depends: @cdbs@ +Maintainer: Debian VoIP Team +Uploaders: Vasudev Kamath + Jonas Smedegaard +Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git +Homepage: https://lab.louiz.org/louiz/biboumi/ + +Package: biboumi +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: XMPP gateway to connect to IRC servers + This package translates between XMPP and IRC protocols. It can be used to + connect to IRC channels using any XMPP client as if these channels were XMPP + MUCs. + . + The goal is to provide a way to access most of IRC features using any XMPP + client. It doesn’t however try to provide a complete mapping of the features of + both worlds simply because this is not useful and most probably impossible. + . + If IRC is the limiting factor then biboumi doesn’t try to work around this + issue. An important goal of the tool is to keep the software light and simple. \ No newline at end of file diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..7e82607 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,12 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: biboumi +Upstream-Contact: https://lab.louiz.org/louiz/biboumi/issues +Source: https://lab.louiz.org/louiz/biboumi + +Files: debian/* +Copyright: 2016, Vasudev Kamath + 2016, Jonas Smedegaard +License: GPL-3+ + +License: GPL-3+ +License-Reference: /usr/share/common-licenses/GPL-3 diff --git a/debian/copyright_hints b/debian/copyright_hints new file mode 100644 index 0000000..e69de29 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..371995f --- /dev/null +++ b/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk + +include /usr/share/cdbs/1/class/cmake.mk + +dev-deps = expat1 idn11 systemd c-ares +CDBS_BUILD_DEPENDS += , uuid-dev +CDBS_BUILD_DEPENDS += , $(patsubst %,$(comma) lib%-dev,$(dev-deps)) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..46ebe02 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) \ No newline at end of file diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..b3046f4 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=4 +https://lab.louiz.org/louiz/biboumi/tags .*/archive@ARCHIVE_EXT@\?ref=@ANY_VERSION@ \ No newline at end of file -- cgit v1.2.3 From 782ddf560f513263d65c9c2cc49a760075225de4 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 10 Dec 2016 21:04:04 +0530 Subject: Added cmake and catch build dependency --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 371995f..da9d53e 100755 --- a/debian/rules +++ b/debian/rules @@ -6,5 +6,5 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/cmake.mk dev-deps = expat1 idn11 systemd c-ares -CDBS_BUILD_DEPENDS += , uuid-dev +CDBS_BUILD_DEPENDS += , cmake, catch, uuid-dev CDBS_BUILD_DEPENDS += , $(patsubst %,$(comma) lib%-dev,$(dev-deps)) -- cgit v1.2.3 From c012d3c5bae8c42bfe6594a487f8e669a99d5533 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 10 Dec 2016 21:04:15 +0530 Subject: Initial copyright --- debian/copyright | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 7e82607..cde0f0c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,6 +3,24 @@ Upstream-Name: biboumi Upstream-Contact: https://lab.louiz.org/louiz/biboumi/issues Source: https://lab.louiz.org/louiz/biboumi +Files: * +Copyright: 2015, Florent Le Coz +License: Zlib + +Files: cmake/Modules/CodeCoverage.cmake +Copyright: 2012-2015, Lars Bilke +License: BSD-3-clause + +Files: cmake/Modules/FindLITESQL.cmake + louloulibs/cmake/Modules/FindBOTAN.cmake + louloulibs/cmake/Modules/FindCARES.cmake + louloulibs/cmake/Modules/FindICONV.cmake + louloulibs/cmake/Modules/FindLIBIDN.cmake + louloulibs/cmake/Modules/FindLIBUUID.cmake + louloulibs/cmake/Modules/FindSYSTEMD.cmake +Copyright: NONE +License: public-domain + Files: debian/* Copyright: 2016, Vasudev Kamath 2016, Jonas Smedegaard -- cgit v1.2.3 From e87720301fa697858ae0e839a29ac057cb508eaf Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 19:13:43 +0100 Subject: Add patch 2001 to avoid cmake messing with git. --- debian/patches/2001_cmake_ignore_git.patch | 38 ++++++++++++++++++++++++++++++ debian/patches/README | 3 +++ debian/patches/series | 1 + 3 files changed, 42 insertions(+) create mode 100644 debian/patches/2001_cmake_ignore_git.patch create mode 100644 debian/patches/README create mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/patches/2001_cmake_ignore_git.patch b/debian/patches/2001_cmake_ignore_git.patch new file mode 100644 index 0000000..bdbbd49 --- /dev/null +++ b/debian/patches/2001_cmake_ignore_git.patch @@ -0,0 +1,38 @@ +Description: Avoid cmake messing with git +Author: Jonas Smedegaard +Last-Update: 2016-12-21 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -198,23 +198,6 @@ + database) + endif() + +-include(ExternalProject) +-ExternalProject_Add(catch +- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git" +- PREFIX "external" +- UPDATE_COMMAND "" +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +- ) +-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE) +-ExternalProject_Get_Property(catch SOURCE_DIR) +-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp) +- target_include_directories(test_suite +- PUBLIC "${SOURCE_DIR}/include/" +- ) +- add_dependencies(test_suite catch) +-endif() + add_custom_target(check COMMAND "test_suite" "-s" + DEPENDS test_suite biboumi) + add_custom_target(e2e COMMAND "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/" +@@ -258,7 +241,6 @@ + COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "${ARCHIVE_NAME}.tar.xz created." + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) +-add_dependencies(dist catch) + + add_custom_target(rpm + COMMAND mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} diff --git a/debian/patches/README b/debian/patches/README new file mode 100644 index 0000000..80c1584 --- /dev/null +++ b/debian/patches/README @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..9da3ec6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +2001_cmake_ignore_git.patch -- cgit v1.2.3 From 525d60e0359ca293fd42985d72ca0955d19e59e4 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 20:44:39 +0100 Subject: Update copyright info: Fix add Zlib license. --- debian/copyright | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index cde0f0c..2eddd5b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -26,5 +26,25 @@ Copyright: 2016, Vasudev Kamath 2016, Jonas Smedegaard License: GPL-3+ +License: Zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software in + a product, an acknowledgment in the product documentation would be + appreciated but is not required. + . + 2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. + . + 3. This notice may not be removed or altered from any source + distribution. + License: GPL-3+ License-Reference: /usr/share/common-licenses/GPL-3 -- cgit v1.2.3 From e7e3ca1f380b67cf22d002fe9ac7db7796d6bb81 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 20:45:14 +0100 Subject: Update copyright info: Fix add verbatim public-domain statement. --- debian/copyright | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 2eddd5b..f216d35 100644 --- a/debian/copyright +++ b/debian/copyright @@ -20,6 +20,7 @@ Files: cmake/Modules/FindLITESQL.cmake louloulibs/cmake/Modules/FindSYSTEMD.cmake Copyright: NONE License: public-domain + This file is in the public domain Files: debian/* Copyright: 2016, Vasudev Kamath -- cgit v1.2.3 From 5dd6c60dc4797d96a7989966e893ac5ff078d071 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 20:46:18 +0100 Subject: Update copyright info: Add license grants. --- debian/copyright | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index f216d35..794c7c2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,6 +5,9 @@ Source: https://lab.louiz.org/louiz/biboumi Files: * Copyright: 2015, Florent Le Coz +License-Grant: + Biboumi is released under the zlib license. + Please read the COPYING file for details. License: Zlib Files: cmake/Modules/CodeCoverage.cmake @@ -25,6 +28,11 @@ License: public-domain Files: debian/* Copyright: 2016, Vasudev Kamath 2016, Jonas Smedegaard +License-Grant: + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 3, or (at your option) any + later version. License: GPL-3+ License: Zlib -- cgit v1.2.3 From 0349b886f78704b18495f36fc894565be87309dc Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 20:46:36 +0100 Subject: Update copyright info: Extend ID of main author. --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 794c7c2..40addc4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: https://lab.louiz.org/louiz/biboumi/issues Source: https://lab.louiz.org/louiz/biboumi Files: * -Copyright: 2015, Florent Le Coz +Copyright: 2015, Florent Le Coz (louiz’) License-Grant: Biboumi is released under the zlib license. Please read the COPYING file for details. -- cgit v1.2.3 From a494205f156f6000c25a0fb7b7fab36e26ba13e3 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 20:47:50 +0100 Subject: Update copyright info: Add copyright+license header to rules file. --- debian/rules | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index da9d53e..609fe3d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,22 @@ #!/usr/bin/make -f +# Copyright 2016 Jonas Smedegaard +# Copyright 2016 Vasudev Kamath +# Description: Main Debian packaging script for biboumi +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/utils.mk -- cgit v1.2.3 From a1e99b297886e65937422701f88f6d4c0eb32ce0 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 20:58:00 +0100 Subject: Reuse parts of upstream README as long description. --- debian/control.in | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/control.in b/debian/control.in index 7df5321..58e2fc9 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,13 +14,21 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: XMPP gateway to connect to IRC servers - This package translates between XMPP and IRC protocols. It can be used to - connect to IRC channels using any XMPP client as if these channels were XMPP - MUCs. + Biboumi is an XMPP gateway that connects to IRC servers and translates + between the two protocols. It can be used to access IRC channels using + any XMPP client as if these channels were XMPP MUCs. . - The goal is to provide a way to access most of IRC features using any XMPP - client. It doesn’t however try to provide a complete mapping of the features of - both worlds simply because this is not useful and most probably impossible. + It is written in modern C++14 and makes great efforts to have as little + dependencies and to be as simple as possible. . - If IRC is the limiting factor then biboumi doesn’t try to work around this - issue. An important goal of the tool is to keep the software light and simple. \ No newline at end of file + The goal is to provide a way to access most of IRC features using any + XMPP client. It doesn’t however try to provide a complete mapping of + the features of both worlds simply because this is not useful and most + probably impossible. For example all IRC modes are not all + translatable into an XMPP features. Some of them are (like +m (mute) + or +o (operator) modes), but some others are IRC-specific. If IRC is + the limiting factor (for example you cannot have a non-ASCII nickname + on IRC) then biboumi doesn’t try to work around this issue: it just + enforces the rules of the IRC server by telling the user that he/she + must choose an ASCII-only nickname. An important goal is to keep the + software (and its code) light and simple. -- cgit v1.2.3 From 88b27db4d7842db7630f1a50d78ff75ab3a2f41b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:08:04 +0100 Subject: Build-depend on pandoc and libbotan1.10-dev. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 609fe3d..412647e 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,6 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/cmake.mk -dev-deps = expat1 idn11 systemd c-ares -CDBS_BUILD_DEPENDS += , cmake, catch, uuid-dev +dev-deps = expat1 idn11 systemd c-ares, botan1.10 +CDBS_BUILD_DEPENDS += , cmake, catch, uuid-dev, pandoc CDBS_BUILD_DEPENDS += , $(patsubst %,$(comma) lib%-dev,$(dev-deps)) -- cgit v1.2.3 From 533aa4df1543fbe62acb230b097a4378ebc66a67 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:11:46 +0100 Subject: Run testsuite during build. --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 412647e..547a261 100755 --- a/debian/rules +++ b/debian/rules @@ -25,3 +25,5 @@ include /usr/share/cdbs/1/class/cmake.mk dev-deps = expat1 idn11 systemd c-ares, botan1.10 CDBS_BUILD_DEPENDS += , cmake, catch, uuid-dev, pandoc CDBS_BUILD_DEPENDS += , $(patsubst %,$(comma) lib%-dev,$(dev-deps)) + +DEB_MAKE_CHECK_TARGET = check -- cgit v1.2.3 From 8dd709126578ef027a32fff35036d85a50ae8bbc Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:15:37 +0100 Subject: Update copyrigth info: Add alternate git source URL. --- debian/copyright | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 40addc4..7882205 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: biboumi Upstream-Contact: https://lab.louiz.org/louiz/biboumi/issues Source: https://lab.louiz.org/louiz/biboumi + https://lab.louiz.org/louiz/biboumi.git Files: * Copyright: 2015, Florent Le Coz (louiz’) -- cgit v1.2.3 From 3bc6cffa715900f5affa70f78927a9971af933ad Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:19:02 +0100 Subject: Add git-buildpackage config: Use pristine-tar. Sign tags. Filter any .git* file. --- debian/gbp.conf | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 debian/gbp.conf (limited to 'debian') diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..2a594ca --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +pristine-tar = True +sign-tags = True +filter = */.git* -- cgit v1.2.3 From 404e632fde357e023222df5a5572d625a301739c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:20:49 +0100 Subject: Update watch file: Add usage comment. Wrap long line. Fix add trailing newline. --- debian/watch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/watch b/debian/watch index b3046f4..3fdb5ee 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,4 @@ +# run "uscan --report" to check or "gpb import-orig --uscan" to update version=4 -https://lab.louiz.org/louiz/biboumi/tags .*/archive@ARCHIVE_EXT@\?ref=@ANY_VERSION@ \ No newline at end of file +https://lab.louiz.org/louiz/biboumi/tags \ + .*/archive@ARCHIVE_EXT@\?ref=@ANY_VERSION@ -- cgit v1.2.3 From d3633736c5d06214a8ccecec2340f583ed6679d9 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:22:05 +0100 Subject: Fix add trailing newlines. --- debian/compat | 2 +- debian/source/format | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/compat b/debian/compat index f11c82a..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 \ No newline at end of file +9 diff --git a/debian/source/format b/debian/source/format index 46ebe02..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) \ No newline at end of file +3.0 (quilt) -- cgit v1.2.3 From 3328b60c04b3fa3d885e18987870c1d8ad4b89fa Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:22:45 +0100 Subject: Add lintian overrides regarding license in License-Reference field. See bug#786450. --- debian/source/lintian-overrides | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 debian/source/lintian-overrides (limited to 'debian') diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..dce4650 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,8 @@ +# License is in License-Reference field (see bug#786450) +missing-license-text-in-dep5-copyright + +# License is in License-Reference field (see bug#786450) +missing-license-paragraph-in-dep5-copyright + +# Debhelper 9 is satisfied even in oldstable +package-needs-versioned-debhelper-build-depends 9 -- cgit v1.2.3 From a077b304b27d21bf635ef4f31a2a0447d3b14d11 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:24:00 +0100 Subject: Update control file and copyright hints. --- debian/control | 31 +++++++--- debian/copyright_hints | 159 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 04b3f28..9d232df 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,16 @@ Build-Depends: cdbs, debhelper, dh-buildinfo, licensecheck, + cmake, + catch, uuid-dev, + pandoc, libexpat1-dev, libidn11-dev, libsystemd-dev, - libc-ares-dev + libc-ares, + -dev, + libbotan1.10-dev Maintainer: Debian VoIP Team Uploaders: Vasudev Kamath Jonas Smedegaard @@ -22,13 +27,21 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: XMPP gateway to connect to IRC servers - This package translates between XMPP and IRC protocols. It can be used to - connect to IRC channels using any XMPP client as if these channels were XMPP - MUCs. + Biboumi is an XMPP gateway that connects to IRC servers and translates + between the two protocols. It can be used to access IRC channels using + any XMPP client as if these channels were XMPP MUCs. . - The goal is to provide a way to access most of IRC features using any XMPP - client. It doesn’t however try to provide a complete mapping of the features of - both worlds simply because this is not useful and most probably impossible. + It is written in modern C++14 and makes great efforts to have as little + dependencies and to be as simple as possible. . - If IRC is the limiting factor then biboumi doesn’t try to work around this - issue. An important goal of the tool is to keep the software light and simple. \ No newline at end of file + The goal is to provide a way to access most of IRC features using any + XMPP client. It doesn’t however try to provide a complete mapping of + the features of both worlds simply because this is not useful and most + probably impossible. For example all IRC modes are not all + translatable into an XMPP features. Some of them are (like +m (mute) + or +o (operator) modes), but some others are IRC-specific. If IRC is + the limiting factor (for example you cannot have a non-ASCII nickname + on IRC) then biboumi doesn’t try to work around this issue: it just + enforces the rules of the IRC server by telling the user that he/she + must choose an ASCII-only nickname. An important goal is to keep the + software (and its code) light and simple. diff --git a/debian/copyright_hints b/debian/copyright_hints index e69de29..9d5a50a 100644 --- a/debian/copyright_hints +++ b/debian/copyright_hints @@ -0,0 +1,159 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: FIXME +Upstream-Contact: FIXME +Source: FIXME +Disclaimer: Autogenerated by CDBS + +Files: CHANGELOG.rst + CMakeLists.txt + INSTALL.rst + README.rst + biboumi.h.cmake + conf/biboumi.cfg + database/database.xml + debian/compat + debian/control + debian/control.in + debian/patches/2001_cmake_ignore_git.patch + debian/patches/README + debian/patches/series + debian/rules + debian/source/format + debian/watch + doc/biboumi.1.rst + docker/biboumi-test/debian/Dockerfile + docker/biboumi-test/fedora/Dockerfile + louloulibs/CMakeLists.txt + louloulibs/config/config.cpp + louloulibs/config/config.hpp + louloulibs/logger/logger.cpp + louloulibs/logger/logger.hpp + louloulibs/louloulibs.h.cmake + louloulibs/network/credentials_manager.cpp + louloulibs/network/credentials_manager.hpp + louloulibs/network/dns_handler.cpp + louloulibs/network/dns_handler.hpp + louloulibs/network/dns_socket_handler.cpp + louloulibs/network/dns_socket_handler.hpp + louloulibs/network/poller.cpp + louloulibs/network/poller.hpp + louloulibs/network/resolver.cpp + louloulibs/network/resolver.hpp + louloulibs/network/socket_handler.hpp + louloulibs/network/tcp_socket_handler.cpp + louloulibs/network/tcp_socket_handler.hpp + louloulibs/utils/encoding.cpp + louloulibs/utils/encoding.hpp + louloulibs/utils/revstr.cpp + louloulibs/utils/revstr.hpp + louloulibs/utils/scopeguard.hpp + louloulibs/utils/sha1.cpp + louloulibs/utils/sha1.hpp + louloulibs/utils/split.cpp + louloulibs/utils/split.hpp + louloulibs/utils/string.cpp + louloulibs/utils/string.hpp + louloulibs/utils/timed_events.cpp + louloulibs/utils/timed_events.hpp + louloulibs/utils/timed_events_manager.cpp + louloulibs/utils/tolower.cpp + louloulibs/utils/tolower.hpp + louloulibs/utils/xdg.cpp + louloulibs/utils/xdg.hpp + louloulibs/xmpp/adhoc_command.cpp + louloulibs/xmpp/adhoc_command.hpp + louloulibs/xmpp/adhoc_commands_handler.cpp + louloulibs/xmpp/adhoc_commands_handler.hpp + louloulibs/xmpp/adhoc_session.cpp + louloulibs/xmpp/adhoc_session.hpp + louloulibs/xmpp/body.hpp + louloulibs/xmpp/jid.cpp + louloulibs/xmpp/jid.hpp + louloulibs/xmpp/roster.cpp + louloulibs/xmpp/roster.hpp + louloulibs/xmpp/xmpp_component.cpp + louloulibs/xmpp/xmpp_component.hpp + louloulibs/xmpp/xmpp_parser.cpp + louloulibs/xmpp/xmpp_parser.hpp + louloulibs/xmpp/xmpp_stanza.cpp + louloulibs/xmpp/xmpp_stanza.hpp + packaging/biboumi.spec.cmake + src/bridge/bridge.cpp + src/bridge/bridge.hpp + src/bridge/colors.cpp + src/bridge/colors.hpp + src/bridge/list_element.hpp + src/database/database.cpp + src/database/database.hpp + src/irc/iid.cpp + src/irc/iid.hpp + src/irc/irc_channel.cpp + src/irc/irc_channel.hpp + src/irc/irc_client.cpp + src/irc/irc_client.hpp + src/irc/irc_message.cpp + src/irc/irc_message.hpp + src/irc/irc_user.cpp + src/irc/irc_user.hpp + src/main.cpp + src/utils/empty_if_fixed_server.hpp + src/utils/reload.cpp + src/utils/reload.hpp + src/xmpp/biboumi_adhoc_commands.cpp + src/xmpp/biboumi_adhoc_commands.hpp + src/xmpp/biboumi_component.cpp + src/xmpp/biboumi_component.hpp + tests/colors.cpp + tests/config.cpp + tests/database.cpp + tests/dns.cpp + tests/end_to_end/__main__.py + tests/end_to_end/biboumi.supp + tests/iid.cpp + tests/io_tester.cpp + tests/io_tester.hpp + tests/jid.cpp + tests/logger.cpp + tests/test.cpp + tests/timed_events.cpp + tests/utils.cpp + tests/uuid.cpp + tests/xmpp.cpp + unit/biboumi.service.cmake +Copyright: NONE +License: UNKNOWN + FIXME + +Files: cmake/Modules/FindLITESQL.cmake + louloulibs/cmake/Modules/FindBOTAN.cmake + louloulibs/cmake/Modules/FindCARES.cmake + louloulibs/cmake/Modules/FindICONV.cmake + louloulibs/cmake/Modules/FindLIBIDN.cmake + louloulibs/cmake/Modules/FindLIBUUID.cmake + louloulibs/cmake/Modules/FindSYSTEMD.cmake +Copyright: NONE +License: public-domain + FIXME + +Files: cmake/Modules/CodeCoverage.cmake +Copyright: 2012-2015, Lars Bilke +License: BSD-3-clause + FIXME + +Files: tests/encoding.cpp +Copyright: +License: UNKNOWN + FIXME + +Files: tests/end_to_end/ircd.conf +Copyright: 2000-2002, Hybrid Development Team + 2002-2005, ircd-ratbox development team + 2005-2006, charybdis development team +License: UNKNOWN + FIXME + +Files: COPYING +Copyright: 2015, Florent Le Coz +License: Zlib + FIXME + -- cgit v1.2.3 From 95a2ca0a6f265c915b99c0e1babbd51f4c6b1682 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:26:47 +0100 Subject: Fix strip bogus comma in build-dependencies. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 547a261..38d82c1 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/cmake.mk -dev-deps = expat1 idn11 systemd c-ares, botan1.10 +dev-deps = expat1 idn11 systemd c-ares botan1.10 CDBS_BUILD_DEPENDS += , cmake, catch, uuid-dev, pandoc CDBS_BUILD_DEPENDS += , $(patsubst %,$(comma) lib%-dev,$(dev-deps)) -- cgit v1.2.3 From 50a5a9ae96f090df5481d4f178be9f5910c922cb Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:42:17 +0100 Subject: Unfuzz patch 2001. --- debian/patches/2001_cmake_ignore_git.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/patches/2001_cmake_ignore_git.patch b/debian/patches/2001_cmake_ignore_git.patch index bdbbd49..4334d0f 100644 --- a/debian/patches/2001_cmake_ignore_git.patch +++ b/debian/patches/2001_cmake_ignore_git.patch @@ -25,14 +25,16 @@ Last-Update: 2016-12-21 - ) - add_dependencies(test_suite catch) -endif() - add_custom_target(check COMMAND "test_suite" "-s" + add_custom_target(check COMMAND "test_suite" DEPENDS test_suite biboumi) add_custom_target(e2e COMMAND "python3" "${CMAKE_CURRENT_SOURCE_DIR}/tests/end_to_end/" -@@ -258,7 +241,6 @@ - COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "${ARCHIVE_NAME}.tar.xz created." +@@ -263,8 +246,7 @@ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) --add_dependencies(dist catch) + add_custom_target(dist +- DEPENDS ${ARCHIVE_NAME}.tar.xz +- DEPENDS catch) ++ DEPENDS ${ARCHIVE_NAME}.tar.xz) add_custom_target(rpm - COMMAND mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} + DEPENDS dist -- cgit v1.2.3 From 54fdd90fa343f2fd00a5ed416e7323db3cd07f4b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 21:47:01 +0100 Subject: Install documentation and example files. --- debian/rules | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 38d82c1..c80ba2e 100755 --- a/debian/rules +++ b/debian/rules @@ -22,8 +22,14 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/cmake.mk +pkg = $(DEB_SOURCE_PACKAGE) + dev-deps = expat1 idn11 systemd c-ares botan1.10 CDBS_BUILD_DEPENDS += , cmake, catch, uuid-dev, pandoc CDBS_BUILD_DEPENDS += , $(patsubst %,$(comma) lib%-dev,$(dev-deps)) DEB_MAKE_CHECK_TARGET = check + +DEB_INSTALL_CHANGELOGS_ALL += CHANGELOG.rst +DEB_INSTALL_DOCS_$(pkg) += README.rst CONTRIBUTING.rst +DEB_INSTALL_EXAMPLES_$(pkg) = doc/example.conf -- cgit v1.2.3 From 176a1fcdf53f54c92fbc57f49f610bb7c91ec8f4 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 22:21:36 +0100 Subject: Add some bugfix patches cherry-picked upstream. --- debian/patches/020161125~ad22be4.patch | 38 ++++++++++++++++++++++++++++++++++ debian/patches/020161204~eb8f1cb.patch | 24 +++++++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 64 insertions(+) create mode 100644 debian/patches/020161125~ad22be4.patch create mode 100644 debian/patches/020161204~eb8f1cb.patch (limited to 'debian') diff --git a/debian/patches/020161125~ad22be4.patch b/debian/patches/020161125~ad22be4.patch new file mode 100644 index 0000000..46013bc --- /dev/null +++ b/debian/patches/020161125~ad22be4.patch @@ -0,0 +1,38 @@ +Description: Do not fail to build if litesql is not there +Origin: upstream, https://lab.louiz.org/louiz/biboumi/commit/ad22be4 +Author: louiz’ +Forwarded: yes +Last-Update: 2016-12-21 + +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -12,7 +12,9 @@ + + #include + #include +-#include ++#ifdef USE_DATABASE ++# include ++#endif + + // A flag set by the SIGINT signal handler. + static std::atomic stop(false); +@@ -83,11 +85,14 @@ + if (hostname.empty()) + return config_help("hostname"); + ++ ++#ifdef USE_DATABASE + try { +- open_database(); +- } catch (const litesql::DatabaseError&) { +- return 1; +- } ++ open_database(); ++ } catch (const litesql::DatabaseError&) { ++ return 1; ++ } ++#endif + + // Block the signals we want to manage. They will be unblocked only during + // the epoll_pwait or ppoll calls. This avoids some race conditions, diff --git a/debian/patches/020161204~eb8f1cb.patch b/debian/patches/020161204~eb8f1cb.patch new file mode 100644 index 0000000..e303cbc --- /dev/null +++ b/debian/patches/020161204~eb8f1cb.patch @@ -0,0 +1,24 @@ +Description: Avoid a potential nullptr dereference +Origin: upstream, https://lab.louiz.org/louiz/biboumi/commit/eb8f1cb +Author: louiz’ +Forwarded: yes +Last-Update: 2016-12-21 + +--- a/src/xmpp/biboumi_component.cpp ++++ b/src/xmpp/biboumi_component.cpp +@@ -570,13 +570,11 @@ + Jid to(stanza.get_tag("to")); + + const XmlNode* query = stanza.get_child("query", MAM_NS); +- std::string query_id; +- if (query) +- query_id = query->get_tag("queryid"); + + Iid iid(to.local, {'#', '&'}); +- if (iid.type == Iid::Type::Channel && to.resource.empty()) ++ if (query && iid.type == Iid::Type::Channel && to.resource.empty()) + { ++ const std::string query_id = query->get_tag("queryid"); + std::string start; + std::string end; + const XmlNode* x = query->get_child("x", DATAFORM_NS); diff --git a/debian/patches/series b/debian/patches/series index 9da3ec6..66f0cf4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ +020161125~ad22be4.patch +020161204~eb8f1cb.patch 2001_cmake_ignore_git.patch -- cgit v1.2.3 From 111e446d1d57ccc47b35f7c6fbf8bd5575d5a0a1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 23:59:00 +0100 Subject: Add patch 2002 to fix use C.UTF-8 as hardcoded internal locale. --- debian/patches/2002_fix_default_locale.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 2 files changed, 17 insertions(+) create mode 100644 debian/patches/2002_fix_default_locale.patch (limited to 'debian') diff --git a/debian/patches/2002_fix_default_locale.patch b/debian/patches/2002_fix_default_locale.patch new file mode 100644 index 0000000..aef32d9 --- /dev/null +++ b/debian/patches/2002_fix_default_locale.patch @@ -0,0 +1,16 @@ +Description: Fix use C.UTF-8 as hardcoded internal locale + Debian always provides C.UTF-8, only often en_US.UTF-8, and not en_US.utf-8. +Author: Jonas Smedegaard +Last-Update: 2016-12-21 + +--- a/louloulibs/utils/time.cpp ++++ b/louloulibs/utils/time.cpp +@@ -24,7 +24,7 @@ + std::tm t = {}; + #ifdef HAS_GET_TIME + std::istringstream ss(stamp); +- ss.imbue(std::locale("en_US.utf-8")); ++ ss.imbue(std::locale("C.UTF-8")); + + std::string timezone; + ss >> std::get_time(&t, format) >> timezone; diff --git a/debian/patches/series b/debian/patches/series index 66f0cf4..ae6b213 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 020161125~ad22be4.patch 020161204~eb8f1cb.patch 2001_cmake_ignore_git.patch +2002_fix_default_locale.patch -- cgit v1.2.3 From 78843fe67be221553a51e53a3088d1f606ff12b8 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 22 Dec 2016 00:06:59 +0100 Subject: Resolve Botan configure flags. --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index c80ba2e..071b025 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,10 @@ dev-deps = expat1 idn11 systemd c-ares botan1.10 CDBS_BUILD_DEPENDS += , cmake, catch, uuid-dev, pandoc CDBS_BUILD_DEPENDS += , $(patsubst %,$(comma) lib%-dev,$(dev-deps)) +DEB_CMAKE_EXTRA_FLAGS = \ + -DBOTAN_LIBRARIES="$(shell pkg-config botan-1.10 --libs-only-L)" \ + -DBOTAN_INCLUDE_DIRS="$(shell pkg-config botan-1.10 --cflags-only-I)" + DEB_MAKE_CHECK_TARGET = check DEB_INSTALL_CHANGELOGS_ALL += CHANGELOG.rst -- cgit v1.2.3 From 5cc28c662a119e9381babf550823d015c31365fa Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 22 Dec 2016 00:49:16 +0100 Subject: Fix comma-delimit uploaders (and sort alphabetically while at it). --- debian/control.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control.in b/debian/control.in index 58e2fc9..86cfc58 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,8 +3,8 @@ Section: net Priority: optional Build-Depends: @cdbs@ Maintainer: Debian VoIP Team -Uploaders: Vasudev Kamath - Jonas Smedegaard +Uploaders: Jonas Smedegaard , + Vasudev Kamath Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git Homepage: https://lab.louiz.org/louiz/biboumi/ -- cgit v1.2.3 From 0968fe0ef6217e73755cc935ee098cf6f5ee649f Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 22 Dec 2016 00:59:41 +0100 Subject: Fix add Standards-Version. --- debian/control.in | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control.in b/debian/control.in index 86cfc58..9cbaed8 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,6 +5,7 @@ Build-Depends: @cdbs@ Maintainer: Debian VoIP Team Uploaders: Jonas Smedegaard , Vasudev Kamath +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git Homepage: https://lab.louiz.org/louiz/biboumi/ -- cgit v1.2.3 From 0d366c9bd90625fc490136f8dd83e5844b229dc3 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 22 Dec 2016 00:59:49 +0100 Subject: Install systemd service file below /lib. --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 071b025..dc34d8b 100755 --- a/debian/rules +++ b/debian/rules @@ -37,3 +37,7 @@ DEB_MAKE_CHECK_TARGET = check DEB_INSTALL_CHANGELOGS_ALL += CHANGELOG.rst DEB_INSTALL_DOCS_$(pkg) += README.rst CONTRIBUTING.rst DEB_INSTALL_EXAMPLES_$(pkg) = doc/example.conf + +binary-post-install/$(pkg):: + mkdir -p $(cdbs_curdestdir)/lib + mv $(cdbs_curdestdir)/usr/lib/systemd $(cdbs_curdestdir)/lib -- cgit v1.2.3 From 1cdf5bed179f42d1ccc8a786c82bdaa3025bac61 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 22 Dec 2016 00:59:57 +0100 Subject: Prepare for release: Update changelog, control file, and copyright hints. --- debian/changelog | 5 +++-- debian/control | 8 ++++---- debian/copyright_hints | 27 ++++++++++++++++++++++----- 3 files changed, 29 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8985617..4df1aae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -biboumi (3.0-1) unstable; urgency=medium +biboumi (4.0-1) unstable; urgency=medium + [ Vasudev Kamath & Jonas Smedegaard ] * Initial Release. Closes: bug#841773. - -- Vasudev Kamath Sun, 23 Oct 2016 20:36:23 +0530 + -- Jonas Smedegaard Thu, 22 Dec 2016 00:58:37 +0100 diff --git a/debian/control b/debian/control index 9d232df..6f2d755 100644 --- a/debian/control +++ b/debian/control @@ -12,12 +12,12 @@ Build-Depends: cdbs, libexpat1-dev, libidn11-dev, libsystemd-dev, - libc-ares, - -dev, + libc-ares-dev, libbotan1.10-dev Maintainer: Debian VoIP Team -Uploaders: Vasudev Kamath - Jonas Smedegaard +Uploaders: Jonas Smedegaard , + Vasudev Kamath +Standards-Version: 3.9.6 Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git Homepage: https://lab.louiz.org/louiz/biboumi/ diff --git a/debian/copyright_hints b/debian/copyright_hints index 9d5a50a..9e2ff85 100644 --- a/debian/copyright_hints +++ b/debian/copyright_hints @@ -6,6 +6,7 @@ Disclaimer: Autogenerated by CDBS Files: CHANGELOG.rst CMakeLists.txt + CONTRIBUTING.rst INSTALL.rst README.rst biboumi.h.cmake @@ -14,13 +15,19 @@ Files: CHANGELOG.rst debian/compat debian/control debian/control.in + debian/files + debian/gbp.conf + debian/patches/020161125~ad22be4.patch + debian/patches/020161204~eb8f1cb.patch debian/patches/2001_cmake_ignore_git.patch + debian/patches/2002_fix_default_locale.patch debian/patches/README debian/patches/series - debian/rules debian/source/format + debian/source/lintian-overrides debian/watch doc/biboumi.1.rst + doc/example.conf docker/biboumi-test/debian/Dockerfile docker/biboumi-test/fedora/Dockerfile louloulibs/CMakeLists.txt @@ -44,6 +51,8 @@ Files: CHANGELOG.rst louloulibs/network/tcp_socket_handler.hpp louloulibs/utils/encoding.cpp louloulibs/utils/encoding.hpp + louloulibs/utils/get_first_non_empty.cpp + louloulibs/utils/get_first_non_empty.hpp louloulibs/utils/revstr.cpp louloulibs/utils/revstr.hpp louloulibs/utils/scopeguard.hpp @@ -53,6 +62,8 @@ Files: CHANGELOG.rst louloulibs/utils/split.hpp louloulibs/utils/string.cpp louloulibs/utils/string.hpp + louloulibs/utils/time.cpp + louloulibs/utils/time.hpp louloulibs/utils/timed_events.cpp louloulibs/utils/timed_events.hpp louloulibs/utils/timed_events_manager.cpp @@ -66,11 +77,11 @@ Files: CHANGELOG.rst louloulibs/xmpp/adhoc_commands_handler.hpp louloulibs/xmpp/adhoc_session.cpp louloulibs/xmpp/adhoc_session.hpp + louloulibs/xmpp/auth.cpp + louloulibs/xmpp/auth.hpp louloulibs/xmpp/body.hpp louloulibs/xmpp/jid.cpp louloulibs/xmpp/jid.hpp - louloulibs/xmpp/roster.cpp - louloulibs/xmpp/roster.hpp louloulibs/xmpp/xmpp_component.cpp louloulibs/xmpp/xmpp_component.hpp louloulibs/xmpp/xmpp_parser.cpp @@ -83,6 +94,7 @@ Files: CHANGELOG.rst src/bridge/colors.cpp src/bridge/colors.hpp src/bridge/list_element.hpp + src/bridge/result_set_management.hpp src/database/database.cpp src/database/database.hpp src/irc/iid.cpp @@ -106,7 +118,6 @@ Files: CHANGELOG.rst tests/colors.cpp tests/config.cpp tests/database.cpp - tests/dns.cpp tests/end_to_end/__main__.py tests/end_to_end/biboumi.supp tests/iid.cpp @@ -140,6 +151,12 @@ Copyright: 2012-2015, Lars Bilke License: BSD-3-clause FIXME +Files: debian/rules +Copyright: 2016, Jonas Smedegaard + 2016, Vasudev Kamath +License: GPL-3+ + FIXME + Files: tests/encoding.cpp Copyright: License: UNKNOWN @@ -153,7 +170,7 @@ License: UNKNOWN FIXME Files: COPYING -Copyright: 2015, Florent Le Coz +Copyright: NONE License: Zlib FIXME -- cgit v1.2.3 From d7778776fd74e66ab0cd714f100d460ad2060edf Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 6 Jan 2017 20:08:39 +0100 Subject: Drop obsolete lintian override regarding debhelper 9. --- debian/source/lintian-overrides | 3 --- 1 file changed, 3 deletions(-) (limited to 'debian') diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index dce4650..f87ce0c 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -3,6 +3,3 @@ missing-license-text-in-dep5-copyright # License is in License-Reference field (see bug#786450) missing-license-paragraph-in-dep5-copyright - -# Debhelper 9 is satisfied even in oldstable -package-needs-versioned-debhelper-build-depends 9 -- cgit v1.2.3 From 8c575094d24d52faa64238d78f849577faaf1bab Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 7 Jan 2017 12:57:52 +0100 Subject: Prepare for release: Update changelog and control file. --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4df1aae..bc485af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,4 +4,4 @@ biboumi (4.0-1) unstable; urgency=medium * Initial Release. Closes: bug#841773. - -- Jonas Smedegaard Thu, 22 Dec 2016 00:58:37 +0100 + -- Jonas Smedegaard Sat, 07 Jan 2017 12:57:41 +0100 diff --git a/debian/control b/debian/control index 6f2d755..93c3f4f 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: cdbs, Maintainer: Debian VoIP Team Uploaders: Jonas Smedegaard , Vasudev Kamath -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-voip/biboumi.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-voip/biboumi.git Homepage: https://lab.louiz.org/louiz/biboumi/ -- cgit v1.2.3