Split off extra pseudo-devices into a sub package

6 files changed, 19 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index a747f16..19c1801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ debian/vyatta-cfg-firewall
 debian/tmp
 debian/vyatta-cfg-firewall-serial
 debian/vyatta-cfg-firewall-wireless
+debian/vyatta-cfg-firewall-extra
 debian/*.debhelper.log
 debian/*.substvars
 scripts/firewall/firewall.init
diff --git a/debian/control b/debian/control
index 64878f6..702cb14 100644
--- a/debian/control
+++ b/debian/control
@@ -38,12 +38,17 @@ Description: Vyatta firewall configuration templates/scripts
 Package: vyatta-cfg-firewall-serial
 Architecture: all
 Depends:  vyatta-cfg-firewall, vyatta-serial
-Replaces: vyatta-cfg-firewall
 Description: vyatta-cfg-firewall serial templates
  Vyatta firewall configuration templates for serial devices
 
 Package: vyatta-cfg-firewall-wireless
 Architecture: all
 Depends:  vyatta-cfg-firewall, vyatta-wireless
-Replaces: vyatta-cfg-firewall
 Description: vyatta-cfg-firewall wireless templates
+  Vyatta firewall configuration templates for wireless devices
+
+Package: vyatta-cfg-firewall-extra
+Architecture: all
+Depends:  vyatta-cfg-firewall
+Description: vyatta-cfg-firewall extra templates
+  Vyatta firewall configuration for pseudo devices
diff --git a/debian/rules b/debian/rules
index 08c369b..01cdd1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+SUBPKGS=vyatta-cfg-firewall \
+	vyatta-cfg-firewall-serial \
+	vyatta-cfg-firewall-wireless \
+	vyatta-cfg-firewall-extra
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -60,7 +65,7 @@ install: build
 
 	$(MAKE) DESTDIR=$(PKGDIR) install
 
-	for p in vyatta-cfg-firewall vyatta-cfg-firewall-serial vyatta-cfg-firewall-wireless; do \
+	for p in $(SUBPKGS); do \
 	  install -D --mode=0644 debian/$$p.lintian-overrides \
 		debian/$$p/usr/share/lintian/overrides/$$p; \
 	done
diff --git a/debian/vyatta-cfg-firewall-extra.install b/debian/vyatta-cfg-firewall-extra.install
new file mode 100644
index 0000000..2b53500
--- /dev/null
+++ b/debian/vyatta-cfg-firewall-extra.install
@@ -0,0 +1,3 @@
+opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet
+opt/vyatta/share/vyatta-cfg/templates/interfaces/bonding
+opt/vyatta/share/vyatta-cfg/templates/interfaces/input
diff --git a/debian/vyatta-cfg-firewall-extra.lintian-overrides b/debian/vyatta-cfg-firewall-extra.lintian-overrides
new file mode 100644
index 0000000..98e7541
--- /dev/null
+++ b/debian/vyatta-cfg-firewall-extra.lintian-overrides
@@ -0,0 +1,2 @@
+vyatta-cfg-firewall-extra: file-in-unusual-dir
+vyatta-cfg-firewall-extra: dir-or-file-in-opt
diff --git a/debian/vyatta-cfg-firewall.install b/debian/vyatta-cfg-firewall.install
index b796795..2fb0402 100644
--- a/debian/vyatta-cfg-firewall.install
+++ b/debian/vyatta-cfg-firewall.install
@@ -4,11 +4,8 @@ opt/vyatta/etc
 opt/vyatta/share/perl5
 opt/vyatta/share/vyatta-cfg/templates/firewall
 opt/vyatta/share/vyatta-cfg/templates/policy
-opt/vyatta/share/vyatta-cfg/templates/interfaces/bonding
 opt/vyatta/share/vyatta-cfg/templates/interfaces/bridge
 opt/vyatta/share/vyatta-cfg/templates/interfaces/ethernet
-opt/vyatta/share/vyatta-cfg/templates/interfaces/input
 opt/vyatta/share/vyatta-cfg/templates/interfaces/openvpn
-opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet
 opt/vyatta/share/vyatta-cfg/templates/interfaces/tunnel
 opt/vyatta/share/vyatta-cfg/templates/interfaces/vti