fix conflicts

diff --git a/ChangeLog b/ChangeLog
index a717b52895d506bc291119acad1f3bbdb68ccc64..e07a5f97f7e873e44de11e78a2d020f3bbc55019 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,16 @@
-28 Jun 2008  Kevin Rosenberg <kevin@rosenberg.net>
-       * Version 1.96
+28 Jan 2008  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.98
        * {datetime,strings,tests}.lisp: Add remove-char-string
 
+18 Sep 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.97
+       * datetime.lisp: Improve output format for date-string
+
+10 Sep 2007  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.96
+       * byte-stream.lisp: Use without-package-locks as suggested
+       by Daniel Gackle.       
+
 01 Jun 2007  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 1.95
        * {datetime,package}.lisp: Add day-of-week and pretty-date-ut

diff --git a/byte-stream.lisp b/byte-stream.lisp
index 6e785fa2fa90d883ce1aca8ba3f784151f4fdf44..e3036074a00034224864fd7b3dfcef8767a98ff8 100644 (file)
--- a/byte-stream.lisp
+++ b/byte-stream.lisp
@@ -241,21 +241,22 @@ Make-Byte-Array-Output-Stream since the last call to this function."
       (replace result (slot-value stream 'excl::buffer))
       result))
 
-  (defmethod excl:device-extend ((stream extendable-buffer-output-stream)
-                                 need action)
-    (declare (ignore action))
-    (let* ((len (file-position stream))
-           (new-len (max (+ len need) (* 2 len)))
-           (old-buf (slot-value stream 'excl::buffer))
-           (new-buf (make-array new-len :element-type '(unsigned-byte 8))))
-      (declare (fixnum len)
-               (optimize (speed 3) (safety 0)))
-      (dotimes (i len)
-        (setf (aref new-buf i) (aref old-buf i)))
-      (setf (slot-value stream 'excl::buffer) new-buf)
-      (setf (slot-value stream 'excl::buffer-ptr) new-len)
-      )
-    t)
+  (excl::without-package-locks
+   (defmethod excl:device-extend ((stream extendable-buffer-output-stream)
+                                  need action)
+     (declare (ignore action))
+     (let* ((len (file-position stream))
+            (new-len (max (+ len need) (* 2 len)))
+            (old-buf (slot-value stream 'excl::buffer))
+            (new-buf (make-array new-len :element-type '(unsigned-byte 8))))
+       (declare (fixnum len)
+                (optimize (speed 3) (safety 0)))
+       (dotimes (i len)
+         (setf (aref new-buf i) (aref old-buf i)))
+       (setf (slot-value stream 'excl::buffer) new-buf)
+       (setf (slot-value stream 'excl::buffer-ptr) new-len)
+       )
+     t))
 
 )
 

diff --git a/datetime.lisp b/datetime.lisp
index 348cf58c60a0f8453cdbc0b672d2fafe8758b297..30c815c9d01d5bf482e084c5c6ee6ed8b9c0dd7d 100644 (file)
--- a/datetime.lisp
+++ b/datetime.lisp
@@ -45,7 +45,7 @@
       (multiple-value-bind (sec min hr day mon year dow daylight-p zone)
           (decode-universal-time ut)
         (declare (ignore daylight-p zone))
-        (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
+        (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~] ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
                 dow
                 day
                 (1- mon)

diff --git a/debian/changelog b/debian/changelog
index 47d8f07764e28f485e4d7b4ab9b88eeeb3f05bfa..2f4b6b4998682f93647a5d58e0ff158756b6a601 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+cl-kmrcl (1.97-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 18 Sep 2007 23:54:44 -0600
+
+cl-kmrcl (1.96-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 10 Sep 2007 18:18:11 -0600
+
 cl-kmrcl (1.95-1) unstable; urgency=low
 
   * New upstream