--- a/debian/rules	Thu Sep 15 09:16:31 2011 +0200
+++ b/debian/rules	Thu Sep 15 09:47:12 2011 +0200
@@ -5,90 +5,94 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
+%:	
+	dh $@
 
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
+override_dh_auto_build:
 	$(MAKE) prefix=/usr
-	#/usr/bin/docbook-to-man debian/logbuch.sgml > logbuch.1
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
-
-	dh_clean
+override_dh_auto_install:
+	$(MAKE) prefix=/usr DESTDIR=debian/logbuch install
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/logbuch.
-	$(MAKE) install DESTDIR=debian/logbuch prefix=/usr
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf	
-	dh_installdocs
-#	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs 
-#	dh_link
-#	dh_strip
-#	dh_compress
-#	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-	dh_perl
-#	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+#-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+#-	CFLAGS += -g
+#-endif
+#-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+#-	INSTALL_PROGRAM += -s
+#-endif
+#-
+#-configure: configure-stamp
+#-configure-stamp:
+#-	dh_testdir
+#-	# Add here commands to configure the package.
+#-
+#-	touch configure-stamp
+#-
+#-
+#-build: build-stamp
+#-
+#-build-stamp: configure-stamp 
+#-	dh_testdir
+#-
+#-	# Add here commands to compile the package.
+#-	$(MAKE) prefix=/usr
+#-	#/usr/bin/docbook-to-man debian/logbuch.sgml > logbuch.1
+#-
+#-	touch build-stamp
+#-
+#-clean:
+#-	dh_testdir
+#-	dh_testroot
+#-	rm -f build-stamp configure-stamp
+#-
+#-	# Add here commands to clean up after the build process.
+#-	-$(MAKE) clean
+#-
+#-	dh_clean
+#-
+#-install: build
+#-	dh_testdir
+#-	dh_testroot
+#-	dh_clean -k
+#-	dh_installdirs
+#-
+#-	# Add here commands to install the package into debian/logbuch.
+#-	$(MAKE) install DESTDIR=debian/logbuch prefix=/usr
+#-
+#-
+#-# Build architecture-independent files here.
+#-binary-indep: build install
+#-# We have nothing to do by default.
+#-
+#-# Build architecture-dependent files here.
+#-binary-arch: build install
+#-	dh_testdir
+#-	dh_testroot
+#-#	dh_installdebconf	
+#-	dh_installdocs
+#-#	dh_installexamples
+#-#	dh_installmenu
+#-#	dh_installlogrotate
+#-#	dh_installemacsen
+#-#	dh_installpam
+#-#	dh_installmime
+#-#	dh_installinit
+#-#	dh_installcron
+#-#	dh_installman
+#-#	dh_installinfo
+#-#	dh_undocumented
+#-	dh_installchangelogs 
+#-#	dh_link
+#-#	dh_strip
+#-#	dh_compress
+#-#	dh_fixperms
+#-#	dh_makeshlibs
+#-	dh_installdeb
+#-	dh_perl
+#-#	dh_shlibdeps
+#-	dh_gencontrol
+#-	dh_md5sums
+#-	dh_builddeb
+#-
+#-binary: binary-indep binary-arch
+#-.PHONY: build clean binary-indep binary-arch binary install configure