2.32.8: UIOP pathname tweaks. Debian release.

debian: tweak Makefile, changelog, debian files.

Makefile

@@ -150,8 +150,8 @@ test-all-no-stop:
 # Note that the debian git at git://git.debian.org/git/pkg-common-lisp/cl-asdf.git is stale,
 # as we currently build directly from upstream at git://common-lisp.net/projects/asdf/asdf.git
 debian-package: mrproper
-	: $${RELEASE:="$$(git tag -l '2.[0-9][0-9]' | tail -n 1)"} ; \
-	git-buildpackage --git-debian-branch=release --git-upstream-branch=$$RELEASE --git-tag --git-retag --git-ignore-branch
+	: $${RELEASE:="$$(git tag -l '2.[0-9][0-9]' | tail -n 1)"} ; echo building package version $$RELEASE ; \
+	git-buildpackage --git-debian-branch=release --git-upstream-branch=release --git-upstream-tag=$$RELEASE --git-tag --git-retag --git-ignore-branch
 
 # Replace SBCL's ASDF with the current one. -- NOT recommended now that SBCL has ASDF2.
 # for casual users, just use (asdf:load-system :asdf)

asdf.asd

@@ -74,7 +74,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.32.7" ;; to be automatically updated by make bump-version
+  :version "2.32.8" ;; to be automatically updated by make bump-version
   :depends-on ()
   #+asdf3 :encoding #+asdf3 :utf-8
   ;; For most purposes, asdf itself specially counts as a builtin system.

debian/changelog

+cl-asdf (2:2.32.8-1) unstable; urgency=low
+
+  ASDF 2.32.8 is a set of cleanups since 2.32.
+  Since previous release 2.32, it includes the following changes:
+
+  * deferred-warning receives yet more improvements for CCL.
+
+  * upgrade is made more robust in many cases, notably for ECL, SBCL,
+    or when using UIOP with an old ASDF<=2.26.
+
+  * Packages have been tweaked to pass more tests,
+    notably wrt what symbols are exported.
+
+  * Image lifecycle support is improved, thanks to our application 
+
+ -- Francois-Rene Rideau <fare@tunes.org>  Thu, 05 Mar 2013 14:35:43 -0500
+
 cl-asdf (2:2.32-1) unstable; urgency=low
 
   ASDF 2.31 is yet another bug fix release in preparation of an upcoming ASDF 3.
@@ -11,7 +28,7 @@ cl-asdf (2:2.32-1) unstable; urgency=low
   * UIOP is the new official name for ASDF-DRIVER.
     "Utilities for Implementation- and OS- Portability".
     Old names remain as package and system nicknames:
-	ASDF/DRIVER ASDF-DRIVER ASDF-UTILS
+    . ASDF/DRIVER ASDF-DRIVER ASDF-UTILS
 
   * require-system so systems may depend on implementation-provided modules.
 
@@ -20,14 +37,14 @@ cl-asdf (2:2.32-1) unstable; urgency=low
   * class specification for components can now be a string to be read as a symbol.
 
   * feature conditional dependencies are now debugged and tested:
-	:depends-on ("some-system" (:feature :foo "other-system))
+    . :depends-on ("some-system" (:feature :foo "other-system))
     we only recommend them for dependencies between systems;
     within systems, we recommend you use feature-conditional components with
-	:if-feature :foo
+    . :if-feature :foo
     and we only provide limited support for the deprecated legacy way of using
     feature-conditionals with a module having :if-component-dep-fails :ignore
     while its components specify things like:
-	:in-order-to ((compile-op (feature :foo)))
+    . :in-order-to ((compile-op (feature :foo)))
 
   * read-from-file for :version specification is made more useful by using
     the ASDF-USER package rather than CL (into which interning is forbidden)

debian/cl-asdf.dirs

 /usr/share/common-lisp/source/cl-asdf/
+/usr/share/common-lisp/source/cl-asdf/build/
+/usr/share/common-lisp/source/cl-asdf/uiop/
+/usr/share/common-lisp/source/cl-asdf/uiop/contrib/
+/usr/share/common-lisp/source/cl-asdf/contrib/
 /usr/share/doc/cl-asdf/
 /usr/share/doc/cl-asdf/examples/
 /etc/common-lisp/source-registry.conf.d/

debian/cl-asdf.install

-asdf.lisp asdf-ecl.lisp wild-modules.lisp asdf.asd build.xcvb usr/share/common-lisp/source/cl-asdf/
+uiop/ *.lisp build/asdf.lisp contrib/ asdf.asd build.xcvb usr/share/common-lisp/source/cl-asdf/

debian/rules

@@ -9,6 +9,7 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
+	make
 	make -C doc all
 	touch build-stamp
 

header.lisp

 ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
-;;; This is ASDF 2.32.7: Another System Definition Facility.
+;;; This is ASDF 2.32.8: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.

uiop/filesystem.lisp

@@ -358,7 +358,8 @@ TRUENAMIZE uses TRUENAMIZE to resolve as many symlinks as possible."
           (check ensure-physical (physical-pathname-p p) "Could not translate to a physical pathname")
           (check want-relative (relative-pathname-p p) "Expected a relative pathname")
           (check want-absolute (absolute-pathname-p p) "Expected an absolute pathname")
-          (transform ensure-absolute (not (absolute-pathname-p p)) (merge-pathnames* p defaults))
+          (transform ensure-absolute (not (absolute-pathname-p p))
+                     (ensure-absolute-pathname p defaults (list #'report-error :ensure-absolute "~@?")))
           (check ensure-absolute (absolute-pathname-p p)
                  "Could not make into an absolute pathname even after merging with ~S" defaults)
           (check ensure-subpath (absolute-pathname-p defaults)

upgrade.lisp

@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
          ;; "3.4.5.67" would be a development version in the official upstream of 3.4.5.
          ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
          ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
-         (asdf-version "2.32.7")
+         (asdf-version "2.32.8")
          (existing-version (asdf-version)))
     (setf *asdf-version* asdf-version)
     (when (and existing-version (not (equal asdf-version existing-version)))

version.lisp-expr

-"2.32.7"
+"2.32.8"