Various Debian fixes.

diff --git a/debian/control b/debian/control
index 2778c153e24826688538c103e1a017fd3f53eb89..cbe7595f3e6227ecc0216d485194b7d0fc6cebf5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: cfd
 Section: devel
 Priority: extra
 Source: cfd
 Section: devel
 Priority: extra

-Maintainer : Mark Wooding
+Maintainer: Mark Wooding <mdw@nsict.org>

 Standards-Version: 3.1.1
 
 Package: cfd
 Standards-Version: 3.1.1
 
 Package: cfd

diff --git a/debian/rules b/debian/rules
index 99b8a032b88b7878dd8e1a31785aab7eca1a6b18..f005c8159dd522fba07edd62e3c72d39fde35d60 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,10 @@ build:
        make -C deb-build
        touch build
 
        make -C deb-build
        touch build
 

+clean:
+       dh_clean
+       rm -rf deb-build build
+

 install: build
        dh_clean
        make -C deb-build install DESTDIR=`pwd`/debian/tmp
 install: build
        dh_clean
        make -C deb-build install DESTDIR=`pwd`/debian/tmp


@@ -29,10 +33,11 @@ binary: binary-indep binary-arch
 
 source:
        rm -rf deb-build/*.tar.gz deb-build/=deb=
 
 source:
        rm -rf deb-build/*.tar.gz deb-build/=deb=

-       make -C deb-build dist
+       make -C deb-build dist PACKAGE=cfd

        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 
        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 

+EOF