debianpkg: Move frr-reload.py to frr-pythontools subpackage

- avoids python dependency on main frr package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/debianpkg/Makefile.am b/debianpkg/Makefile.am
index c46cfb1c4eaa00a3a148c9e28b76280080760590..686c60077ad5fdbde78ecd33f20282fd5797efa7 100644 (file)
--- a/debianpkg/Makefile.am
+++ b/debianpkg/Makefile.am
@@ -34,4 +34,5 @@ EXTRA_DIST = README.Debian README.Maintainer \
        frr.dirs frr.docs frr.install \
        frr.lintian-overrides frr.logrotate \
        frr.manpages frr.pam frr.postinst frr.postrm \
-       frr.preinst frr.prerm
+       frr.preinst frr.prerm \
+       frr-pythontools.install

diff --git a/debianpkg/backports/ubuntu12.04/debian/control b/debianpkg/backports/ubuntu12.04/debian/control
index 066407f7e374a3d494a3fc8affe4b2a44487a4ed..ae1a8811d9f00f6552d8af5b4a13d0f276cd65a3 100644 (file)
--- a/debianpkg/backports/ubuntu12.04/debian/control
+++ b/debianpkg/backports/ubuntu12.04/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Nobody <nobody@frrouting.org>
 Uploaders: Nobody <nobody@frrouting.org>
 XSBC-Original-Maintainer: <maintainers@frrouting.org>
-Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, po-debconf, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson0, libjson0-dev, python-ipaddr, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, po-debconf, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson0, libjson0-dev, pkg-config, python (>= 2.7), python-ipaddr
 Standards-Version: 3.9.6
 Homepage: http://www.freerangerouting.org/
 XS-Testsuite: autopkgtest
@@ -44,3 +44,13 @@ Description: documentation files for FRR
  This package includes info files for frr, a free software which manages
  TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
  IS-IS, RIPv1, RIPv2, RIPng, PIM and LDP as well as the IPv6 versions of these.
+
+Package: frr-pythontools
+Section: net
+Architecture: all
+Depends: ${misc:Depends}, frr (= ${binary:Version}), python (>= 2.7), python-ipaddr
+Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (Python Tools)
+ This package includes info files for frr, a free software which manages
+ TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
+ IS-IS, RIPv1, RIPv2, RIPng, PIM and LDP as well as the IPv6 versions of these.
+

diff --git a/debianpkg/backports/ubuntu14.04/debian/control b/debianpkg/backports/ubuntu14.04/debian/control
index 7e8c860d8cef1148cc2a8ad2d829c0ca595cb8d4..e0dbf24c61156b6757c09ab0276f4cebe8b29673 100644 (file)
--- a/debianpkg/backports/ubuntu14.04/debian/control
+++ b/debianpkg/backports/ubuntu14.04/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Nobody <nobody@frrouting.org>
 Uploaders: Nobody <nobody@frrouting.org>
 XSBC-Original-Maintainer: <maintainers@frrouting.org>
-Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, po-debconf, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2, python-ipaddr, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, po-debconf, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2, pkg-config, python (>= 2.7), python-ipaddr
 Standards-Version: 3.9.6
 Homepage: http://www.freerangerouting.org/
 XS-Testsuite: autopkgtest
@@ -44,3 +44,13 @@ Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (documentation)
  This package includes info files for frr, a free software which manages
  TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
  IS-IS, RIPv1, RIPv2, RIPng, PIM and LDP as well as the IPv6 versions of these.
+
+Package: frr-pythontools
+Section: net
+Architecture: all
+Depends: ${misc:Depends}, frr (= ${binary:Version}), python (>= 2.7), python-ipaddr
+Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (Python Tools)
+ This package includes info files for frr, a free software which manages
+ TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
+ IS-IS, RIPv1, RIPv2, RIPng, PIM and LDP as well as the IPv6 versions of these.
+

diff --git a/debianpkg/control b/debianpkg/control
index dd2d4223db05fc08ecd69683097a723a3d3d1a8d..1d59f83bf3e1826b1bf69004292045ea6d54f96f 100644 (file)
--- a/debianpkg/control
+++ b/debianpkg/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Nobody <nobody@frrouting.org>
 Uploaders: Nobody <nobody@frrouting.org>
-Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, po-debconf, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2, dh-systemd, libsystemd-dev, python-ipaddr, bison, flex, libc-ares-dev, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, po-debconf, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson-c-dev, libjson-c2, dh-systemd, libsystemd-dev, bison, flex, libc-ares-dev, pkg-config, python (>= 2.7), python-ipaddr
 Standards-Version: 3.9.6
 Homepage: http://www.freerangerouting.org/
 
@@ -42,3 +42,12 @@ Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (documentation)
  This package includes info files for frr, a free software which manages
  TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
  IS-IS, RIPv1, RIPv2, RIPng, PIM and LDP as well as the IPv6 versions of these.
+
+Package: frr-pythontools
+Section: net
+Architecture: all
+Depends: ${misc:Depends}, frr (= ${binary:Version}), python (>= 2.7), python-ipaddr
+Description: BGP/OSPF/RIP/RIPng/ISIS/PIM/LDP routing daemon (Python Tools)
+ This package includes info files for frr, a free software which manages
+ TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
+ IS-IS, RIPv1, RIPv2, RIPng, PIM and LDP as well as the IPv6 versions of these.

diff --git a/debianpkg/frr-pythontools.install b/debianpkg/frr-pythontools.install
new file mode 100644 (file)
index 0000000..aee093c
--- /dev/null
+++ b/debianpkg/frr-pythontools.install
@@ -0,0 +1 @@
+tools/frr-reload.py usr/lib/frr/

diff --git a/debianpkg/frr.install b/debianpkg/frr.install
index 45b3b973be4945b5c8e3a74cf28b736d697f09c5..9c85bcfc72969c085aebc52da6dba52ef7d95141 100644 (file)
--- a/debianpkg/frr.install
+++ b/debianpkg/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 usr/lib/frr
 usr/share/doc/frr/
 usr/share/man/man1/vtysh.1