Debian: Fixup build issues with switch to 3.0

Modify the build type from patch to git
Fix the rules: spaces to tabs these were causing build issues
Add some additional dependent packages

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Alex Doyle <adoyle@cumulusnetworks.com>

1 files changed, 34 insertions, 34 deletions

diff --git a/debian/rules b/debian/rules
index 4642dbfeb..457f71780 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,22 +13,22 @@ endif
 
 %:
 	dh $@ --parallel --with autoreconf --dbg-package=quagga-dbg --list-missing
-        if [ -e config.status ]; then \
-                 dh $@ --parallel  --dbg-package=quagga-dbg --list-missing; \
-        else \
-                 dh $@ --parallel  --with autoreconf --dbg-package=quagga-dbg --list-missing; \
-        fi
+	if [ -e config.status ]; then \
+		dh $@ --parallel  --dbg-package=quagga-dbg --list-missing; \
+	else \
+		dh $@ --parallel  --with autoreconf --dbg-package=quagga-dbg --list-missing; \
+	fi
 
 override_dh_auto_clean:
 	#dh_auto_clean
-	
+
 	#@echo "BEGIN CRUFT"
 	#@rm -vf */Makefile doc/quagga.fns doc/quagga.info doc/quagga.kys doc/quagga.tmp doc/quagga.pdf doc/quagga.info-*
 	#@rm -vf lib/version.c doc/stamp-vti
 	#@rm -vf vtysh/vtysh_cmd.c
 	#@rm -vf doc/fig*.pdf doc/version.texi
 	#@echo "END CRUFT"
-	
+
 	# why?
 	#@if [ -e config.log ]; then echo "CONFIG.LOG STILL THERE"; rm config.log; fi
 
@@ -37,34 +37,34 @@ override_dh_auto_configure:
 	# Else it fails with an obscure error message pointing out that
 	# IPCTL_FORWARDING is an undefined symbol which is not very helpful.
 	@if ! [ -d /proc/1 ]; then \
-	   echo "./configure needs a mounted /proc"; \
-	   exit 1; \
+		echo "./configure needs a mounted /proc"; \
+		exit 1; \
 	fi
 
 	if ! [ -e config.status ]; then \
 	dh_auto_configure -- \
- 		--enable-exampledir=/usr/share/doc/quagga/examples/ \
+		--enable-exampledir=/usr/share/doc/quagga/examples/ \
 		--localstatedir=/var/run/quagga \
 		--sbindir=/usr/lib/quagga \
 		--sysconfdir=/etc/quagga \
-	    $(USE_SNMP) \
- 		--enable-vtysh \
- 		--enable-isisd \
- 		--enable-watchquagga \
- 		--enable-ospf-te \
- 		--enable-opaque-lsa \
- 		--enable-ipv6 \
- 		--enable-ospfclient=yes \
- 		--enable-ospfapi=yes \
- 		--enable-multipath=64 \
- 		--enable-user=quagga \
- 		--enable-group=quagga \
- 		--enable-vty-group=quaggavty \
- 		--enable-configfile-mask=0640 \
- 		--enable-logfile-mask=0640 \
- 		--enable-rtadv \
+		$(USE_SNMP) \
+		--enable-vtysh \
+		--enable-isisd \
+		--enable-watchquagga \
+		--enable-ospf-te \
+		--enable-opaque-lsa \
+		--enable-ipv6 \
+		--enable-ospfclient=yes \
+		--enable-ospfapi=yes \
+		--enable-multipath=64 \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-vty-group=quaggavty \
+		--enable-configfile-mask=0640 \
+		--enable-logfile-mask=0640 \
+		--enable-rtadv \
 		--enable-werror \
- 		--enable-gcc-rdynamic \
+		--enable-gcc-rdynamic \
 		--with-libpam \
 		--enable-dependency-tracking; \
 	fi
@@ -80,7 +80,7 @@ override_dh_auto_build:
 	$(MAKE)
 	dh_auto_build -- -C doc draft-zebra-00.txt
 
-	
+
 	# doc/ is a bit crazy
 ifeq ($(GENERATE_PDF), 1)
 	dh_auto_build -- -C doc quagga.pdf || true # pdfetex fails with exit code 1 but still produces a good looking .pdf
@@ -90,25 +90,25 @@ endif
 	rm -vf doc/quagga.info.html*
 
 override_dh_auto_test:
- 
+
 override_dh_auto_install:
 	dh_auto_install
-	
+
 	# cleaning up the info dir
 	rm -f debian/tmp/usr/share/info/dir*
-	
+
 	# install config files
 	mkdir -p debian/tmp/etc/quagga/
 	cp debian/my/debian.conf debian/tmp/etc/quagga/
 	cp debian/my/daemons debian/tmp/etc/quagga/
 	perl -pi -e 's#^!log file #!log file /var/log/quagga/#' debian/tmp/usr/share/doc/quagga/examples/*sample*
-	    
+
 	# installing the Quagga specific SNMP MIB
 	install -D -m 644 ./zebra/GNOME-PRODUCT-ZEBRA-MIB debian/tmp/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB
-	
+
 	# installing custom man page
 	cp debian/my/babeld.8 debian/tmp/usr/share/man/man8/quagga-babeld.8
-	
+
 	# cleaning .la files
 	sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la