More lintian errors fixed.

Makefile

@@ -76,7 +76,7 @@ linda: all
 #  Run "lintian" on all binary packages to test for Debian policy violations.
 #
 lintian: all
-	lintian *.changes
+	lintian -c --suppress-tags 'out-of-date-standards-version,latest-debian-changelog-entry-changed-to-native,empty-binary-package' *.changes
 
 
 

apache/debian/compat

-6
+7

apache/debian/control

@@ -2,7 +2,7 @@ Source: symbiosis-httpd
 Section: web
 Priority: optional
 Maintainer: Steve Kemp <steve@bytemark.co.uk>
-Build-Depends: debhelper (>= 6.0.0), apache2-dev
+Build-Depends: debhelper (>= 7.0.0), apache2-dev
 Standards-Version: 3.8.0
 
 Package: libapache2-mod-vhost-bytemark

crack/debian/compat

-4
+7

crack/debian/control

@@ -3,7 +3,7 @@ Section: web
 Priority: extra
 Maintainer: Steve Kemp <steve@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patch@bytemark.co.uk>
-Build-Depends: debhelper (>= 4.0.0), cracklib2-dev
+Build-Depends: debhelper (>= 7.0.0), cracklib2-dev
 Standards-Version: 3.8.0
 
 Package: symbiosis-crack

dns/debian/compat

-4
+7

dns/debian/control

@@ -3,13 +3,13 @@ Section: net
 Priority: extra
 Maintainer: Steve Kemp <steve@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patch@bytemark.co.uk>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 7.0.0)
 Standards-Version: 3.8.0
 
 Package: symbiosis-tinydns
 Provides: bytemark-vhost-tinydns
 Architecture: all
-Depends: rsync, wget, unzip
+Depends: rsync, wget, unzip, ${misc:Depends}
 Pre-Depends: bytemark-vhost-range
 Conflicts: bytemark-vhost-autofs
 Description: Automatic DNS record creation and uploading for Bytemark customers
@@ -25,4 +25,4 @@ Description: Automatic DNS record creation and uploading for Bytemark customers
    * b.ns.bytemark.co.uk
  .
    * c.ns.bytemark.co.uk
- .
\ No newline at end of file
+ .

email/debian/compat

-6
+7

email/debian/control

@@ -3,7 +3,7 @@ Section: mail
 Priority: extra
 Maintainer: Steve Kemp <steve@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patch@bytemark.co.uk>
-Build-Depends: debhelper (>= 6.0.0), rdoc, txt2man, cdbs, perl
+Build-Depends: debhelper (>= 7.0.0), rdoc, txt2man, cdbs, perl
 Standards-Version: 3.8.0
 
 Package: symbiosis-email

firewall/debian/changelog

@@ -6,7 +6,7 @@ symbiosis-firewall (2010:0603) stable; urgency=low
   [ Patrick J Cherry ]
   * Switched to dpkg-source 3.0 (native) format
 
- -- Steve Kemp <patrick@bytemark.co.uk>  Thu, 03 Jun 2010 13:51:30 +0100
+ -- Steve Kemp <steve@bytemark.co.uk>  Thu, 03 Jun 2010 13:51:30 +0100
 
 symbiosis-firewall (2010:0427) stable; urgency=low
 

ftpd/debian/compat

-6
+7

ftpd/debian/control

@@ -3,7 +3,7 @@ Section: web
 Priority: extra
 Maintainer: Steve Kemp <steve@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patch@bytemark.co.uk>
-Build-Depends: debhelper (>= 6.0.0), cdbs
+Build-Depends: debhelper (>= 7.0.0), cdbs
 Standards-Version: 3.8.0
 
 Package: symbiosis-ftpd

key/debian/compat

-6
+7

key/debian/control

@@ -3,7 +3,7 @@ Section: web
 Priority: extra
 Maintainer: Steve Kemp <steve@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patch@bytemark.co.uk>
-Build-Depends: debhelper (>= 6.0.0), cdbs
+Build-Depends: debhelper (>= 7.0.0), cdbs
 Standards-Version: 3.8.0
 
 Package: symbiosis-key

meta/debian/compat

-6
+7

meta/debian/control

@@ -3,7 +3,7 @@ Section: web
 Priority: extra
 Maintainer: Steve Kemp <steve@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patch@bytemark.co.uk>
-Build-Depends: debhelper (>= 6.0.0), cdbs
+Build-Depends: debhelper (>= 7.0.0), cdbs
 Standards-Version: 3.8.0
 
 Package: bytemark-symbiosis
@@ -25,7 +25,7 @@ Package: bytemark-vhost
 Architecture: all
 Depends: bytemark-symbiosis, ${misc:Depends}
 Description: An easy, complete, and Debian-friendly server administration system
- This packages is present to ease the renaming transition and can safely be
+ This package is present to ease the renaming transition and can safely be
  removed.
  .
  (meta package)

meta/debian/postinst

@@ -56,7 +56,7 @@ fi
 #
 #  Shadow passwords must be on
 #
-/sbin/shadowconfig on 2>/dev/null >/dev/null
+shadowconfig on 2>/dev/null >/dev/null
 
 
 #

monit/debian/compat

-4
+7

monit/debian/control

@@ -3,13 +3,13 @@ Section: web
 Priority: extra
 Maintainer: Steve Kemp <steve@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patch@bytemark.co.uk>
-Build-Depends: debhelper (>= 4.0.0), rdoc, txt2man
+Build-Depends: debhelper (>= 7.0.0), rdoc, txt2man, cdbs
 Standards-Version: 3.8.0
 
 Package: symbiosis-monit
 Provides: bytemark-vhost-monit
 Architecture: all
-Depends: ruby, rdoc, cron
+Depends: ruby, rdoc, cron, ${misc:Depends}
 Conflicts: monit
 Description: Service monitoring and restarting
  This package configures your server to include monitoring, so that

monit/debian/rules

@@ -2,54 +2,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
+build/symbiosis-monit::
+	make docs
 
-
-build: build-stamp
-	make all
-
-build-stamp: configure-stamp
-	dh_testdir
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	dh_clean
+cleanbuilddir/symbiosis-monit::
 	make clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	dh_installdirs
-
-# Build architecture-independent files here.
-binary-arch: build install
-# We have nothing to do 
-
-# Build architecture-dependent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install
-	dh_installman man/*
-	dh_installcron
-	dh_installdocs 
-	dh_installdocs rdoc/*
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure