From: smccroskey <smccroskey@cumulusnetworks.com>
Date: Thu, 20 Jul 2017 18:58:43 +0000 (-0700)
Subject: backports: don't install frr-reload.py in frr package
X-Git-Tag: frr-4.0-dev~145^2~19
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c650c681f6ecd07593fcbf3e4efe28d43b614dd8;p=matthieu%2Ffrr.git

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 a330bb805f..807bdfaccb 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 147d15279f..05f4e70ffb 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 96e2e2b15a..fe3f503804 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 75d4cb14b2..413a664014 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*