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/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16152 ) Change subject: Fix python-nwdiag dependency on new debian distros ...................................................................... Fix python-nwdiag dependency on new debian distros As seen by https://packages.debian.org, python-nwdiag is only available in buster and older stables, while python3-nwdiag is available in both old and new releases as well as testing and unstable. Related: OS#4246 Depends: osmo-ci I0ebee6ac11df779ab954bd6648a0bebefc3350a2 Change-Id: Ia2c0c833329f8ecab1c427e0d2c002f17ab49a94 --- M INSTALL.txt M build/diag-filter.conf M check-depends.sh M debian/control 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/INSTALL.txt b/INSTALL.txt index 3166bfa..3f4ef9f 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -10,7 +10,7 @@ mscgen \ graphviz \ python-pychart \ - python-nwdiag + python3-nwdiag (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.) diff --git a/build/diag-filter.conf b/build/diag-filter.conf index 4f6005e..0c30db7 100644 --- a/build/diag-filter.conf +++ b/build/diag-filter.conf @@ -49,7 +49,7 @@ [nwdiag-filter-style] -nwdiag-style=template="nwdiag-block",subs=(),posattrs=("style","target"),filter='nwdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "' +nwdiag-style=template="nwdiag-block",subs=(),posattrs=("style","target"),filter='nwdiag3 -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "' [blockdef-listing] template::[nwdiag-filter-style] @@ -62,7 +62,7 @@ [packetdiag-filter-style] -packetdiag-style=template="packetdiag-block",subs=(),posattrs=("style","target"),filter='packetdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "' +packetdiag-style=template="packetdiag-block",subs=(),posattrs=("style","target"),filter='packetdiag3 -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "' [blockdef-listing] template::[packetdiag-filter-style] diff --git a/check-depends.sh b/check-depends.sh index ec3f26f..d640abf 100755 --- a/check-depends.sh +++ b/check-depends.sh @@ -21,7 +21,7 @@ check_dep_bin a2x asciidoc check_dep_bin asciidoc asciidoc check_dep_bin dblatex dblatex -check_dep_bin packetdiag nwdiag +check_dep_bin packetdiag3 python3-nwdiag check_dep_bin dot graphviz check_dep_bin python2 python2 check_dep_python2_module pychart python2-pychart diff --git a/debian/control b/debian/control index 0f89d0a..afd09a3 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ libxml2-utils, mscgen, python, - python-nwdiag, + python3-nwdiag, python-pychart, xsltproc Standards-Version: 3.9.8 @@ -32,7 +32,7 @@ libxml2-utils, mscgen, python, - python-nwdiag, + python3-nwdiag, python-pychart, xsltproc Description: Osmocom manuals shared code -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ia2c0c833329f8ecab1c427e0d2c002f17ab49a94 Gerrit-Change-Number: 16152 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191122/8de2f5e6/attachment.htm>