summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-11-21 17:40:41 +0100
committerOliver Smith <osmith@sysmocom.de>2019-11-22 11:24:16 +0100
commitde57f626df0e2e9771aedaf2c16472420bc4696e (patch)
tree035c91a8bab164f9331f6405a6f8697f953af44d
parent6084c8983100976ee06096bc7373b119e32a7cc1 (diff)
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
-rw-r--r--INSTALL.txt2
-rw-r--r--build/diag-filter.conf4
-rwxr-xr-xcheck-depends.sh2
-rw-r--r--debian/control4
4 files changed, 6 insertions, 6 deletions
diff --git a/INSTALL.txt b/INSTALL.txt
index 3166bfa..3f4ef9f 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -10,7 +10,7 @@ apt-get install \
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 @@ template::[filter-diag-pngsvg-blockmacro]
[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 @@ template::[filter-diag-pngsvg-blockmacro]
[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 xsltproc libxslt
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 @@ Build-Depends: autotools-dev,
libxml2-utils,
mscgen,
python,
- python-nwdiag,
+ python3-nwdiag,
python-pychart,
xsltproc
Standards-Version: 3.9.8
@@ -32,7 +32,7 @@ Depends: ${misc:Depends},
libxml2-utils,
mscgen,
python,
- python-nwdiag,
+ python3-nwdiag,
python-pychart,
xsltproc
Description: Osmocom manuals shared code