diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-06-20 00:36:02 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-06-21 16:59:14 +0000 |
| commit | e56ec71c6ada4af550df1cb52114655255fcf685 (patch) | |
| tree | 9b3a86c3b77d257200431188f323e1d41db86113 /debian | |
| parent | 5d9ab62748edacd91e36840e0baf8883274fbee7 (diff) | |
debian/control: fix minor Lintian warnings related to Priority, etc.
Fixes the following Lintian 2.15.0 (Debian sid) warnings with WS 3.0.2:
W: wireshark-common: extended-description-line-too-long
W: wireshark-common: command-with-path-in-maintainer-script postrm:11 /usr/sbin/delgroup
W: wireshark-dbg: priority-extra-is-replaced-by-priority-optional
W: wireshark-doc: priority-extra-is-replaced-by-priority-optional
Replace absolute path test in postrm and fix indentation.
Remove the Priority line in binary packages since they default to the
Source priority which is set to "optional". See
https://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities
Change-Id: Ib07f6414348cbbfb1e7177643d9b9acfd9f1a477
Reviewed-on: https://code.wireshark.org/review/33675
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/wireshark-common.lintian-overrides | 2 | ||||
| -rw-r--r-- | debian/wireshark-common.postrm | 14 |
3 files changed, 9 insertions, 12 deletions
diff --git a/debian/control b/debian/control index 71de626515..3580a25822 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,8 @@ Description: network traffic analyzer - common files packets off the wire. Wireshark can decode too many protocols to list here. . - This package provides files common to both wireshark and tshark (the console version). + This package provides files common to both wireshark and tshark (the + console version). Package: wireshark Architecture: any @@ -97,7 +98,6 @@ Description: network traffic analyzer - development tools new packet dissectors. Package: wireshark-dbg -Priority: extra Architecture: any Section: debug Depends: ${misc:Depends}, wireshark-common (= ${binary:Version}) | wireshark (= ${binary:Version}) | tshark (= ${binary:Version}) @@ -110,7 +110,6 @@ Description: network traffic analyzer - debug symbols programs and libraries. Package: wireshark-doc -Priority: extra Architecture: all Multi-Arch: foreign Section: doc diff --git a/debian/wireshark-common.lintian-overrides b/debian/wireshark-common.lintian-overrides index b330c55417..e87e3215f0 100644 --- a/debian/wireshark-common.lintian-overrides +++ b/debian/wireshark-common.lintian-overrides @@ -1,4 +1,2 @@ # those long lines are examples which we can't break wireshark-common: manpage-has-errors-from-man usr/share/man/man1/dumpcap.1.gz 156: warning [p 1, 2.0i]: can't break line -# this is just a check for the delgroup command -wireshark-common: command-with-path-in-maintainer-script postrm:9 /usr/sbin/delgroup diff --git a/debian/wireshark-common.postrm b/debian/wireshark-common.postrm index dea519833a..c261d6b15e 100644 --- a/debian/wireshark-common.postrm +++ b/debian/wireshark-common.postrm @@ -7,14 +7,14 @@ GROUP=wireshark . /usr/share/debconf/confmodule if [ "$1" = "purge" ] ; then - if getent group $GROUP >/dev/null; then - if [ -x /usr/sbin/delgroup ]; then - if ! delgroup --quiet --system $GROUP; then - db_input high wireshark-common/group-removal-failed || true - db_go - fi - fi + if getent group $GROUP >/dev/null; then + if [ -x "$(command -v delgroup)" ]; then + if ! delgroup --quiet --system $GROUP; then + db_input high wireshark-common/group-removal-failed || true + db_go + fi fi + fi fi #DEBHELPER# |