Updates for new debian standards

diff --git a/debian/changelog b/debian/changelog
index 425123d167c241c5269adcb58e93b0716e96b7a8..964532780b2abe66665c05f317e3b4d18f1fdaef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cl-lml2 (1.6.6-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:15:56 -0600
+

 cl-lml2 (1.6.6-1) unstable; urgency=low
 
   * New upstream
 cl-lml2 (1.6.6-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 36cd1833e07a81af1fc64f4fa4491cb30132c431..eca31830ccaba747a031d0d2f20b0bd9d622a074 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,18 @@
 Source: cl-lml2
 Source: cl-lml2

-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.3.0
+Build-Depends: debhelper (>> 7.0.0)
+Standards-Version: 3.8.2.0
+Homepage: http://lml2.b9.com/
+Vcs-Git: git://git.b9.com/lml2.git

 
 Package: cl-lml2
 Architecture: all
 
 Package: cl-lml2
 Architecture: all

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

 Description: Lisp Markup Language
  LML2 provides a markup language for generation XHTML web pages.
  .
 Description: Lisp Markup Language
  LML2 provides a markup language for generation XHTML web pages.
  .

- The usage of LML2 is incompatible the the original LML version. However,
+ The usage of LML2 is incompatible with the original LML version. However,

  the two versions may be used along side each other.
 
  the two versions may be used along side each other.
 

diff --git a/debian/postinst b/debian/postinst
index a6ea28d2cc6c0092fccc70dd163869536f8c4b70..53dea05a3fa6656caf085a809b988ca411b04a26 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,43 +3,18 @@ set -e
 
 LISP_PKG=lml2
 
 
 LISP_PKG=lml2
 

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

-    ;;
+        ;;

 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 4abbfb299f7bf04217a27ea07748e3b7cf73ca15..fad123a142156062f9eec241276d6eaec50172c7 100755 (executable)
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,36 +1,20 @@
 #! /bin/sh
 set -e
 
 #! /bin/sh
 set -e
 

-# package name according to lisp

 LISP_PKG=lml2
 
 LISP_PKG=lml2
 

-# 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)
         ;;
     *)
         echo "prerm called with unknown argument \`$1'" >&2
         exit 1
         ;;
     failed-upgrade)
         ;;
     *)
         echo "prerm called with unknown argument \`$1'" >&2
         exit 1

-    ;;
+        ;;

 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 a73b2651a0fff7956c0b64a04afff8c9b2744c75..0efeaeab3ba5b64e30ba5e9e876263815bf887a4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,36 +6,30 @@ debpkg  := cl-lml2
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-lml2       := $(clc-source)/$(pkg)
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-lml2       := $(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-lml2.postinst.* debian/cl-lml2.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot
        rm -f debian/cl-lml2.postinst.* debian/cl-lml2.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot

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

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


@@ -43,35 +37,19 @@ install: build
 
 binary-arch: build install
 
 
 binary-arch: build install
 

-# Build architecture-independent files here.

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

-       dh_testdir
-       dh_testroot
-#      dh_installdebconf       
-       dh_installdocs doc/readme.html
-       dh_installexamples doc/Makefile doc/make.lisp $(shell echo doc/*.lml)
-#      dh_installmenu
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installman
-#      dh_installinfo
-#      dh_undocumented
-       dh_installchangelogs ChangeLog
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_makeshlibs
-       dh_installdeb
-#      dh_perl
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       dh_testdir -i
+       dh_testroot -i
+       dh_installdocs -i doc/readme.html
+       dh_installexamples -i doc/Makefile doc/make.lisp $(shell echo doc/*.lml)
+       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: binary-indep binary-arch
 .PHONY: build clean binary-arch binary-indep binary install configure
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-arch binary-indep binary install configure

-

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