From: MedTermServer Date: Tue, 16 Feb 2010 03:12:05 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.b9.com/home/gitpub/kmrcl X-Git-Tag: v1.101~4 X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=commitdiff_plain;h=7397fb7597f3fe9c658e6fb1ad67c805029dd073;hp=e54afedd9e96a83521d3eb023e1a22051f387ded Merge branch 'master' of ssh://git.b9.com/home/gitpub/kmrcl --- diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/ChangeLog b/ChangeLog index e07a5f9..2a8031d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +20 Aug 2009 Kevin Rosenberg + * Version 1.100 + * lists.lisp: For ECL, exclude function that is incompatible with ECL + (Thanks to Daniel Herring) + +26 Jul 2009 Kevin Rosenberg + * Version 1.99 + * impl.lisp: Update SBCL internal call for probe-directory + (Thanks to Cyrus Harmon) + 28 Jan 2008 Kevin Rosenberg * Version 1.98 * {datetime,strings,tests}.lisp: Add remove-char-string diff --git a/color.lisp b/color.lisp index b18bd2d..52d5b46 100644 --- a/color.lisp +++ b/color.lisp @@ -143,14 +143,10 @@ (setq s (/ delta max))) (when (plusp delta) - (setq h (cond - ((= max r) - (nth-value 0 (/ (- g b) delta))) - ((= max g) - (nth-value 0 (+ 2 (/ (- b r) delta)))) - (t - (nth-value 0 (+ 4 (/ (- r g) delta)))))) - (setq h (the fixnum (* 60 h))) + (setq h (* 60 (cond + ((= max r) (/ (- g b) delta)) + ((= max g) (+ 2 (/ (- b r) delta))) + (t (+ 4 (/ (- r g) delta)))))) (when (minusp h) (incf h 360))) @@ -171,18 +167,18 @@ (type (or null fixnum) h)) (when (plusp max) - (setq s (truncate (the fixnum (* 255 delta)) max))) + (setq s (round (the fixnum (* 255 delta)) max))) (when (plusp delta) (setq h (cond ((= max r) - (truncate (the fixnum (* 60 (the fixnum (- g b)))) delta)) + (round (the fixnum (* 60 (the fixnum (- g b)))) delta)) ((= max g) (the fixnum - (+ 120 (truncate (the fixnum (* 60 (the fixnum (- b r)))) delta)))) + (+ 120 (round (the fixnum (* 60 (the fixnum (- b r)))) delta)))) (t (the fixnum - (+ 240 (truncate (the fixnum (* 60 (the fixnum (- r g)))) delta)))))) + (+ 240 (round (the fixnum (* 60 (the fixnum (- r g)))) delta)))))) (when (minusp h) (incf h 360))) diff --git a/debian/changelog b/debian/changelog index f9ef78f..bf103bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,38 @@ +cl-kmrcl (1.100-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Thu, 20 Aug 2009 10:48:16 -0600 + +cl-kmrcl (1.99-4) unstable; urgency=low + + * Build with debhelper extension dh-lisp + * control: Add Vcs-Browser field. Fix Depends field. + + -- Kevin M. Rosenberg Mon, 03 Aug 2009 14:12:47 -0600 + +cl-kmrcl (1.99-3) unstable; urgency=low + + * debian/control: Added Homepage and Vcs-Git fields + * debian/watch: new file + + -- Kevin M. Rosenberg Sun, 02 Aug 2009 03:23:22 -0600 + +cl-kmrcl (1.99-2) unstable; urgency=low + + * Change to debhelper 7 compatibility + + -- Kevin M. Rosenberg Mon, 27 Jul 2009 15:33:13 -0600 + +cl-kmrcl (1.99-1) unstable; urgency=low + + * New upstream + * Update debhelper compat version + * Change section to lisp + * Update standards version + + -- Kevin M. Rosenberg Mon, 27 Jul 2009 11:10:24 -0600 + cl-kmrcl (1.98-1) unstable; urgency=low * New upstream 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 831a0b1..efaad0c 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,18 @@ Source: cl-kmrcl -Section: devel +Section: lisp Priority: optional Maintainer: Kevin M. Rosenberg -Build-Depends: debhelper (>= 4.0.0) -Standards-Version: 3.7.3.0 +Build-Depends-Indep: dh-lisp +Build-Depends: debhelper (>= 7.0.0) +Standards-Version: 3.8.3.0 +Homepage: http://files.b9.com/kmrcl/ +Vcs-Git: git://git.b9.com/kmrcl.git +Vcs-Browser: http://git.b9.com/?p=kmrcl.git Package: cl-kmrcl Architecture: all -Depends: ${shlibs:Depends}, common-lisp-controller, cl-rt +Depends: ${misc:Depends}, cl-rt Description: General Utilities for Common Lisp Programs This package includes general purpose utilities for Common Lisp programs. It is packages for Debian primarily to support more complex Common Lisp packages by the upstream author Kevin Rosenberg. - diff --git a/debian/copyright b/debian/copyright index 1f39879..00ca7b8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ It was downloaded from http://files.b9.com/kmrcl Upstream Author: Kevin M. Rosenberg -Copyright (C) 2000-2006 by Kevin M. Rosenberg. +Copyright (C) 2000-2009 by Kevin M. Rosenberg. This code is free software; you can redistribute it and/or modify it under the terms of the version 2.1 of the GNU Lesser General Public @@ -19,7 +19,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 -system in /usr/share/common-licenses/LGPL. +system in /usr/share/common-licenses/LGPL-3. Preamble to the Gnu Lesser General Public License ------------------------------------------------- diff --git a/debian/postinst b/debian/postinst deleted file mode 100755 index a10eaba..0000000 --- a/debian/postinst +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh -# postinst script for cl-kmrcl -# -# see: dh_installdeb(1) - -set -e - -# package name according to lisp -LISP_PKG=kmrcl - -# 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} - ;; - abort-upgrade|abort-remove|abort-deconfigure) - ;; - *) - 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 diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index 1c05eea..0000000 --- a/debian/prerm +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh -# prerm script for cl-kmrcl -# -# see: dh_installdeb(1) - -set -e - -# package name according to lisp -LISP_PKG=kmrcl - -# 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} - ;; - failed-upgrade) - ;; - *) - echo "prerm 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 - - diff --git a/debian/rules b/debian/rules index 2bc2c46..cf07a52 100755 --- a/debian/rules +++ b/debian/rules @@ -1,83 +1,49 @@ #!/usr/bin/make -f -pkg := kmrcl -pkg-tests := $(pkg)-tests -debpkg := cl-$(pkg) +pkg := kmrcl +pkg-tests := $(pkg)-tests +debpkg := cl-$(pkg) clc-source := usr/share/common-lisp/source clc-systems := usr/share/common-lisp/systems clc-files := $(clc-source)/$(pkg) clc-tests := $(clc-source)/$(pkg-tests) -doc-dir := usr/share/doc/$(debpkg) tests-files := tests.lisp source-files := $(filter-out $(tests-files),$(wildcard *.lisp)) -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - # Add here commands to compile the package. - touch build-stamp +build: clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. - rm -f debian/$(debpkg).postinst.* debian/$(debpkg).prerm.* dh_clean install: build dh_testdir dh_testroot - dh_clean -k - # Add here commands to install the package into debian/kmrcl. - dh_installdirs $(clc-systems) $(clc-files) $(clc-tests) + dh_prep + dh_installdirs dh_install $(pkg).asd $(source-files) $(clc-files) - dh_link $(clc-files)/$(pkg).asd $(clc-systems)/$(pkg).asd dh_install $(pkg-tests).asd $(tests-files) $(clc-tests) - dh_link $(clc-tests)/$(pkg-tests).asd $(clc-systems)/$(pkg-tests).asd -# Build architecture-independent files here. -binary-indep: build install +binary-indep: install dh_testdir dh_testroot -# dh_installdebconf dh_installdocs -# 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_installchangelogs + dh_lisp dh_compress dh_fixperms -# dh_makeshlibs dh_installdeb -# dh_perl - dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb -# Build architecture-dependent files here. -binary-arch: build install +binary-arch: + +binary: binary-indep -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..fd9220e --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://files.b9.com/kmrcl/kmrcl-([\d\.]*)\.tar\.gz diff --git a/impl.lisp b/impl.lisp index 52193ab..762d27f 100644 --- a/impl.lisp +++ b/impl.lisp @@ -51,9 +51,12 @@ path) #+lispworks (when (lw:file-directory-p path) path) - #+sbcl (when (eq :directory - (sb-unix:unix-file-kind (namestring path))) - path) + #+sbcl + (let ((file-kind-fun + (or (find-symbol "NATIVE-FILE-KIND" :sb-impl) + (find-symbol "UNIX-FILE-KIND" :sb-unix)))) + (when (eq :directory (funcall file-kind-fun (namestring path))) + path)) #-(or allegro clisp cmu lispworks sbcl scl) (probe-file path))) (if probe diff --git a/lists.lisp b/lists.lisp index b51c41a..5cd193c 100644 --- a/lists.lisp +++ b/lists.lisp @@ -81,6 +81,8 @@ ;;; Keyword functions +;; ECL doesn't allow FOR clauses after UNTIL. +#-ecl (defun remove-keyword (key arglist) (loop for sublist = arglist then rest until (null sublist) for (elt arg . rest) = sublist diff --git a/sockets.lisp b/sockets.lisp index dc8965c..c8c9b58 100644 --- a/sockets.lisp +++ b/sockets.lisp @@ -22,6 +22,7 @@ (defun listen-to-inet-port (&key (port 0) (kind :stream) (reuse nil)) "Create, bind and listen to an inet socket on *:PORT. setsockopt SO_REUSEADDR if :reuse is not nil" + (declare (ignore kind)) (let ((socket (make-instance 'sb-bsd-sockets:inet-socket :type :stream :protocol :tcp)))