Updates for new debian standards

diff --git a/debian/README.Debian b/debian/README.Debian
index 8d01e55cb8918bdd6c6022c8b2ff53f776cbc8af..c7de49ddc327e1fed0e729a197c350ec9022cfb6 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,8 @@
 Installing pipes into your CL implementation that uses
 Debian's Common Lisp Controller is easy. Just enter
 
 Installing pipes into your CL implementation that uses
 Debian's Common Lisp Controller is easy. Just enter
 

-(require 'pipes)
+(clc:require 'pipes)

 
 and a precompiled version of pipes should be loaded.
 
 and a precompiled version of pipes should be loaded.

+
+ -- Kevin M. Rosenberg <kmr@debian.org>, Sun,  2 Aug 2009 01:48:10 -0600

diff --git a/debian/changelog b/debian/changelog
index 68fd4260914958f3dfe81f896ca0dc38a86dc758..b113885d34482544f8a1c511bc49462161dc3204 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,20 @@
+cl-pipes (1.2.1-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 01:47:58 -0600
+

 cl-pipes (1.2.1-3) unstable; urgency=low
 
   * debian/rules: don't export DH_COMPAT
   * debian/control: Use build-depends, update standards-version
 
 cl-pipes (1.2.1-3) unstable; urgency=low
 
   * debian/rules: don't export DH_COMPAT
   * debian/control: Use build-depends, update standards-version
 

- -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 09 Sep 2007 19:31:00 -0600
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 02 Aug 2009 01:47:53 -0600

 
 cl-pipes (1.2.1-2) unstable; urgency=low
 
 
 cl-pipes (1.2.1-2) unstable; urgency=low
 

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 bca4bf29a8ecfcf90ee748a71898fe4af1f59a10..47c6f4e1c7d5500533a1062c667d3aff378b685a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
 Source: cl-pipes
 Source: cl-pipes

-Section: devel
+Section: lisp

 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>

-Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.7.2.2
+Build-Depends: debhelper (>= 7.0.0)
+Standards-Version: 3.8.2.0
+Homepage: http://files.b9.com/pipes/
+Vcs-Git: git://git.b9.com/pipes.git

 
 Package: cl-pipes
 Architecture: all
 
 Package: cl-pipes
 Architecture: all

-Depends: ${shlibs:Depends}, common-lisp-controller (>= 3.47)
+Depends:common-lisp-controller (>= 3.47)

 Description: Common Lisp library for pipes or streams
  This package has functions for manipulating pipes, also called streams.
  This package is adapted from an implementation in Peter Norvig's
 Description: Common Lisp library for pipes or streams
  This package has functions for manipulating pipes, also called streams.
  This package is adapted from an implementation in Peter Norvig's

diff --git a/debian/postinst b/debian/postinst
index 71d66b8c81ad281a4afdd59909a21f7c6efbc4f3..4fb87df052aa926cd1ae65eecae9f4bf5095780a 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,34 +1,11 @@
 #! /bin/sh
 #! /bin/sh

-# postinst script for cl-pipes
-#
-# see: dh_installdeb(1)
-

 set -e
 
 set -e
 

-# package name according to lisp

 LISP_PKG=pipes
 
 LISP_PKG=pipes
 

-# 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)
 case "$1" in
     configure)

-       /usr/sbin/register-common-lisp-source ${LISP_PKG}
+       register-common-lisp-source ${LISP_PKG}

        ;;
     abort-upgrade|abort-remove|abort-deconfigure)
        ;;
        ;;
     abort-upgrade|abort-remove|abort-deconfigure)
        ;;


@@ -38,9 +15,6 @@ case "$1" in
        ;;
 esac
 
        ;;
 esac
 

-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-

 #DEBHELPER#
 
 exit 0
 #DEBHELPER#
 
 exit 0

diff --git a/debian/prerm b/debian/prerm
index d6bed9e89cecddcc612c2e2e203a0c5de6b5c006..419ba0c7420db22fb5eb8ce3f3bad82128682b79 100755 (executable)
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,28 +1,11 @@
 #! /bin/sh
 #! /bin/sh

-# prerm script for cl-pipes
-#
-# see: dh_installdeb(1)
-

 set -e
 
 set -e
 

-# package name according to lisp

 LISP_PKG=pipes
 
 LISP_PKG=pipes
 

-# 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)
 case "$1" in
     remove|upgrade|deconfigure)

-       /usr/sbin/unregister-common-lisp-source ${LISP_PKG}
+       unregister-common-lisp-source ${LISP_PKG}

         ;;
     failed-upgrade)
         ;;
         ;;
     failed-upgrade)
         ;;


@@ -32,9 +15,6 @@ case "$1" in
     ;;
 esac
 
     ;;
 esac
 

-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-

 #DEBHELPER#
 
 exit 0
 #DEBHELPER#
 
 exit 0

diff --git a/debian/rules b/debian/rules
index f359b70a14c92e8421f0ced216a0637359f7b20a..e7b6043a8e8a40c017066f223288bdabb33b4ab1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,67 +6,44 @@ debpkg  := cl-pipes
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-pipes      := $(clc-source)/$(pkg)
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-pipes      := $(clc-source)/$(pkg)

-

 doc-dir                := usr/share/doc/$(debpkg)
 
 doc-dir                := usr/share/doc/$(debpkg)
 

-

 configure: configure-stamp
 configure-stamp:
        dh_testdir
 configure: configure-stamp
 configure-stamp:
        dh_testdir

-       # Add here commands to configure the package.
-

        touch configure-stamp
 
        touch configure-stamp
 

-

 build: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
 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
        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-pipes.postinst.* debian/cl-pipes.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot
        rm -f debian/cl-pipes.postinst.* debian/cl-pipes.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot

-       dh_clean -k
-       # Add here commands to install the package into debian/pipes.
+       dh_prep

        dh_installdirs $(clc-systems) $(clc-pipes) $(doc-dir)
        dh_install pipes.asd $(shell echo *.lisp) $(clc-pipes)
        dh_link $(clc-pipes)/pipes.asd $(clc-systems)/pipes.asd
 
        dh_installdirs $(clc-systems) $(clc-pipes) $(doc-dir)
        dh_install pipes.asd $(shell echo *.lisp) $(clc-pipes)
        dh_link $(clc-pipes)/pipes.asd $(clc-systems)/pipes.asd
 

-# Build architecture-independent files here.

 binary-indep: build install
        dh_testdir -i 
        dh_testroot -i
 binary-indep: build install
        dh_testdir -i 
        dh_testroot -i

-#      dh_installdebconf       

        dh_installdocs -i
        dh_installexamples -i pipes-example.lisp
        dh_installdocs -i
        dh_installexamples -i pipes-example.lisp

-#      dh_installmenu
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installman
-#      dh_installinfo
-#      dh_undocumented

        dh_installchangelogs -i
        dh_strip -i
        dh_compress -i
        dh_fixperms -i
        dh_installchangelogs -i
        dh_strip -i
        dh_compress -i
        dh_fixperms -i

-#      dh_makeshlibs

        dh_installdeb -i
        dh_installdeb -i

-#      dh_perl
-       dh_shlibdeps -i

        dh_gencontrol -i
        dh_md5sums -i
        dh_builddeb -i
        dh_gencontrol -i
        dh_md5sums -i
        dh_builddeb -i


@@ -76,4 +53,3 @@ binary-arch: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
 
 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..b4a45f7
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://files.b9.com/pipes/pipes-([\d\.]*)\.tar\.gz