13 files changed, 9 insertions, 8 deletions
diff --git a/debian/README b/debian/README
index ee91c1f1..cd10e951 100644
--- a/debian/README
+++ b/debian/README
@@ -1,4 +1,4 @@
-The Debian Package quagga
+The Debian Package vyatta-quagga
 ----------------------------
 
 This package is the Vyatta build of the Quagga routing protocol
@@ -19,7 +19,8 @@ To build from the source package, first add the following to
     deb-src http://archive1.vyatta.com/vyatta community testing
 
 Then:
-    apt-get source quagga
+    apt-get source vyatta-quagga
+    cd vyatta-quagga-VERSION
     debuild -nc -b -uc -us
 
  -- Tom Grennan <tgrennan@vyatta.com>  Wed, 19 DEC 2007
diff --git a/debian/lintian b/debian/lintian
index 58019e16..08d952e9 100644
--- a/debian/lintian
+++ b/debian/lintian
@@ -1,2 +1,2 @@
-quagga: binary-without-manpage usr/sbin/vyatta-ospfclient
-quagga: binary-without-manpage usr/sbin/vyatta-watchquagga
+vyatta-quagga: binary-without-manpage usr/sbin/vyatta-ospfclient
+vyatta-quagga: binary-without-manpage usr/sbin/vyatta-watchquagga
diff --git a/debian/rules b/debian/rules
index d40baffd..29a6d9a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +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=quagga
+PACKAGE=vyatta-quagga
 PKGDIR=$(CURDIR)/debian/$(PACKAGE)
 BUILD_STAMP=debian/build-stamp
 CFLAGS = -Wall -g
diff --git a/debian/quagga.dirs b/debian/vyatta-quagga.dirs
index 8f5c59a8..8f5c59a8 100644
--- a/debian/quagga.dirs
+++ b/debian/vyatta-quagga.dirs
diff --git a/debian/quagga.files b/debian/vyatta-quagga.files
index 3ed35a43..38b1ab33 100644
--- a/debian/quagga.files
+++ b/debian/vyatta-quagga.files
@@ -1,6 +1,6 @@
-etc/vyatta/quagga/
+etc/quagga/
 opt/vyatta/
-usr/lib/quagga/
+usr/lib/vyatta-quagga/
 usr/share/lintian/overrides/
 usr/share/man/man1/vtysh.1
 usr/share/man/man8
diff --git a/debian/quagga.init.d b/debian/vyatta-quagga.init.d
index 69f5752e..987f1fa4 100644
--- a/debian/quagga.init.d
+++ b/debian/vyatta-quagga.init.d
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 ### BEGIN INIT INFO
-# Provides: quagga
+# Provides: vyatta-quagga
 # Required-Start: $local_fs $network $remote_fs $syslog
 # Required-Stop: $local_fs $network $remote_fs $syslog
 # Default-Start:  2 3 4 5
diff --git a/debian/quagga.logrotate b/debian/vyatta-quagga.logrotate
index 020eb83e..020eb83e 100644
--- a/debian/quagga.logrotate
+++ b/debian/vyatta-quagga.logrotate
diff --git a/debian/quagga.manpages b/debian/vyatta-quagga.manpages
index 24556b2d..24556b2d 100644
--- a/debian/quagga.manpages
+++ b/debian/vyatta-quagga.manpages
diff --git a/debian/quagga.postinst b/debian/vyatta-quagga.postinst
index 366f8299..366f8299 100644
--- a/debian/quagga.postinst
+++ b/debian/vyatta-quagga.postinst
diff --git a/debian/quagga.postrm b/debian/vyatta-quagga.postrm
index dac97986..dac97986 100644
--- a/debian/quagga.postrm
+++ b/debian/vyatta-quagga.postrm
diff --git a/debian/quagga.preinst b/debian/vyatta-quagga.preinst
index 29c18b2b..29c18b2b 100644
--- a/debian/quagga.preinst
+++ b/debian/vyatta-quagga.preinst
diff --git a/debian/quagga.prerm b/debian/vyatta-quagga.prerm
index 69792d27..69792d27 100644
--- a/debian/quagga.prerm
+++ b/debian/vyatta-quagga.prerm
diff --git a/debian/quagga.quagga.pam b/debian/vyatta-quagga.quagga.pam
index 6dd5d474..6dd5d474 100644
--- a/debian/quagga.quagga.pam
+++ b/debian/vyatta-quagga.quagga.pam