Updates for new debian standards

diff --git a/debian/changelog b/debian/changelog
index 38c21368072a737495035d1c86806a0d408debe8..997c8e09a17a2164d33ca79a505f5b7d97aba09d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cl-photo (0.14-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 02:03:20 -0600
+

 cl-photo (0.14-1) unstable; urgency=low
 
   * Set near-point correctly when at or above hyperfocal
 cl-photo (0.14-1) unstable; urgency=low
 
   * Set near-point correctly when at or above hyperfocal

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 d6335fd3536f3933035fc6db2dfa183e26cf5536..138bfcfaf61d3fa67d9b54396a1a7edc3bb8564e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,16 @@
 Source: cl-photo
 Source: cl-photo

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

 
 Package: cl-photo
 Architecture: all
 
 Package: cl-photo
 Architecture: all

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

 Description: photographic calculator in Common Lisp
 Description: photographic calculator in Common Lisp

- cl-photo provides multiple photographic formulas for photography. 
- Currently, field of view and depth of field are well supported.
-
-
+ cl-photo provides multiple photographic formulas for to assist
+ with taking photographs. A significant camera database is included.
+ Field of view and depth of field are well supported.

diff --git a/debian/postinst b/debian/postinst
index b7977ba095145597aa232b1c62390335807db7e1..e6dd579476c5a78a238ab89526610c5c3ad9b203 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,43 +3,18 @@ set -e
 
 LISP_PKG=cl-photo
 
 
 LISP_PKG=cl-photo
 

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

-
-    ;;
-
+        ;;

     *)
         echo "postinst called with unknown argument \`$1'" >&2
         exit 1
     ;;
 esac
 
     *)
         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
 #DEBHELPER#
 
 exit 0

diff --git a/debian/prerm b/debian/prerm
index 8d4e4ed81b05a02226ee2bc96df933eebe205de5..40efe190ab62371b29389577d5a0e6e2a5d00302 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,24 +1,11 @@
 #! /bin/sh
 set -e
 
 #! /bin/sh
 set -e
 

-# package name according to lisp

 LISP_PKG=cl-photo
 
 LISP_PKG=cl-photo
 

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


@@ -28,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 2efdedc99becfa15186746b31459b4b955805bc2..c3eea0fb8ef662daa64864eec1402c6d4f3f50cf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,71 +6,48 @@ debpkg  := cl-photo
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-photo      := $(clc-source)/$(pkg)
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-photo      := $(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-photo.postinst.* debian/cl-photo.prerm.*
        rm -f debian/cl-photo.postinst.* debian/cl-photo.prerm.*

-       dh_clean
+       dh_prep

 
 install: build
        dh_testdir
        dh_testroot
 
 install: build
        dh_testdir
        dh_testroot

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

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

-# Build architecture-independent files here.

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

+       dh_testdir -i
+       dh_testroot -i
+       dh_installdocs -i doc/readme.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_installdebconf       
-       dh_installdocs doc/readme.html
-#      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
 
 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..54f7a08
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://files.b9.com/cl-photo/cl-photo-([\d\.]*)\.tar\.gz