--- psiconv/trunk/debian/rules	2014/10/24 11:52:46	352
+++ psiconv/trunk/debian/rules	2014/10/27 12:21:23	353
@@ -1,133 +1,19 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+%:
+	dh $@  --with autotools-dev
 
-# These are used for cross-compiling and for saving the configure script
-# 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)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-config.status: configure
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-ascii-docs --datadir=/usr/share/doc --mandir=/usr/share/man --with-etcdir=/etc/psiconv
-
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE) pkgdatadir=/usr/share/doc/psiconv-doc
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp pkgdatadir=/usr/share/doc/psiconv-doc
-
-
-# Build architecture-independent files here.
-binary-indep: build install psiconv-doc
- 
-
-# Build architecture-dependent files here.
-binary-arch: build install libpsiconv-dev libpsiconv6 psiconv
-
-libpsiconv-dev:
-	dh_testdir
-	dh_testroot
-	rm -rf debian/$@
-	dh_installdirs -p $@
-	ln -sfn libpsiconv6 debian/$@/usr/share/doc/$@
-	dh_install -p $@ --sourcedir debian/tmp
-	dh_installman -p $@
-	dh_link -p $@
-	dh_strip -p $@
-	dh_compress -p $@
-	dh_fixperms -p $@
-	dh_installdeb -p $@
-	dh_gencontrol -p $@
-	dh_md5sums -p $@
-	dh_builddeb -p $@
-
-psiconv-doc:
-	dh_testdir
-	dh_testroot
-	rm -rf debian/$@
-	dh_installdirs -p $@
-	dh_installdocs -p $@
-	dh_install -p $@ --sourcedir debian/tmp
-	dh_installchangelogs -p $@
-	dh_compress -p $@
-	dh_fixperms -p $@
-	dh_installdeb -p $@
-	dh_gencontrol -p $@
-	dh_md5sums -p $@
-	dh_builddeb -p $@
-
-libpsiconv6:
-	dh_testdir
-	dh_testroot
-	rm -rf debian/$@
-	dh_installdirs -p $@
-	dh_installdocs -p $@
-	dh_install -p $@ --sourcedir debian/tmp
-	dh_installchangelogs -p $@
-	dh_link -p $@
-	dh_strip -p $@
-	dh_compress -p $@
-	dh_fixperms -p $@
-	dh_makeshlibs -p $@
-	dh_shlibdeps -p $@
-	dh_installdeb -p $@
-	dh_gencontrol -p $@
-	dh_md5sums -p $@
-	dh_builddeb -p $@
-
-psiconv:
-	dh_testdir
-	dh_testroot
-	rm -rf debian/$@
-	dh_installdirs -p $@
-	ln -sfn libpsiconv6 debian/$@/usr/share/doc/$@
-	dh_install -p $@ --sourcedir debian/tmp
-	dh_installman -p $@
-	dh_link -p $@
-	dh_strip -p $@
-	dh_compress -p $@
-	dh_fixperms -p $@
-	dh_shlibdeps -p $@
-	dh_installdeb -p $@
-	dh_gencontrol -p $@
-	dh_md5sums -p $@
-	dh_builddeb -p $@
-
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-ascii-docs --datadir=/usr/share/doc --with-etcdir=/etc/psiconv
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+override_dh_auto_install:
+	dh_auto_install -- pkgdatadir=/usr/share/doc/psiconv-doc