From d2022a82d1696c00b67a800f87cc23baa9499aea Mon Sep 17 00:00:00 2001 From: smccroskey Date: Mon, 29 May 2017 15:34:02 -0700 Subject: [PATCH 1/3] debian: install PNG files in /usr/share/info Testing done: built in sbuild with lintian enabled Clears lintian warnings of the following form: W: frr-doc: info-document-missing-image-file According to the documentation for the lintian warning, certain applications (e.g. emacs) can render images from info files inline, and expect the images to either have their full path defined or be installed in the same directory as the info files themselves. Automake doesn't seem to have a primary for handling this sort of installation (info_DATA is invalid and causes an error), so opted to handle it in the debian install file itself. Installing the images elsewhere (another path installed by frr-doc) and giving a full path to their location in info files might be a better approach. Signed-off-by: Silas McCroskey --- debianpkg/frr-doc.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debianpkg/frr-doc.install b/debianpkg/frr-doc.install index d2d3f1bbd951..e5910fec8f27 100644 --- a/debianpkg/frr-doc.install +++ b/debianpkg/frr-doc.install @@ -1 +1,2 @@ usr/share/info +doc/*.png usr/share/info From 950e97c43402f758da5bc7190a1b7877d465145f Mon Sep 17 00:00:00 2001 From: smccroskey Date: Thu, 20 Jul 2017 11:55:21 -0700 Subject: [PATCH 2/3] ospfclient: fix man page section Testing done: built in sbuild with lintian enabled Clears the following lintian warning: W: frr: manpage-section-mismatch usr/share/man/man8/ospfclient.8.gz:2 8 != 1 Signed-off-by: Silas McCroskey --- doc/ospfclient.8.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ospfclient.8.in b/doc/ospfclient.8.in index fb996a541fa8..a304beffda39 100644 --- a/doc/ospfclient.8.in +++ b/doc/ospfclient.8.in @@ -1,5 +1,5 @@ .\" This file was originally generated by help2man 1.36. -.TH OSPFCLIENT "1" "July 2010" +.TH OSPFCLIENT "8" "July 2010" .SH NAME ospfclient \- an example ospf-api client .SH SYNOPSIS From fe57aa3291878414a07c549c7dd89ac39992c137 Mon Sep 17 00:00:00 2001 From: smccroskey Date: Thu, 20 Jul 2017 11:58:43 -0700 Subject: [PATCH 3/3] backports: don't install frr-reload.py in frr package Testing done: built in sbuild with lintian enabled verified frr-reload.py still in frr-pythontools Clean up issues missed when moving the script into a separate package. Clears the following lintian warning: E: frr: python-script-but-no-python-dep usr/lib/frr/frr-reload.py Signed-off-by: Silas McCroskey --- debianpkg/backports/ubuntu12.04/debian/rules | 3 +++ debianpkg/backports/ubuntu14.04/debian/frr.install | 1 - debianpkg/backports/ubuntu14.04/debian/rules | 3 +++ debianpkg/rules | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules index a330bb805fae..807bdfaccbe6 100755 --- a/debianpkg/backports/ubuntu12.04/debian/rules +++ b/debianpkg/backports/ubuntu12.04/debian/rules @@ -171,6 +171,9 @@ override_dh_auto_test: override_dh_auto_install: dh_auto_install + # installed in frr-pythontools + rm debian/tmp/usr/lib/frr/frr-reload.py + # cleaning up the info dir rm -f debian/tmp/usr/share/info/dir* diff --git a/debianpkg/backports/ubuntu14.04/debian/frr.install b/debianpkg/backports/ubuntu14.04/debian/frr.install index 147d15279f2b..05f4e70ffbe3 100644 --- a/debianpkg/backports/ubuntu14.04/debian/frr.install +++ b/debianpkg/backports/ubuntu14.04/debian/frr.install @@ -2,7 +2,6 @@ etc/frr/ usr/bin/vtysh usr/include/frr/ usr/lib/ -tools/frr-reload.py usr/lib/frr/ tools/frr etc/init.d/ usr/share/doc/frr/ usr/share/man/man1/vtysh.1 diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules index 96e2e2b15a8e..fe3f50380405 100755 --- a/debianpkg/backports/ubuntu14.04/debian/rules +++ b/debianpkg/backports/ubuntu14.04/debian/rules @@ -171,6 +171,9 @@ override_dh_auto_test: override_dh_auto_install: dh_auto_install + # installed in frr-pythontools + rm debian/tmp/usr/lib/frr/frr-reload.py + # cleaning up the info dir rm -f debian/tmp/usr/share/info/dir* diff --git a/debianpkg/rules b/debianpkg/rules index 67d0f4fe0092..8c2905821b4d 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -171,6 +171,9 @@ override_dh_auto_test: override_dh_auto_install: dh_auto_install + # installed in frr-pythontools + rm debian/tmp/usr/lib/frr/frr-reload.py + # cleaning up the info dir rm -f debian/tmp/usr/share/info/dir*