Merge pull request #3 from silasm/Debian-Pkg-2.0

Debian pkg 2.0
opensourcerouting · Jul 21, 2017 · 7bc07a7 · 7bc07a7
2 parents 61ce521 + fe57aa3
commit 7bc07a7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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/frr-doc.install b/debianpkg/frr-doc.install
@@ -1 +1,2 @@
 usr/share/info
+doc/*.png usr/share/info
diff --git 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*
 

diff --git 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