From d5df1dfee0c58bfbea48c828431659d978cea36e Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Sat, 2 Aug 2014 05:06:59 -0400
Subject: [PATCH] 4.0.7.12: move ensure-absolute-pathname to
 ensure-lisp-loadable where it's needed. More release tweaks.

---
 cl-launch.sh     | 23 +++++++++--------------
 debian/changelog |  2 +-
 release.lisp     |  2 +-
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/cl-launch.sh b/cl-launch.sh
index 618c987..693ed6b 100755
--- a/cl-launch.sh
+++ b/cl-launch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #| cl-launch.sh -- shell wrapper generator for Common Lisp software -*- Lisp -*-
-CL_LAUNCH_VERSION='4.0.7.11'
+CL_LAUNCH_VERSION='4.0.7.12'
 license_information () {
 AUTHOR_NOTE="\
 # Please send your improvements to the author:
@@ -2316,10 +2316,11 @@ NIL
 (defun ensure-lisp-file-name (x &optional (name "load.lisp"))
   (if (equal (pathname-type x) "lisp") x (temporary-file-from-file x name)))
 (defun ensure-lisp-loadable (x)
-  (etypecase x
-    ((eql t) (or *cl-launch-file* (error "Missing CL_LAUNCH_FILE")))
-    ((or stream pathname) x)
-    (string (parse-native-namestring x))))
+  (cond
+    ((eq x t) (ensure-lisp-loadable (or *cl-launch-file* (error "Missing CL_LAUNCH_FILE"))))
+    ((equal x "-") *standard-input*)
+    ((or (streamp x) (pathnamep x)) x)
+    ((stringp x) (ensure-absolute-pathname (parse-native-namestring x) #'getcwd))))
 (defun ensure-lisp-file (x &optional (name "load.lisp"))
   (let ((x (ensure-lisp-loadable x)))
     (etypecase x
@@ -2389,15 +2390,9 @@ Returns two values: the fasl path, and T if the file was (re)compiled"
   #+(and ecl (not dlopen))
   (load source :verbose *verbose*))
 (defun compute-arguments ()
-  (flet ((foo (v)
-           (let ((x (getenvp v)))
-             (cond
-               ((null x) nil)
-               ((equal x "-") *standard-input*)
-               (t (ensure-absolute-pathname (parse-native-namestring x) #'getcwd))))))
-    (setf *cl-launch-file* (foo "CL_LAUNCH_FILE")
-          *cl-launch-header* (foo "CL_LAUNCH_HEADER")
-          *verbose* (when (getenvp "CL_LAUNCH_VERBOSE") t))))
+  (setf *cl-launch-file* (getenvp "CL_LAUNCH_FILE")
+        *cl-launch-header* (getenvp "CL_LAUNCH_HEADER")
+        *verbose* (when (getenvp "CL_LAUNCH_VERBOSE") t)))
 
 (asdf::register-preloaded-system "cl-launch")
 
diff --git a/debian/changelog b/debian/changelog
index 5fd1c5c..b8cc600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ cl-launch (4.0.8-1) unstable; urgency=low
   * Fix various bugs in some cases when dumping images.
   * Various small tweaks.
 
- -- François-René Rideau <fare@tunes.org>  Fri, 01 Aug 2014 22:06:37 -0400
+ -- Francois-Rene Rideau <fare@tunes.org>  Fri, 01 Aug 2014 22:06:37 -0400
 
 cl-launch (4.0.7-1) unstable; urgency=low
 
diff --git a/release.lisp b/release.lisp
index e7f56e1..5227174 100755
--- a/release.lisp
+++ b/release.lisp
@@ -74,7 +74,7 @@ exec "$(dirname $0)/cl-launch.sh" \
       (clean)
       (delete-file-if-exists origtarball)
       (run `(git-buildpackage --git-debian-branch=master --git-upstream-branch=master (--git-upstream-tag= ,version) --git-tag --git-retag --git-ignore-branch) :show t)
-      (run `(lintian -c --fail-on-warnings (../cl-launch_ ,debian-version _ ,(debian-arch) .changes)) :show t)
+      (run `(lintian -c --fail-on-warnings --profile debian (../cl-launch_ ,debian-version _ ,(debian-arch) .changes)) :show t)
       (clean))))
 
 (defun publish-debian-package ()
-- 
GitLab