From 39e6e154c89ec2db3c25a73e9786ceb92ba8a392 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Tue, 4 Jan 2011 00:53:06 +0100
Subject: [PATCH] 2.012.2: cleanup name of cache directory for clisp (remove
 trailing dash)

---
 asdf.asd         |  2 +-
 asdf.lisp        | 14 +++++++-------
 debian/changelog |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/asdf.asd b/asdf.asd
index 6d913bb2..7dce25a2 100644
--- a/asdf.asd
+++ b/asdf.asd
@@ -12,7 +12,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.012.1" ;; to be automatically updated by bin/bump-revision
+  :version "2.012.2" ;; to be automatically updated by bin/bump-revision
   :depends-on ()
   :components
   ((:file "asdf")
diff --git a/asdf.lisp b/asdf.lisp
index 001fe68a..3d2fce9b 100644
--- a/asdf.lisp
+++ b/asdf.lisp
@@ -1,5 +1,5 @@
 ;;; -*- mode: common-lisp; package: asdf; -*-
-;;; This is ASDF 2.012.1: Another System Definition Facility.
+;;; This is ASDF 2.012.2: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
@@ -83,7 +83,7 @@
          ;; "2.345.6" would be a development version in the official upstream
          ;; "2.345.0.7" would be your seventh local modification of official release 2.345
          ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
-         (asdf-version "2.012.1")
+         (asdf-version "2.012.2")
          (existing-asdf (fboundp 'find-system))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))
@@ -2619,15 +2619,15 @@ located."
                             *implementation-features*))
           (os   (maybe-warn (first-feature *os-features*)
                             "No os feature found in ~a." *os-features*))
-          (arch #+clisp "" #-clisp
-                (maybe-warn (first-feature *architecture-features*)
-                            "No architecture feature found in ~a."
-                            *architecture-features*))
+          (arch (or #-clisp
+                    (maybe-warn (first-feature *architecture-features*)
+                                "No architecture feature found in ~a."
+                                *architecture-features*)))
           (version (maybe-warn (lisp-version-string)
                                "Don't know how to get Lisp implementation version.")))
       (substitute-if
        #\_ (lambda (x) (find x " /:\\(){}[]$#`'\""))
-       (format nil "~(~@{~a~^-~}~)" lisp version os arch)))))
+       (format nil "~(~a~@{~@[-~a~]~}~)" lisp version os arch)))))
 
 
 ;;; ---------------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 55b390f2..419695ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ cl-asdf (2:2.012-1) unstable; urgency=low
     fixed infinite loop when filesystem clock is in the future,
     extended the AOT DSL and made it more futureproof,
     fixed how clear-system interacts with map-systems,
-    used of directory under old SBCLs,
+    fixed use of directory under old SBCLs,
     fixed run-shell-command status and version string under clisp,
     fixed error messages.
   * Synchronized version of asdf.asd and asdf.lisp, automatically.
-- 
GitLab