summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdebianpkg/backports/ubuntu12.04/debian/rules3
-rw-r--r--debianpkg/backports/ubuntu14.04/debian/frr.install1
-rwxr-xr-xdebianpkg/backports/ubuntu14.04/debian/rules3
-rwxr-xr-xdebianpkg/rules3
4 files changed, 9 insertions, 1 deletions
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*