From cc351139d2f5c5ee501ed79d525e0ab75047dc35 Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Sat, 1 Aug 2009 20:25:35 -0600 Subject: [PATCH] Updates for new debian standards --- COPYING | 1 - README | 8 ++------ debian/changelog | 11 +++++++++++ debian/compat | 2 +- debian/control | 11 ++++++----- debian/postinst | 28 +--------------------------- debian/prerm | 21 +-------------------- debian/rules | 37 +++++++++++++------------------------ 8 files changed, 35 insertions(+), 84 deletions(-) diff --git a/COPYING b/COPYING index abff616..295f8fa 100644 --- a/COPYING +++ b/COPYING @@ -3,4 +3,3 @@ Inc, and it's primary author Craig Brozefsky. However, we would appreciate it if improvements and modifications were contributed back to the project so that everyone can share in them. - diff --git a/README b/README index a95da13..d84ce77 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -xptest - An "Extreme Programming" test framework for Comon Lisp +xptest - An "Extreme Programming" test framework for Common Lisp ====================================================================== xptest is a framework for building test cases, managing test data, and @@ -17,11 +17,7 @@ is just a pathetic clinging some romantic notion of the author. Installation ====================================================================== -xptest uses defsystem, so your lisp needs to support defsystem. You -may need to modify the XPTest.system file in order to tell defsystem -where the source files are stored, and/or set up the appropirate -logial path translations. Alternatively you can just load up the -files by hand. +This package uses ASDF to load its files. diff --git a/debian/changelog b/debian/changelog index 78c2129..29f72e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +cl-xptest (1.2.3-3) 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 Sat, 01 Aug 2009 20:23:42 -0600 + cl-xptest (1.2.3-2) unstable; urgency=low * debian/control: use build-depends, update standards-version diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index cb5958a..e585ed0 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,14 @@ Source: cl-xptest -Section: devel +Section: lisp Priority: optional Maintainer: Kevin M. Rosenberg -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/xptest.git + Package: cl-xptest Architecture: all -Depends: ${shlibs:Depends}, common-lisp-controller (>= 3.37) +Depends: common-lisp-controller (>= 3.37) Description: Extreme programming test suite for Common Lisp package xptest is the test suite written by onShore Development. It is toolkit for building test suites, very much inspired by the test diff --git a/debian/postinst b/debian/postinst index b751fc1..740e2fd 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,34 +1,11 @@ #! /bin/sh -# postinst script for cl-xptest -# -# see: dh_installdeb(1) - set -e -# package name according to lisp LISP_PKG=xptest -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# 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} + register-common-lisp-source ${LISP_PKG} ;; abort-upgrade|abort-remove|abort-deconfigure) ;; @@ -38,9 +15,6 @@ case "$1" in ;; esac -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - #DEBHELPER# exit 0 diff --git a/debian/prerm b/debian/prerm index c0ace70..8badc25 100755 --- a/debian/prerm +++ b/debian/prerm @@ -1,28 +1,12 @@ #! /bin/sh -# prerm script for cl-xptest -# -# see: dh_installdeb(1) - set -e -# package name according to lisp LISP_PKG=xptest -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - case "$1" in remove|upgrade|deconfigure) - /usr/sbin/unregister-common-lisp-source ${LISP_PKG} + unregister-common-lisp-source ${LISP_PKG} ;; failed-upgrade) ;; @@ -32,9 +16,6 @@ case "$1" in ;; esac -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - #DEBHELPER# exit 0 diff --git a/debian/rules b/debian/rules index de6a977..56593b2 100755 --- a/debian/rules +++ b/debian/rules @@ -6,15 +6,11 @@ debpkg := cl-xptest clc-source := usr/share/common-lisp/source clc-systems := usr/share/common-lisp/systems clc-xptest := $(clc-source)/$(pkg) - doc-dir := usr/share/doc/$(debpkg) - configure: configure-stamp configure-stamp: dh_testdir - # Add here commands to configure the package. - touch configure-stamp @@ -22,45 +18,38 @@ 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 - # Add here commands to clean up after the build process. rm -f debian/cl-xptest.postinst.* debian/cl-xptest.prerm.* dh_clean install: build dh_testdir dh_testroot - dh_clean -k - # Add here commands to install the package into debian/xptest. + dh_prep dh_installdirs $(clc-systems) $(clc-xptest) dh_install xptest.asd xptestsuite.lisp $(clc-xptest) dh_link $(clc-xptest)/xptest.asd $(clc-systems)/xptest.asd -# Build architecture-independent files here. binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installexamples -i xptest-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 - dh_testdir - dh_testroot - dh_installdocs - dh_installexamples xptest-example.lisp - 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 -- 2.34.1