Updates for new debian standards

diff --git a/README b/README
index 7fceecbc8c4992de83f21b23cba7773927f75095..136ca51ab300eeefdcc89a0655ed19c2d3576e11 100644 (file)
--- a/README
+++ b/README
@@ -6,5 +6,3 @@ on the 3 similar packages:
 
 XLUnit comes with its own test suite (tests.lisp) along with an
 example file (example.lisp).
 
 XLUnit comes with its own test suite (tests.lisp) along with an
 example file (example.lisp).

-
-

diff --git a/debian/changelog b/debian/changelog
index feeb0c20db49e8a0dcd52213fa69043315793430..dc1a5f6e0ff7ef49984c261108206a99a7119fc6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cl-xlunit (0.6.3-1) unstable; urgency=low
+
+  * New upstream
+  * debian/watch: New file
+  * debian/control: Require debhelper 7. Change to new lisp section.
+  Add Vcs-Git and Homepage fields.
+  * debian/rules: Update for DH7, architecture-independent build
+  * debian/{prerm,postrm}: Remove path from binary function
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 01 Aug 2009 20:13:35 -0600
+

 cl-xlunit (0.6.2-2) unstable; urgency=low
 
   * debian/control: Use build-depends, update standards-version
 cl-xlunit (0.6.2-2) unstable; urgency=low
 
   * debian/control: Use build-depends, update standards-version

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 d96451e383fb51b83779363d89c0f94b4b7eb363..a9601a6d3691a01c5358ea0b11433ff05bfebe6f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,18 @@
 Source: cl-xlunit
 Source: cl-xlunit

-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
+Vcs-Git: git://git.b9.com/xlunit.git
+Homepage: http://files.b9.com/xlunit/

 
 Package: cl-xlunit
 Architecture: all
 
 Package: cl-xlunit
 Architecture: all

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

 Description: Common Lisp eXtreme Lisp Unit Testing Package
  XLUnit provides a unit testing package for Common Lisp.
 Description: Common Lisp eXtreme Lisp Unit Testing Package
  XLUnit provides a unit testing package for Common Lisp.

- It it based on the XPTest package by OnShore development, but is
+ It is based on the XPTest package by OnShore development, but is

  rewritten to be closer in usage to the JUnit package. Also, it is
  designed to be used with significantly less overhead on the
  part of the test author compared to XPTest.
  rewritten to be closer in usage to the JUnit package. Also, it is
  designed to be used with significantly less overhead on the
  part of the test author compared to XPTest.

diff --git a/debian/postinst b/debian/postinst
index 32f3d9d7765a3636d48c97aceb41b4fefaacd741..8e4e7e3cb0755617b31b633d4ba60621b2a57197 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,27 +3,9 @@ set -e
 
 LISP_PKG=xlunit
 
 
 LISP_PKG=xlunit
 

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

 
     ;;
 
 
     ;;
 


@@ -37,9 +19,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 2603546e2af725bfb0e950b65f2d0f52b58b603c..d65de454ef4f63d8e3099f76ee3b021cd6434a1f 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -3,21 +3,9 @@ set -e
 
 LISP_PKG=xlunit
 
 
 LISP_PKG=xlunit
 

-# 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 23f8e04fbef9f051a7b4904d4cb34a21f2d63ce2..40bb3802951cdc584fea6e4637dff3311e696160 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,14 +6,11 @@ debpkg  := cl-xlunit
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-xlunit     := $(clc-source)/$(pkg)
 clc-source     := usr/share/common-lisp/source
 clc-systems    := usr/share/common-lisp/systems
 clc-xlunit     := $(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
 
 


@@ -21,58 +18,38 @@ build: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
 
 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-xlunit.postinst.* debian/cl-xlunit.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot
        rm -f debian/cl-xlunit.postinst.* debian/cl-xlunit.prerm.*
        dh_clean
 
 install: build
        dh_testdir
        dh_testroot

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

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

-# Build architecture-independent files here.

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

+       dh_testdir -i
+       dh_testroot -i
+       dh_installdocs -i 
+       dh_installexamples -i example.lisp
+       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 
-       dh_installexamples example.lisp
-#      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..8e6b40d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://files.b9.com/xlunit/xlunit-(\d+.*)\.tar\.gz