Updates for new debian standards

diff --git a/debian/changelog b/debian/changelog
index 31952e56597d3f689a858bef5806ed72815f11ea..ae71c2633cb776d98e9153eab6adcfb7d6cd7a68 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cl-rlc (0.1.3-2) 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 01:11:03 -0600
+
 cl-rlc (0.1.3-1) unstable; urgency=low
 
   * New upstream

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 26ad91a12230ec60d1be2ebf57e352537d823437..0dbdac1a65cec2e065a1a0f5c42f5f817f1e68b7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,16 @@
 Source: cl-rlc
-Section: devel
+Section: lisp
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends: debhelper (>> 4.0.0)
-Standards-Version: 3.7.2.2
+Standards-Version: 3.8.2.0
+Homepage: http://files.b9.com/rlc/
+Vcs-Git: git://git.b9.com/rlc.git
 
 Package: cl-rlc
 Architecture: all
-Depends: ${shlibs:Depends}, common-lisp-controller (>= 3.37), cl-kmrcl, xgraph
+Depends: common-lisp-controller (>= 3.37), cl-kmrcl, xgraph
 Description: Common Lisp RLC Circuit Simulator
  cl-rlc provides a simulator for RLC (resistance, inductance, capacitance)
  circuits. It is written in Common Lisp and uses the xgraph package for
  plotting.
-
-
-

diff --git a/debian/postinst b/debian/postinst
index a72bfd2e43e687dfac08d69425e69fc01bc78027..a56da7b0d12ec38b2efd14f742679ab1f48f94f7 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,32 +3,12 @@ set -e
 
 LISP_PKG=rlc
 
-# 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)
-
     ;;
 
     *)
@@ -37,9 +17,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/prerm b/debian/prerm
index 635c24f422c08fcf58de155e47fc7cb6cef46815..b7a8dc7b5d2b8c6e92f1831da380fa1915f23b00 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,24 +1,11 @@
 #! /bin/sh
 set -e
 
-# package name according to lisp
 LISP_PKG=rlc
 
-# 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 f2c737ce84180c536af2a64a97751285f8307349..87d88cf9dc89490222133549bbdd91a8b3896d79 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,15 @@
 pkg    := rlc
 debpkg  := cl-rlc
 
-
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-irc                := $(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
 
 
@@ -22,57 +19,38 @@ 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-rlc.postinst.* debian/cl-rlc.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
-       # Add here commands to install the package into debian/rlc.
+       dh_prep
        dh_installdirs $(clc-systems) $(clc-irc) $(doc-dir)
        dh_install rlc.asd $(shell echo *.lisp) $(clc-irc)
        dh_link $(clc-irc)/rlc.asd $(clc-systems)/rlc.asd
 
-# Build architecture-independent files here.
 binary-indep: build install
+       dh_testdir -i
+       dh_testroot -i
+       dh_installdocs -i README 
+       dh_installexamples -i
+       dh_installchangelogs -i
+       dh_strip -i
+       dh_compress -i
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
 
-# Build architecture-dependent files here.
 binary-arch: build install
-       dh_testdir
-       dh_testroot
-#      dh_installdebconf       
-       dh_installdocs README 
-       dh_installexamples
-#      dh_installmenu
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installman
-#      dh_installinfo
-#      dh_undocumented
-       dh_installchangelogs 
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_makeshlibs
-       dh_installdeb
-#      dh_perl
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..6648c4a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://files.b9.com/rlc/rlc-([\d\.]*)\.tar\.gz