debian/: Overhaul and fix build arrangements.

  * Switch to Debhelper 9.

  * Don't leak `.elc' files into the package.

  * Set correct Build-Depends.  No idea why mLib is mentioned there.

  * Hack the packaging so that it doesn't actually need Emacs at build
    time.

diff --git a/Makefile.am b/Makefile.am
index 7dfee7c..e0fd1dc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,8 +104,9 @@ dist-hook::
 ### Debian.
 
 EXTRA_DIST             += debian/control debian/copyright
-EXTRA_DIST             += debian/changelog debian/rules
+EXTRA_DIST             += debian/changelog debian/rules debian/compat
 
+EXTRA_DIST             += debian/skel.install
 EXTRA_DIST             += debian/skel.emacsen-install
 EXTRA_DIST             += debian/skel.emacsen-remove
 EXTRA_DIST             += debian/skel.emacsen-startup

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

diff --git a/debian/control b/debian/control
index 9e5c6b3..f8da0c3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: skel
 Section: editors
 Priority: extra
-Build-Depends: mlib-dev (>= 2.0.2)
+Build-Depends: debhelper (>= 9)
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Standards-Version: 3.1.1
 

diff --git a/debian/rules b/debian/rules
index cf9dfa5..9e93e3b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,49 +1,10 @@
 #! /usr/bin/make -f
+%:; dh $@ --parallel -Bdebian/build
 
-export DH_COMPAT = 4
+override_dh_auto_configure:
+       dh_auto_configure -- --with-lispdir=/usr/share/emacs/site-lisp
 
-build:
-       rm -rf build deb-build
-       mkdir deb-build
-       cd deb-build; ../configure --prefix=/usr
-       make -C deb-build
-       touch build
+override_dh_auto_build:
+       make -Cdebian/build skel.el
 
-clean:
-       dh_clean
-       rm -rf deb-build build
-
-install: build
-       dh_clean
-       make -C deb-build install DESTDIR=`pwd`/debian/skel
-       mkdir debian/skel/usr/share/emacs/site-lisp/skel
-       mv debian/skel/usr/share/emacs/site-lisp/skel.el \
-               debian/skel/usr/share/emacs/site-lisp/skel
-       rm debian/skel/usr/share/emacs/site-lisp/*.el
-       mkdir -p debian/skel/etc/skel
-
-binary-indep: install
-       dh_testdir -i
-       dh_testroot -i
-       dh_compress -i
-       dh_installdocs -i
-       dh_gencontrol -i
-       dh_installemacsen -i
-       dh_fixperms -i
-       dh_installdeb -i
-       dh_md5sums -i
-       dh_builddeb -i
-
-binary-arch:
-
-binary: binary-indep binary-arch
-
-source:
-       rm -rf deb-build/*.tar.gz deb-build/=deb=
-       make -C deb-build dist
-       mkdir deb-build/=deb=
-       cd deb-build/=deb=; tar xvfz ../*.tar.gz
-       d=`pwd`; cd ..; dpkg-source -i -b $$d/deb-build/=deb=/*
-       rm -rf deb-build/=deb=
-
-.PHONY: binary binary-arch binary-indep clean install source
+override_dh_auto_install:

diff --git a/debian/skel.install b/debian/skel.install
new file mode 100644 (file)
index 0000000..7a7942a
--- /dev/null
+++ b/debian/skel.install
@@ -0,0 +1,6 @@
+debian/build/skel.el           /usr/share/emacs/site-lisp/skel
+
+skeleton                       /usr/share/skel
+skeleton.*                     /usr/share/skel
+skelrc                         /usr/share/skel
+skelrc.*                       /usr/share/skel