MT#62899 Update packaging for Debian trixie

- Update copyright years.
- Remove «Priority: optional» field, which is now the default.
- Remove boilerplate comment from dh-make from maintainer script.
- Do not use unbalanced quotes in error message in maintainer script.
- Fix vim modelines in bash-completion scripts to set file type to bash.
- Fix comments in debian/rules.
- Unify make lists by terminating them with «#EOL» on its own line.
- Wrap and sort fields.
- Add spaces around operators in make variables.

Change-Id: Ic5c7fba4fd019786d34d308b1aade0c7a92d4b18
master
Guillem Jover 2 months ago
parent a3033c52c0
commit ab3b7807f8

3
debian/control vendored

@ -1,13 +1,12 @@
Source: ngcp-ngcpcfg
Section: admin
Priority: optional
Maintainer: Sipwise Development Team <support@sipwise.com>
Homepage: https://www.sipwise.com/
Standards-Version: 4.7.2
Build-Depends:
asciidoctor,
debhelper-compat (= 13),
dh-sequence-bash-completion,
asciidoctor,
fakeroot,
git,
libcapture-tiny-perl,

10
debian/copyright vendored

@ -5,7 +5,7 @@ Upstream-Contact: Sipwise Development Team <support@sipwise.com>
Files:
*
Copyright:
Copyright © 2007-2025 Sipwise GmbH, Austria
2007-2025 Sipwise GmbH, Austria
License: GPL-3+
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
@ -26,10 +26,10 @@ Comment:
Files:
hooks/pre-commit
Copyright:
Copyright © 2007-2016 Joey Hess <id@joeyh.name>
Copyright © 2014 Pim van den Berg <pim@nethuis.nl>
Copyright © 2013 Zdenek Crha <zdenek.crha@gmail.com>
Copyright © 2008 Scott Bronson <b.git@u32.net>
2007-2016 Joey Hess <id@joeyh.name>
2014 Pim van den Berg <pim@nethuis.nl>
2013 Zdenek Crha <zdenek.crha@gmail.com>
2008 Scott Bronson <b.git@u32.net>
License: GPL-2+
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

@ -20,14 +20,11 @@ case "$1" in
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
echo "postinst called with unknown argument '$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

@ -157,4 +157,4 @@ _ngcpcfg()
} &&
complete -F _ngcpcfg ngcpcfg ngcp-config
# ex: filetype=sh
# ex: filetype=bash

15
debian/rules vendored

@ -2,12 +2,13 @@
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
#export DH_VERBOSE = 1
SCRIPTS = \
$(CURDIR)/usr/sbin/ngcp-instances-validator \
$(CURDIR)/usr/sbin/ngcp-network \
$(CURDIR)/usr/sbin/ngcp-network-validator
$(CURDIR)/usr/sbin/ngcp-network-validator \
# EOL
%:
dh $@
@ -15,7 +16,7 @@ SCRIPTS = \
override_dh_auto_build:
dh_testdir
$(MAKE) man
# catch any syntax errors *before* building the .deb
# Catch any syntax errors *before* building the ".deb".
$(MAKE) syntaxcheck
execute_after_dh_install:
@ -26,9 +27,9 @@ execute_after_dh_install:
done
execute_after_dh_auto_test:
## this is a hack to automatically copy the pytest result via pbuilder to
## the workspace so we can automatically use it as Jenkins test result
# starting with pbuilder v0.216 it defaults to /build
## This is a hack to automatically copy the pytest result via pbuilder to
## the workspace so we can automatically use it as Jenkins test result.
# Starting with pbuilder v0.216 it defaults to "/build".
if [ -d /build/ ] ; then find $(CURDIR)/results/ -name pytest.xml -exec cp {} /build/ \; || true ; fi
# previous pbuilder versions default to /tmp/buildd
# Previous pbuilder versions default to "/tmp/buildd".
if [ -d /tmp/buildd/ ] ; then find $(CURDIR)/results/ -name pytest.xml -exec cp {} /tmp/buildd/ \; || true ; fi

Loading…
Cancel
Save