Split serial templates into separate package

Only SE version should get templates for serial devices.

7 files changed, 52 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
index e4c7924..d386ab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,23 @@
 *~
 .*.swp
-/aclocal.m4
-/autom4te.cache
-/build-stamp
-/config
-/config.log
-/config.guess
-/config.status
-/config.sub
-/configure
-/debian/files
-/debian/vyatta-cfg-firewall.postinst
-/debian/vyatta-cfg-firewall
-/debian/vyatta-cfg-firewall.debhelper.log
-/scripts/firewall/firewall.init
-/INSTALL
-/Makefile.in
-/Makefile
-/generated-templates
\ No newline at end of file
+aclocal.m4
+autom4te.cache
+build-stamp
+config
+config.log
+config.guess
+config.status
+config.sub
+configure
+debian/files
+debian/vyatta-cfg-firewall.postinst
+debian/vyatta-cfg-firewall
+debian/tmp
+debian/vyatta-cfg-firewall-serial
+debian/*.debhelper.log
+debian/*.substvars
+scripts/firewall/firewall.init
+INSTALL
+Makefile.in
+Makefile
+generated-templates
diff --git a/debian/control b/debian/control
index 7a8abc9..12f9e6e 100644
--- a/debian/control
+++ b/debian/control
@@ -32,3 +32,9 @@ Suggests: util-linux (>= 2.13-5),
  ntpdate
 Description: Vyatta firewall configuration templates/scripts
  Vyatta firewall configuration templates and scripts.
+
+Package: vyatta-cfg-firewall-serial
+Architecture: all
+Depends:  vyatta-cfg-firewall
+Description: vyatta-cfg-firewall serial templates
+ Vyatta firewall configuration templates for serial devices
diff --git a/debian/rules b/debian/rules
index ce1bbe3..d5cd7e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 # 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-firewall
-PKGDIR=$(CURDIR)/debian/$(PACKAGE)
-
-CFLAGS = -Wall -g
+PKGDIR=$(CURDIR)/debian/tmp
 
 configure	 = ./configure
 configure	+= --host=$(DEB_HOST_GNU_TYPE)
@@ -25,14 +21,6 @@ configure	+= --build=$(DEB_BUILD_GNU_TYPE)
 configure	+= --prefix=/opt/vyatta
 configure	+= --mandir=\$${prefix}/share/man
 configure	+= --infodir=\$${prefix}/share/info
-configure	+= CFLAGS="$(CFLAGS)"
-configure	+= LDFLAGS="-Wl,-z,defs"
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 
 configure: configure.ac Makefile.am
 	chmod +x debian/autogen.sh
@@ -72,7 +60,10 @@ install: build
 
 	$(MAKE) DESTDIR=$(PKGDIR) install
 
-	install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE)
+	for p in vyatta-cfg-firewall vyatta-cfg-firewall-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
@@ -81,7 +72,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-firewall-serial.install b/debian/vyatta-cfg-firewall-serial.install
new file mode 100644
index 0000000..74b0475
--- /dev/null
+++ b/debian/vyatta-cfg-firewall-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-firewall-serial.lintian-overrides b/debian/vyatta-cfg-firewall-serial.lintian-overrides
new file mode 100644
index 0000000..bce56b8
--- /dev/null
+++ b/debian/vyatta-cfg-firewall-serial.lintian-overrides
@@ -0,0 +1,2 @@
+vyatta-cfg-firewall-serial: file-in-unusual-dir
+vyatta-cfg-firewall-serial: dir-or-file-in-opt
diff --git a/debian/vyatta-cfg-firewall.install b/debian/vyatta-cfg-firewall.install
new file mode 100644
index 0000000..633b9e0
--- /dev/null
+++ b/debian/vyatta-cfg-firewall.install
@@ -0,0 +1,14 @@
+etc/modprobe.d
+opt/vyatta/sbin
+opt/vyatta/etc
+opt/vyatta/share/perl5
+opt/vyatta/share/vyatta-cfg/templates/firewall
+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/wireless
+opt/vyatta/share/vyatta-cfg/templates/interfaces/wirelessmodem
diff --git a/debian/lintian b/debian/vyatta-cfg-firewall.lintian-overrides
index 8504a44..8504a44 100644
--- a/debian/lintian
+++ b/debian/vyatta-cfg-firewall.lintian-overrides