deb: Now using debhelper

debmake is gone

5 files changed, 33 insertions, 54 deletions

diff --git a/Makefile b/Makefile
index 8528255..b205a66 100755
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,8 @@ LISP_FILES=connection.el dictionary.el link.el lpath.el dictionary-init.el \
            install-package.el
 DOC_FILES=README GPL Makefile
 DEB_FILES=README.debian control copyright install.debian postinst \
-          prerm remove.debian rules changelog dirs
+          prerm remove.debian rules changelog dictionary.install \
+	  compat
 DEB_DIR=deb
 
 .SUFFIXES: .elc .el
@@ -28,7 +29,7 @@ all: $(COMPILED)
 
 .PHONY: debian
 debian:
-	[ -x debian ] || ln -s deb debian
+	@[ -x debian ] || ln -s deb debian
 	@if [ -x /usr/bin/fakeroot ]; then \
 	  dpkg-buildpackage -us -uc -rfakeroot; \
 	elif [ `id -u` -ne 0 ]; then \
@@ -94,7 +95,7 @@ dist:
 	install -d $$DESTDIR; \
 	install $(LISP_FILES) $(DOC_FILES) $$DESTDIR; \
 	mkdir $$DESTDIR/$(DEB_DIR); \
-	cd $(DEB_DIR) && install $(DEB_FILES) $$DESTDIR/$(DEB_DIR); \
+	cd $(DEB_DIR) && install -m 644 $(DEB_FILES) $$DESTDIR/$(DEB_DIR); \
 	tar czf $(CURDIR)/dictionary-$$VERSION.tar.gz -C $$DIR .; \
 	rm -r $$DIR; \
 	echo "dictionary-$$VERSION.tar.gz has been created"
diff --git a/deb/control b/deb/control
index fed4dd5..b1010c1 100755
--- a/deb/control
+++ b/deb/control
@@ -2,7 +2,7 @@ Source: dictionary
 Section: unofficial
 Priority: optional
 Maintainer: Torsten Hilbrich <dictionary@myrkr.in-berlin.de>
-Build-Depends: dpkg-dev, debmake
+Build-Depends: dpkg-dev
 Standards-Version: 3.2.1
 
 Package: dictionary
diff --git a/deb/dictionary.install b/deb/dictionary.install
new file mode 100644
index 0000000..7468c82
--- /dev/null
+++ b/deb/dictionary.install
@@ -0,0 +1 @@
+dictionary.el connection.el link.el dictionary-init.el usr/share/emacs/site-lisp
diff --git a/deb/dirs b/deb/dirs
deleted file mode 100755
index 9d129ef..0000000
--- a/deb/dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/emacsen-common/packages/install
-usr/lib/emacsen-common/packages/remove
-usr/share/doc/dictionary
-usr/share/emacs/site-lisp
-
diff --git a/deb/rules b/deb/rules
index 1a67696..e20f052 100755
--- a/deb/rules
+++ b/deb/rules
@@ -1,53 +1,35 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
 
 package=dictionary
+DESTDIR=debian/$(package)
 
 build:
-	$(checkdir)
-	
+	dh_testdir
+
 	touch build
 
 clean:
-	$(checkdir)
-	-rm -f build
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
-
-binary-indep: checkroot build
-	$(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
-binary-arch: checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp
-	cd debian/tmp && install -d `cat ../dirs`
-
-	cp dictionary.el connection.el link.el dictionary-init.el \
-		debian/tmp/usr/share/emacs/site-lisp
-	cp debian/install.debian debian/tmp/usr/lib/emacsen-common/packages/install/dictionary
-	chmod 755 debian/tmp/usr/lib/emacsen-common/packages/install/dictionary
-	cp debian/remove.debian debian/tmp/usr/lib/emacsen-common/packages/remove/dictionary
-	chmod 755 debian/tmp/usr/lib/emacsen-common/packages/remove/dictionary
-	
-	debstd README 
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -f debian/rules
-endef
-
-binary: binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+	dh_testdir
+	dh_clean
+	rm -f build
+
+binary-arch: build
+	dh_testdir
+	dh_testroot
+
+	dh_install
+
+	install -m 755 -D debian/install.debian \
+                $(DESTDIR)/usr/lib/emacsen-common/packages/install/dictionary
+	install -m 755 -D debian/remove.debian \
+                $(DESTDIR)/usr/lib/emacsen-common/packages/remove/dictionary
+
+	dh_installdocs README
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-arch
+
+.PHONY: binary binary-arch clean