diff --git a/ChangeLog.n b/ChangeLog.n index b78fdfac147034a1f51d020a06b60cc066c44604..e38a3c59148101981b441454eb880a2550e0ca94 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -1,3 +1,13 @@ +******************************************************************************* +*** LEAVE THIS AT THE TOP OF THE FILE *** +don't forget to change the version in utils/packages.lisp if you do anything +user visible. +******************************************************************************* + +2009-05-01 Kevin Layer <layer@gemini.franz.com> + + * utils/packages.lisp: don't use version-from-file + ******************************************************************************* join from trunk_afuchs4 to trunk changes from: @@ -6402,4 +6412,4 @@ IGNORE JDI SPECIFIC CHANGES TO Makefile Lots of other stuff ******************************************************************************* -$Revision: 2.45 $ +$Revision: 2.46 $ diff --git a/utils/packages.lisp b/utils/packages.lisp index 55431112228ec61a20877bd04852f9af3c5c50e4..157f0f609a0e8705e0487ab57f108dc83fc31a13 100644 --- a/utils/packages.lisp +++ b/utils/packages.lisp @@ -17,7 +17,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: packages.lisp,v 2.9 2007/04/17 21:45:54 layer Exp $ +;; $Id: packages.lisp,v 2.10 2009/05/01 16:00:36 layer Exp $ (in-package :common-lisp-user) @@ -3306,7 +3306,7 @@ (in-package :clim) -(cl:defparameter *clim-version* #.(sys::version-from-file "ChangeLog.n")) +(cl:defparameter *clim-version* excl::*common-lisp-version-number*) #+(version>= 5 0) (cl:locally (cl:declare (cl:special excl::*version-info*))