debian, Makefile: Switch to Debhelper 8, and fix.

diff --git a/Makefile b/Makefile
index 8a8d8a1..a9d76c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 
 ## Compiling and linking.
 CC = gcc
-INCLUDES =
+INCLUDES = -I/usr/include/tcl
 CFLAGS = \
        -O2 -g -Wall -fPIC -funroll-loops -fomit-frame-pointer \
        $(INCLUDES)
@@ -69,7 +69,8 @@ distdir = $(PACKAGE)-$(VERSION)
 DISTFILES = \
        COPYING README Makefile $(SRCFILES) elite.tcl steele.cmdr \
        elite.def vec.def graph.def $(TCLSCRIPTS) auto-version \
-       debian/rules debian/control debian/copyright debian/changelog
+       debian/rules debian/control debian/copyright debian/changelog \
+       debian/compat debian/source/format
 distdir: $(DISTFILES)
        $(RM) -rf $(distdir)
        mkdir $(distdir) $(distdir)/debian

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8

diff --git a/debian/control b/debian/control
index e0a9117..d68ed01 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rocl
 Section: games
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
-Build-Depends: tcl, tcl-dev
+Build-Depends: tcl, tcl-dev, debhelper (>= 8)
 Standards-Version: 3.1.1
 
 Package: rocl

diff --git a/debian/rules b/debian/rules
index b837317..b650542 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,44 +1,9 @@
 #! /usr/bin/make -f
 
-export DH_COMPAT = 4
+%:; dh $@ -Bdebian/build --parallel
 
-build:
-       rm -f build
-       make INCLUDES=-I/usr/include/tcl prefix=/usr
-       touch build
+override_dh_auto_build:
+       make prefix=/usr
 
-clean:
-       dh_clean
-       make clean
-       rm -f build
-
-install: build
-       dh_clean
+override_dh_auto_install:
        make install prefix=/usr INST=`pwd`/debian/rocl
-
-binary-arch: install
-       dh_testdir -a
-       dh_testroot -a
-       dh_installdocs -a README
-       dh_compress -a
-       dh_strip -a
-       dh_shlibdeps -a
-       dh_gencontrol -a
-       dh_fixperms -a
-       dh_installdeb -a
-       dh_md5sums -a
-       dh_builddeb -a
-
-binary-indep:
-
-binary: binary-indep binary-arch
-
-source:
-       rm -rf =inst=
-       mkdir -p =inst=/=deb=
-       make dist INST==inst=/
-       cd =inst=/=deb=; tar xvfz ../*.tar.gz
-       d=`pwd`; cd ..; dpkg-source -i -b $$d/=inst=/=deb=/*
-       rm -rf =inst=
-
-.PHONY: binary binary-arch binary-indep clean install source

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0