Split templates for serial device into separate package

6 files changed, 32 insertions, 5 deletions

diff --git a/debian/control b/debian/control
index f43920b4..a9b15eb7 100644
--- a/debian/control
+++ b/debian/control
@@ -22,3 +22,9 @@ Suggests: util-linux (>= 2.13-5),
  ntpdate
 Description: Vyatta configuration templates/scripts for Quagga
  Vyatta configuration templates and scripts for Quagga
+
+Package: vyatta-cfg-quagga-serial
+Architecture: all
+Depends:  vyatta-cfg-quagga
+Description: vyatta-cfg-quagga serial templates
+ Vyatta configuration templates for Quagga use on serial devices
diff --git a/debian/rules b/debian/rules
index 55ea74cf..682108fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-PACKAGE=vyatta-cfg-quagga
-PKGDIR=$(CURDIR)/debian/$(PACKAGE)
+PKGDIR=$(CURDIR)/debian/tmp
 
 CFLAGS = -Wall -g
 
@@ -72,8 +71,10 @@ install: build
 
 	$(MAKE) DESTDIR=$(PKGDIR) install
 
-	install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE)
-	install -D --mode=0644 debian/linda $(PKGDIR)/usr/share/linda/overrides/$(PACKAGE)
+	for p in vyatta-cfg-quagga vyatta-cfg-quagga-serial; do \
+	  install -D --mode=0644 debian/$$p.lintian-overrides \
+		debian/$$p/usr/share/lintian/overrides/$$p; \
+	done
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -82,7 +83,7 @@ binary-indep: build install
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_install
+	dh_install --sourcedir=debian/tmp
 	dh_installdebconf	
 	dh_link
 	dh_strip
diff --git a/debian/vyatta-cfg-quagga-serial.install b/debian/vyatta-cfg-quagga-serial.install
new file mode 100644
index 00000000..74b0475f
--- /dev/null
+++ b/debian/vyatta-cfg-quagga-serial.install
@@ -0,0 +1,3 @@
+opt/vyatta/share/vyatta-cfg/templates/interfaces/adsl
+opt/vyatta/share/vyatta-cfg/templates/interfaces/multilink
+opt/vyatta/share/vyatta-cfg/templates/interfaces/serial
diff --git a/debian/vyatta-cfg-quagga-serial.lintian-overrides b/debian/vyatta-cfg-quagga-serial.lintian-overrides
new file mode 100644
index 00000000..250f5718
--- /dev/null
+++ b/debian/vyatta-cfg-quagga-serial.lintian-overrides
@@ -0,0 +1,2 @@
+vyatta-cfg-quagga-serial: file-in-unusual-dir
+vyatta-cfg-quagga-serial: dir-or-file-in-opt
diff --git a/debian/vyatta-cfg-quagga.install b/debian/vyatta-cfg-quagga.install
new file mode 100644
index 00000000..a344ac5e
--- /dev/null
+++ b/debian/vyatta-cfg-quagga.install
@@ -0,0 +1,15 @@
+opt/vyatta/sbin
+opt/vyatta/etc
+opt/vyatta/share/perl5
+opt/vyatta/share/vyatta-cfg/templates/policy
+opt/vyatta/share/vyatta-cfg/templates/protocols
+opt/vyatta/share/vyatta-cfg/templates/system/gateway-address
+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/loopback
+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/wireless
+opt/vyatta/share/vyatta-cfg/templates/interfaces/wirelessmodem
diff --git a/debian/lintian b/debian/vyatta-cfg-quagga.lintian-overrides
index 275491da..275491da 100644
--- a/debian/lintian
+++ b/debian/vyatta-cfg-quagga.lintian-overrides