Updates for new debian standards

diff --git a/debian/changelog b/debian/changelog
index bc9589828e4d3041ef58b6e210deb8a7dcf977fd..c7f5640468f315b0a34fdabd69787d2b45cea228 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cl-modlisp (0.6-4) unstable; urgency=low
+
+  * debian/watch: New file
+  * debian/control: Require debhelper 7. Change to new lisp section.
+  Add Vcs-Git and Homepage fields.
+  * debian/compat: Update to version 7
+  * debian/rules: Update for debhelper 7, architecture-independent build
+  * debian/{prerm,postrm}: Remove path from binary function
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 02 Aug 2009 02:10:35 -0600
+
 cl-modlisp (0.6-3) unstable; urgency=low
 
   * Depend on libapache2-mod-lisp (closes:466317)

diff --git a/debian/compat b/debian/compat
index b8626c4cff2849624fb67f87cd0ad72b163671ad..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index 024d7afaa9ba5a2f872fbe25d5b1c604b77072f0..e704619898ced1173c62a57cf713a1597b113713 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,16 @@
 Source: cl-modlisp
-Section: devel
+Section: lisp
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
-Build-Depends: debhelper (>> 4.0.0)
-Standards-Version: 3.7.3.0
+Build-Depends: debhelper (>> 7.0.0)
+Standards-Version: 3.8.2.0
+Vcs-Git: git://git.b9.com/cl-modlisp.git
 
 Package: cl-modlisp
 Architecture: all
-Depends: ${shlibs:Depends}, common-lisp-controller (>= 3.37),libapache2-mod-lisp,cl-kmrcl
+Depends: common-lisp-controller (>= 3.37),libapache2-mod-lisp,cl-kmrcl
 Description: Common Lisp interface to the Apache mod-lisp module
- cl-modlisp provides a Common Lisp interface to the mod-lisp Apache module.
+ cl-modlisp provides a Common Lisp interface to the mod_lisp Apache module.
+ The mod_lisp is a low-level Apache interface. This package provides a
+ higher level layer on top of mod_lisp.
  The package has support for CMUCL, SBCL, CLISP, AllegroCL, and Lispworks.

diff --git a/debian/postinst b/debian/postinst
index ac7a528fda18feb83926afa3015e573ec75abba1..e819b0caecc17503d3b049490617f634bf690e69 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,43 +3,18 @@ set -e
 
 LISP_PKG=modlisp
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
 case "$1" in
     configure)
-       /usr/sbin/register-common-lisp-source ${LISP_PKG}
-
-    ;;
-
+        register-common-lisp-source ${LISP_PKG}
+        ;;
     abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
+        ;;
     *)
         echo "postinst called with unknown argument \`$1'" >&2
         exit 1
-    ;;
+        ;;
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0

diff --git a/debian/prerm b/debian/prerm
index b23cb37ef381589a4abbb444bce1314e6b0ed627..bbe8219e957abf18d774fa7828f8dc2eb2443ef2 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,24 +1,11 @@
 #! /bin/sh
 set -e
 
-# package name according to lisp
 LISP_PKG=modlisp
 
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
 case "$1" in
     remove|upgrade|deconfigure)
-       /usr/sbin/unregister-common-lisp-source ${LISP_PKG}
+       unregister-common-lisp-source ${LISP_PKG}
         ;;
     failed-upgrade)
         ;;
@@ -28,9 +15,6 @@ case "$1" in
     ;;
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0

diff --git a/debian/rules b/debian/rules
index 3c54a642c348512f251d46fb7a86908506c60d91..de6f05f931594ca3cfb75c0d9a198bc3be757f45 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,60 +3,50 @@
 pkg    := modlisp
 debpkg  := cl-modlisp
 
-
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-modlisp    := $(clc-source)/$(pkg)
-
 doc-dir                := usr/share/doc/$(debpkg)
 
-
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       # Add here commands to configure the package.
        touch configure-stamp
 
-
 build: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
-       # Add here commands to compile the package.
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-       # Add here commands to clean up after the build process.
        rm -f debian/cl-modlisp.postinst.* debian/cl-modlisp.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
-       # Add here commands to install the package into debian/modlisp.
+       dh_prep
        dh_installdirs $(clc-systems) $(clc-modlisp) 
        dh_install modlisp.asd $(shell echo *.lisp) $(clc-modlisp)
        dh_link $(clc-modlisp)/modlisp.asd $(clc-systems)/modlisp.asd
 
 binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs doc/readme.html
-       dh_installexamples 
-       dh_installchangelogs ChangeLog
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
+       dh_testdir -i
+       dh_testroot -i
+       dh_installdocs -i doc/readme.html
+       dh_installexamples -i
+       dh_installchangelogs -i ChangeLog
+       dh_strip -i
+       dh_compress -i
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
 
 binary-arch: build install
 

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..26fcfd3
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1 @@
+# There is no upstream homepage. Use the Vcs-Git for upstream files.