This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Max gerrit-no-reply at lists.osmocom.orgHello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/1468 to look at the new patch set (#2). Integrate Debian packaging changes debian/control: * restructure to make it easier to incorporate further changes * update package descriptions * update project URL debian/rules: * use proper hardening syntax * restructure to make it easier to incorporate further changes * remove useless comment debian/copyright: update to match Debian format Change-Id: I5d68891faa03ae83beeda58eb8ff8aa747dc6ad6 Related: OS#1694 --- M debian/control M debian/copyright M debian/rules 3 files changed, 79 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/68/1468/2 diff --git a/debian/control b/debian/control index aa2035a..60bef71 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,33 @@ Source: libosmo-sccp -Priority: optional Maintainer: Harald Welte <laforge at gnumonks.org> -Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libosmocore-dev, autoconf, automake, libtool, dh-autoreconf, git, libdpkg-perl, libosmo-netif-dev, libsctp-dev -Standards-Version: 3.9.6 Section: libs -#Homepage: <insert the upstream URL, if relevant> +Priority: optional +Build-Depends: debhelper (>= 9), + autotools-dev, + pkg-config, + libosmocore-dev, + autoconf, + automake, + libtool, + dh-autoreconf, + git, + libdpkg-perl, + libosmo-netif-dev, + libsctp-dev +Standards-Version: 3.9.7 Vcs-Git: git://git.osmocom.org/libosmo-sccp.git Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmo-sccp.git;a=summary +Homepage: https://projects.osmocom.org/projects/libosmo-sccp Package: libosmo-sccp-dev -Section: libdevel Architecture: any Depends: ${misc:Depends} Multi-Arch: same -Description: Development files for Osmcoom SCCP library +Section: libdevel +Description: Development files for libosmosccp, libosmomtp and libosmoxua + SCCP is a network layer protocol that provides extended routing, flow control, + segmentation, connection-orientation, and error correction facilities in + Signaling System 7 telecommunications networks. + It is heavily used in cellular networks such as GSM. + . + This package contains the development files for the library. diff --git a/debian/copyright b/debian/copyright index 97328f2..78c9f12 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,36 +1,53 @@ -This work was packaged for Debian by: +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libopen-sccp +Source: http://cgit.osmocom.org/libosmo-sccp/ - Harald Welte <laforge at gnumonks.org> on Tue, 24 Aug 2010 10:55:04 +0200 +Files: * +Copyright: 2009-2010,2013 On-Waves + 2009-2011,2013 Holger Hans Peter Freyther <zecke at selfish.org> + 2010 Harald Welte <laforge at gnumonks.org> +License: GPL-2+ -It was downloaded from: +Files: include/sigtran/xua_msg.h + src/xua_msg.c + tests/m2ua/m2ua_test.c +Copyright: 2011 Holger Hans Peter Freyther <zecke at selfish.org> +License: AGPL-3+ - git://git.osmocom.org/libosmo-sccp.git +Files: debian/* +Copyright: 2010-2015 Harald Welte <laforge at gnumonks.org> + 2016 Ruben Undheim <ruben.undheim at gmail.com> +License: GPL-2+ -Upstream Author(s): - Holger Hans Peter Freyther <zecke at selfish.org> +License: GPL-2+ + This package 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 2 of the License, 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 <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General Public + License version 2.1 can be found in "/usr/share/common-licenses/GPL-2". -Copyright: - Copyright (C) 2009-2010 Holger Hans Peter Freyther <zecke at selfish.org> - Copyright (C) 2009-2010 On-Waves - -License: - - GNU General Public License, Version 2 or later - -The Debian packaging is: - - Copyright (C) 2010 Harald Welte <laforge at gnumonks.org> - -# Please chose a license for your packaging work. If the program you package -# uses a mainstream license, using the same license is the safest choice. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. -# If you just want it to be GPL version 3, leave the following lines in. - -and is licensed under the GPL version 3, -see "/usr/share/common-licenses/GPL-3". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. +License: AGPL-3+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation; either version 3 of the License, 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/debian/rules b/debian/rules index 1895067..c42676a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,19 +1,12 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') - -export DEB_BUILD_HARDENING=1 %: dh $@ --with autoreconf @@ -21,3 +14,12 @@ override_dh_autoreconf: echo $(VERSION) > .tarball-version dh_autoreconf + +override_dh_clean: + dh_clean + rm -f .version tests/package.m4 tests/testsuite + +# Print test results in case of a failure +override_dh_auto_test: + dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + -- To view, visit https://gerrit.osmocom.org/1468 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d68891faa03ae83beeda58eb8ff8aa747dc6ad6 Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Jenkins Builder