Skip to content

Commit ab3b780

Browse files
committed
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
1 parent a3033c5 commit ab3b780

File tree

5 files changed

+16
-19
lines changed

5 files changed

+16
-19
lines changed

debian/control

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
Source: ngcp-ngcpcfg
22
Section: admin
3-
Priority: optional
43
Maintainer: Sipwise Development Team <support@sipwise.com>
54
Homepage: https://www.sipwise.com/
65
Standards-Version: 4.7.2
76
Build-Depends:
8-
asciidoctor,
97
debhelper-compat (= 13),
108
dh-sequence-bash-completion,
9+
asciidoctor,
1110
fakeroot,
1211
git,
1312
libcapture-tiny-perl,

debian/copyright

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Upstream-Contact: Sipwise Development Team <support@sipwise.com>
55
Files:
66
*
77
Copyright:
8-
Copyright © 2007-2025 Sipwise GmbH, Austria
8+
2007-2025 Sipwise GmbH, Austria
99
License: GPL-3+
1010
This program is free software: you can redistribute it and/or modify
1111
it under the terms of the GNU General Public License as published by
@@ -26,10 +26,10 @@ Comment:
2626
Files:
2727
hooks/pre-commit
2828
Copyright:
29-
Copyright © 2007-2016 Joey Hess <id@joeyh.name>
30-
Copyright © 2014 Pim van den Berg <pim@nethuis.nl>
31-
Copyright © 2013 Zdenek Crha <zdenek.crha@gmail.com>
32-
Copyright © 2008 Scott Bronson <b.git@u32.net>
29+
2007-2016 Joey Hess <id@joeyh.name>
30+
2014 Pim van den Berg <pim@nethuis.nl>
31+
2013 Zdenek Crha <zdenek.crha@gmail.com>
32+
2008 Scott Bronson <b.git@u32.net>
3333
License: GPL-2+
3434
This program is free software: you can redistribute it and/or modify
3535
it under the terms of the GNU General Public License as published by

debian/ngcp-ngcpcfg.postinst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@ case "$1" in
2020
;;
2121

2222
*)
23-
echo "postinst called with unknown argument \`$1'" >&2
23+
echo "postinst called with unknown argument '$1'" >&2
2424
exit 1
2525
;;
2626
esac
2727

28-
# dh_installdeb will replace this with shell code automatically
29-
# generated by other debhelper scripts.
30-
3128
#DEBHELPER#
3229

3330
exit 0

debian/ngcpcfg.completion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,4 @@ _ngcpcfg()
157157
} &&
158158
complete -F _ngcpcfg ngcpcfg ngcp-config
159159

160-
# ex: filetype=sh
160+
# ex: filetype=bash

debian/rules

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
# -*- makefile -*-
33

44
# Uncomment this to turn on verbose mode.
5-
# export DH_VERBOSE=1
5+
#export DH_VERBOSE = 1
66

77
SCRIPTS = \
88
$(CURDIR)/usr/sbin/ngcp-instances-validator \
99
$(CURDIR)/usr/sbin/ngcp-network \
10-
$(CURDIR)/usr/sbin/ngcp-network-validator
10+
$(CURDIR)/usr/sbin/ngcp-network-validator \
11+
# EOL
1112

1213
%:
1314
dh $@
1415

1516
override_dh_auto_build:
1617
dh_testdir
1718
$(MAKE) man
18-
# catch any syntax errors *before* building the .deb
19+
# Catch any syntax errors *before* building the ".deb".
1920
$(MAKE) syntaxcheck
2021

2122
execute_after_dh_install:
@@ -26,9 +27,9 @@ execute_after_dh_install:
2627
done
2728

2829
execute_after_dh_auto_test:
29-
## this is a hack to automatically copy the pytest result via pbuilder to
30-
## the workspace so we can automatically use it as Jenkins test result
31-
# starting with pbuilder v0.216 it defaults to /build
30+
## This is a hack to automatically copy the pytest result via pbuilder to
31+
## the workspace so we can automatically use it as Jenkins test result.
32+
# Starting with pbuilder v0.216 it defaults to "/build".
3233
if [ -d /build/ ] ; then find $(CURDIR)/results/ -name pytest.xml -exec cp {} /build/ \; || true ; fi
33-
# previous pbuilder versions default to /tmp/buildd
34+
# Previous pbuilder versions default to "/tmp/buildd".
3435
if [ -d /tmp/buildd/ ] ; then find $(CURDIR)/results/ -name pytest.xml -exec cp {} /tmp/buildd/ \; || true ; fi

0 commit comments

Comments
 (0)