Convert to dh-lisp; add Vcs-Browser

diff --git a/debian/changelog b/debian/changelog
index 5dcbdd5a7a64fbacd5b390163c2fe28f5e45a645..6e028477ef91a56287a233893cb9e28fadc67853 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-uffi (1.6.2-3) unstable; urgency=low
+
+  * Build with debhelper extension dh-lisp
+  * control: Add Vcs-Browser field. Fix Depends field.
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 03 Aug 2009 19:09:46 -0600
+
 cl-uffi (1.6.2-2) unstable; urgency=low
 
   * debian/control: Improve description

diff --git a/debian/cl-uffi.doc-base b/debian/cl-uffi.doc-base
index 3e7cad5882f369500ff74003eed58cc59e192ce6..7fd3d70a37bee6f0f2edfd95c03bb94765914448 100644 (file)
--- a/debian/cl-uffi.doc-base
+++ b/debian/cl-uffi.doc-base
@@ -8,7 +8,7 @@ Abstract: This manual describes the
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/cl-uffi/cl-uffi.pdf.gz
+Files: /usr/share/doc/cl-uffi/uffi.pdf.gz
 
 Format: HTML
 Index: /usr/share/doc/cl-uffi/html/index.html

diff --git a/debian/control b/debian/control
index 7604ac8042b37f4d0bed184feb3ca972eb547715..466431d53e6b8c9a0ddaa0a8c65d1422ca14747b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: cl-uffi
 Section: lisp
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
-Build-Depends: zlib1g-dev,debhelper (>= 7.0.0)
+Build-Depends: dh-lisp, zlib1g-dev,debhelper (>= 7.0.0)
 Standards-Version: 3.8.2.0
 Homepage: http://uffi.b9.com/
 Vcs-Git: git://git.b9.com/uffi.git
 
 Package: cl-uffi
 Architecture: all
-Depends: common-lisp-controller (>= 3.37)
+Depends: ${misc:Depends}
 Recommends: cl-uffi-tests
 Description: Universal Foreign Function Library for Common Lisp
  UFFI provides a universal foreign function interface (FFI) for 
@@ -19,7 +19,7 @@ Description: Universal Foreign Function Library for Common Lisp
 
 Package: cl-uffi-tests
 Architecture: any
-Depends: ${shlibs:Depends}, common-lisp-controller (>= 3.37), cl-uffi, zlib1g-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, cl-uffi, zlib1g-dev
 Description: Regression tests for UFFI Common Lisp Library
  This is a test of regression tests for Debian cl-uffi package.
  UFFI is a universal foreign function interface for Common Lisp

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index 1ed24e5..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-set -e
-
-LISP_PKG=uffi
-
-case "$1" in
-    configure)
-       register-common-lisp-source $LISP_PKG
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-

diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644 (file)
index 96cfd3f..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-set -e
-
-LISP_PKG=uffi
-
-case "$1" in
-    remove|upgrade|deconfigure)
-       unregister-common-lisp-source $LISP_PKG
-        ;;
-    failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-

diff --git a/debian/rules b/debian/rules
index 8f8867f7df476983e2f68951d0a9a325f145a1f3..c77c43bf29ef3fc8e6352c80a62c289d8f8b8313 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,18 +9,12 @@ clc-source    := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-files      := $(clc-source)/$(pkg)
 clc-tests      := $(clc-source)/$(pkg-tests)
-doc-dir                := usr/share/doc/$(debpkg)
 lib-dir                := usr/lib/uffi
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       touch configure-stamp
-
 
 build: build-stamp
 
-build-stamp: configure-stamp 
+build-stamp:
        dh_testdir
        (cd tests; make)
        touch build-stamp
@@ -28,10 +22,10 @@ build-stamp: configure-stamp
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp
+       rm -f build-stamp
        $(MAKE) clean
        (cd tests; make clean)
-       rm -f debian/$(debpkg).postinst.* debian/$(debpkg).prerm.*
+       rm -rf doc/html
        rm -f doc/cl-uffi.pdf.gz
        dh_clean
 
@@ -40,36 +34,25 @@ install: build
        dh_testroot
        dh_prep
        dh_installdirs --all $(clc-systems) $(clc-source) 
-       dh_installdirs -p $(debpkg) $(doc-dir) $(clc-files)/src
+       dh_installdirs -p $(debpkg) $(clc-files)/src
        dh_install $(pkg).asd $(clc-files)
        dh_install "src/*.lisp" $(clc-files)/src
-       dh_link $(clc-files)/$(pkg).asd $(clc-systems)/$(pkg).asd
 
        rm -rf doc/html
        (cd doc; tar xzf html.tar.gz; cd ..)
-       dh_install doc/html $(doc-dir)
-       rm -rf doc/html
-       cp doc/uffi.pdf doc/cl-uffi.pdf
-       rm -f doc/cl-uffi.pdf.gz # ensure file not present before making gz
-       gzip -9 doc/cl-uffi.pdf
-       dh_install doc/cl-uffi.pdf.gz $(doc-dir)
 
        dh_installdirs -p $(debpkg-tests) $(clc-tests)/tests $(lib-dir)
        dh_install -p $(debpkg-tests) $(pkg-tests).asd $(clc-tests)
        dh_install -p $(debpkg-tests) tests/*.lisp tests/*.c $(clc-tests)/tests
        dh_install -p $(debpkg-tests) tests/*.so $(lib-dir)
-       dh_link -p $(debpkg-tests) $(clc-tests)/$(pkg-tests).asd $(clc-systems)/$(pkg-tests).asd
 
 binary-indep: build install
        dh_testdir -i
        dh_testroot -i
-       dh_installdocs -i
+       dh_installdocs -i doc/uffi.pdf doc/html
        dh_installexamples -i examples/*.lisp
-       dh_installmenu -i
-       dh_installcron -i
-       dh_installinfo -i
-       dh_installchangelogs ChangeLog -i
-       dh_link -i
+       dh_installchangelogs -i
+       dh_lisp -i
        dh_compress -i
        dh_fixperms -i
        dh_installdeb -i
@@ -81,7 +64,8 @@ binary-arch: build install
        dh_testdir -a
        dh_testroot -a
        dh_installdocs -a
-       dh_installchangelogs ChangeLog -a
+       dh_installchangelogs -a
+       dh_lisp -a
        dh_strip -a
        dh_link -a
        dh_compress -a
@@ -94,5 +78,6 @@ binary-arch: build install
        dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
 
+
+.PHONY: build clean binary-indep binary-arch binary install