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 <smccroskey@cumulusnetworks.com>

diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules
index a330bb805faecbebcbacc43019168bc14a514ccb..807bdfaccbe6f1b3c8cbc4ba9fbb36447dc413ba 100755 (executable)
--- 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 147d15279f2b98474e7a2855a580f2d176715677..05f4e70ffbe3a30f455b72b9365afa2e6b86d082 100644 (file)
--- 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 96e2e2b15a8efe8e441d6d77ddaa5bd82668d19e..fe3f50380405c963e04bd7f82a54e87cdc6c3545 100755 (executable)
--- 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 67d0f4fe00929620b8512429bc9b1871ebea0aea..8c2905821b4d3efe7dd32653e76e3f49d2aaa9c1 100755 (executable)
--- 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*