Split off pseudo devices to a sub package

6 files changed, 28 insertions, 3 deletions

diff --git a/debian/control b/debian/control
index 09afddb0..c78e7439 100644
--- a/debian/control
+++ b/debian/control
@@ -64,3 +64,9 @@ Replaces: vyatta-cfg (<< 0.17.33),
  vyatta-cfg-quagga (<< 0.18.17)
 Description: Vyatta system-level configuration
  Vyatta system-level configuration utiliites, templates and scripts.
+
+Package: vyatta-cfg-system-extra
+Architecture: all
+Depends:  vyatta-cfg-system
+Description: vyatta-cfg-system extra templates
+ Vyatta configuration templates for additional pseudo-devices
diff --git a/debian/rules b/debian/rules
index 0ae83713..d7b64807 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+SUBPKGS= vyatta-cfg-system vyatta-cfg-system-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)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 PACKAGE=vyatta-cfg-system
-PKGDIR=$(CURDIR)/debian/$(PACKAGE)
+PKGDIR=$(CURDIR)/debian/tmp
 
 CFLAGS = -Wall -g
 
@@ -72,7 +73,10 @@ install: build
 
 	$(MAKE) DESTDIR=$(PKGDIR) install
 
-	install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE)
+	for p in $(SUBPKGS); 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
@@ -81,7 +85,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-system-extra.install b/debian/vyatta-cfg-system-extra.install
new file mode 100644
index 00000000..21d25553
--- /dev/null
+++ b/debian/vyatta-cfg-system-extra.install
@@ -0,0 +1,2 @@
+opt/vyatta/share/vyatta-cfg/templates/system
+opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet
diff --git a/debian/vyatta-cfg-system-extra.lintian-overrides b/debian/vyatta-cfg-system-extra.lintian-overrides
new file mode 100644
index 00000000..32409cd5
--- /dev/null
+++ b/debian/vyatta-cfg-system-extra.lintian-overrides
@@ -0,0 +1,2 @@
+vyatta-cfg-system-extra: file-in-unusual-dir
+vyatta-cfg-system-extra: dir-or-file-in-opt
diff --git a/debian/vyatta-cfg-system.install b/debian/vyatta-cfg-system.install
new file mode 100644
index 00000000..dd2104a3
--- /dev/null
+++ b/debian/vyatta-cfg-system.install
@@ -0,0 +1,11 @@
+opt/vyatta/bin
+opt/vyatta/sbin
+opt/vyatta/etc
+opt/vyatta/share/perl5
+opt/vyatta/share/vyatta-cfg/templates/service
+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/tunnel
+opt/vyatta/share/vyatta-cfg/templates/interfaces/vti
diff --git a/debian/lintian b/debian/vyatta-cfg-system.lintian-overrides
index cf586ff3..cf586ff3 100644
--- a/debian/lintian
+++ b/debian/vyatta-cfg-system.lintian-overrides