* Switch debhelper compatibility level to 5 and use debian/compat

instead of DH_COMPAT.
* Clean up debian/rules a bit.

debian/changelog

@@ -26,6 +26,11 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
   * Drop the base-{etch,lenny} tasks files as make_disc_trees.pl already takes
     care of including packages needed by debootstrap.
  
+  [ Raphael Hertzog ]
+  * Switch debhelper compatibility level to 5 and use debian/compat
+    instead of DH_COMPAT.
+  * Clean up debian/rules a bit.
+
  -- Frans Pop <fjp@debian.org>  Sun, 04 May 2008 19:55:17 +0200
 
 debian-cd (3.0.4) unstable; urgency=low

debian/compat

@@ -0,0 +1 @@
+5

debian/control

@@ -3,7 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: Debian CD Group <debian-cd@lists.debian.org>
 Uploaders: Raphael Hertzog <hertzog@debian.org>, Santiago Garcia Mantinan <manty@debian.org>, Steve McIntyre <93sam@debian.org>
-Build-Depends: debhelper (>= 4)
+Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: tofrodos
 Standards-Version: 3.6.1.0
 Vcs-Svn: svn://svn.debian.org/debian-cd/trunk

debian/rules

@@ -4,28 +4,15 @@
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_COMPAT=4
-
 build: build-stamp
 build-stamp:
 	dh_testdir
-
-	#CONFIGURE#
-	# Add here commands to compile the package.
-	#$(MAKE) 
-
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp install-stamp
-
-	# Add here commands to clean up after the build process.
-	#-#CLEAN#
-
 	dh_clean
 
 install: install-stamp
@@ -54,33 +41,23 @@ binary-arch: build install
 
 # Build architecture-independent files here.
 binary-indep: build install
-#	dh_testversion
 	dh_testdir
 	dh_testroot
 	dh_installdocs README*
 	dh_installexamples
 	dh_installmenu
-#	dh_installemacsen
-#	dh_installinit
 	dh_installcron
-	dh_installmanpages
-#	dh_undocumented
+	dh_installman
 	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-	# You may want to make some executables suid here
-#	dh_makeshlibs
 	dh_installdeb
-#	dh_perl 
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary