Updates for new debian standards

diff --git a/debian/changelog b/debian/changelog
index 4b41975da8a763532192812e6003f38aacb5b52a..e0f24c53be6430d2261ad206b56506079952114f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cl-puri (1.5.1-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:36:28 -0600
+

 cl-puri (1.5.1-1) unstable; urgency=low
 
   * New upstream
 cl-puri (1.5.1-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 ec21f0a2e083b2fb453bc25b524b11c8820a2fbf..68b29475cd092428ad98ec804b8feed3db341d9f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
 Source: cl-puri
 Source: cl-puri

-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/puri/
+Vcs-Git: git://git.b9.com/puri/

 
 Package: cl-puri
 Architecture: all
 
 Package: cl-puri
 Architecture: all

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

 Recommends: cl-ptester
 Description: Common Lisp Portable URI Library
  This is portable Universal Resource Identifier (RFC 2396)
 Recommends: cl-ptester
 Description: Common Lisp Portable URI Library
  This is portable Universal Resource Identifier (RFC 2396)

diff --git a/debian/copyright b/debian/copyright
index 85917e761424a029a8a3a3b4fb5166c68a04cb1d..4a53ce128be2350446e74db9143a10ed07edc8b9 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,7 +22,7 @@ merchantability or fitness for a particular purpose.  See the GNU
 Lesser General Public License for more details.
 
 The GNU Lessor General Public License can be found in your Debian file
 Lesser General Public License for more details.
 
 The GNU Lessor General Public License can be found in your Debian file

-system in /usr/share/common-licenses/LGPL.
+system in /usr/share/common-licenses/LGPL-3.

 
 Preamble to the Gnu Lesser General Public License
 -------------------------------------------------
 
 Preamble to the Gnu Lesser General Public License
 -------------------------------------------------

diff --git a/debian/postinst b/debian/postinst
index c53065ef3c349d403d78aef27cf14e471503468b..b031648f99e42fbcba7b8df4a9435266ad072a17 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,24 +3,6 @@ set -e
 
 LISP_PKG=puri
 
 
 LISP_PKG=puri
 

-# 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}
 case "$1" in
     configure)
        /usr/sbin/register-common-lisp-source ${LISP_PKG}


@@ -33,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 3e1830239e24c802f290a0f634812168eceb75f4..b8fbe63f2d86583e7579ae81acbb25b5b2747444 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -3,21 +3,9 @@ set -e
 
 LISP_PKG=puri
 
 
 LISP_PKG=puri
 

-# 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)
         ;;


@@ -27,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 165756b0710c03d639911bdc8ade71f10003dc54..b05fc0fa06e9278c09f93de311136c995446bfbc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,64 +3,52 @@
 pkg    := puri
 debpkg  := cl-puri
 
 pkg    := puri
 debpkg  := cl-puri
 

-

 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-puri       := $(clc-source)/$(pkg)
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-puri       := $(clc-source)/$(pkg)

-

 doc-dir                := usr/share/doc/$(debpkg)
 
 
 configure: configure-stamp
 configure-stamp:
        dh_testdir
 doc-dir                := usr/share/doc/$(debpkg)
 
 
 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-puri.postinst.* debian/cl-puri.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot
        rm -f debian/cl-puri.postinst.* debian/cl-puri.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot

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

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

-# Build architecture-independent files here.

 binary-indep: build install
 binary-indep: build install

+       dh_testdir -i
+       dh_testroot -i
+       dh_installdocs -i README uri.html
+       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
 binary-arch: build install

-       dh_testdir
-       dh_testroot
-       dh_installdocs README uri.html
-       dh_installchangelogs
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb

 
 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/upload.sh b/debian/upload.sh
index 20ad156bd23f38d411e4754efac7594aad3082e8..75dd2147500331857e77d91cebde0427ac7b7d81 100755 (executable)
--- a/debian/upload.sh
+++ b/debian/upload.sh
@@ -1,3 +1,3 @@
 #!/bin/bash -e
 
 #!/bin/bash -e
 

-dup puri -Uftp.b9.com -D/home/ftp/puri -C"(umask 022; /home/kevin/bin/remove-old-versions puri latest)" -su $*
+dup puri -Ufiles.b9.com -D/home/ftp/puri -C"(umask 022; /home/kevin/bin/remove-old-versions puri latest)" -su $*

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