<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16152">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix python-nwdiag dependency on new debian distros<br><br>As seen by https://packages.debian.org, python-nwdiag is only available<br>in buster and older stables, while python3-nwdiag is available in both<br>old and new releases as well as testing and unstable.<br><br>Related: OS#4246<br>Depends: osmo-ci I0ebee6ac11df779ab954bd6648a0bebefc3350a2<br>Change-Id: Ia2c0c833329f8ecab1c427e0d2c002f17ab49a94<br>---<br>M INSTALL.txt<br>M build/diag-filter.conf<br>M check-depends.sh<br>M debian/control<br>4 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/INSTALL.txt b/INSTALL.txt</span><br><span>index 3166bfa..3f4ef9f 100644</span><br><span>--- a/INSTALL.txt</span><br><span>+++ b/INSTALL.txt</span><br><span>@@ -10,7 +10,7 @@</span><br><span> mscgen \</span><br><span> graphviz \</span><br><span> python-pychart \</span><br><span style="color: hsl(0, 100%, 40%);">- python-nwdiag</span><br><span style="color: hsl(120, 100%, 40%);">+ python3-nwdiag</span><br><span> </span><br><span> (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.)</span><br><span> </span><br><span>diff --git a/build/diag-filter.conf b/build/diag-filter.conf</span><br><span>index 4f6005e..0c30db7 100644</span><br><span>--- a/build/diag-filter.conf</span><br><span>+++ b/build/diag-filter.conf</span><br><span>@@ -49,7 +49,7 @@</span><br><span> </span><br><span> </span><br><span> [nwdiag-filter-style]</span><br><span style="color: hsl(0, 100%, 40%);">-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 " "'</span><br><span style="color: hsl(120, 100%, 40%);">+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 " "'</span><br><span> </span><br><span> [blockdef-listing]</span><br><span> template::[nwdiag-filter-style]</span><br><span>@@ -62,7 +62,7 @@</span><br><span> </span><br><span> </span><br><span> [packetdiag-filter-style]</span><br><span style="color: hsl(0, 100%, 40%);">-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 " "'</span><br><span style="color: hsl(120, 100%, 40%);">+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 " "'</span><br><span> </span><br><span> [blockdef-listing]</span><br><span> template::[packetdiag-filter-style]</span><br><span>diff --git a/check-depends.sh b/check-depends.sh</span><br><span>index ec3f26f..d640abf 100755</span><br><span>--- a/check-depends.sh</span><br><span>+++ b/check-depends.sh</span><br><span>@@ -21,7 +21,7 @@</span><br><span> check_dep_bin a2x asciidoc</span><br><span> check_dep_bin asciidoc asciidoc</span><br><span> check_dep_bin dblatex dblatex</span><br><span style="color: hsl(0, 100%, 40%);">-check_dep_bin packetdiag nwdiag</span><br><span style="color: hsl(120, 100%, 40%);">+check_dep_bin packetdiag3 python3-nwdiag</span><br><span> check_dep_bin dot graphviz</span><br><span> check_dep_bin python2 python2</span><br><span> check_dep_python2_module pychart python2-pychart</span><br><span>diff --git a/debian/control b/debian/control</span><br><span>index 0f89d0a..afd09a3 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -15,7 +15,7 @@</span><br><span> libxml2-utils,</span><br><span> mscgen,</span><br><span> python,</span><br><span style="color: hsl(0, 100%, 40%);">- python-nwdiag,</span><br><span style="color: hsl(120, 100%, 40%);">+ python3-nwdiag,</span><br><span> python-pychart,</span><br><span> xsltproc</span><br><span> Standards-Version: 3.9.8</span><br><span>@@ -32,7 +32,7 @@</span><br><span> libxml2-utils,</span><br><span> mscgen,</span><br><span> python,</span><br><span style="color: hsl(0, 100%, 40%);">- python-nwdiag,</span><br><span style="color: hsl(120, 100%, 40%);">+ python3-nwdiag,</span><br><span> python-pychart,</span><br><span> xsltproc</span><br><span> Description: Osmocom manuals shared code</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16152">change 16152</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/16152"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-manuals </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia2c0c833329f8ecab1c427e0d2c002f17ab49a94 </div>
<div style="display:none"> Gerrit-Change-Number: 16152 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>