From 3957fb00d231ee78e920fe7938115903b116ae8a Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Mon, 18 Mar 2013 08:53:11 -0400
Subject: [PATCH] 2.32.17: UIOP requires ASDF 2.011.4 or later. Accordingly fix
 upgrade tests.

---
 asdf.asd                 | 2 +-
 header.lisp              | 2 +-
 test/script-support.lisp | 5 ++++-
 uiop/uiop.asd            | 4 ++++
 upgrade.lisp             | 2 +-
 version.lisp-expr        | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/asdf.asd b/asdf.asd
index 1d2bf64be..97145f4ad 100644
--- a/asdf.asd
+++ b/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.16" ;; to be automatically updated by make bump-version
+  :version "2.32.17" ;; 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.
diff --git a/header.lisp b/header.lisp
index bd1833968..cf13348be 100644
--- a/header.lisp
+++ b/header.lisp
@@ -1,5 +1,5 @@
 ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
-;;; This is ASDF 2.32.16: Another System Definition Facility.
+;;; This is ASDF 2.32.17: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
diff --git a/test/script-support.lisp b/test/script-support.lisp
index 7d0abcf67..ea471638d 100644
--- a/test/script-support.lisp
+++ b/test/script-support.lisp
@@ -523,9 +523,12 @@ is bound, write a message and exit on an error.  If
   (setf *package* (find-package :asdf-test))
   t)
 
-
 (defun load-asdf-lisp-and-test-uiop (&optional tag)
   (load-asdf-lisp tag)
+  (unless (and (member :asdf *features*)
+               (or (member :asdf3 *features*)
+                   (and (member :asdf2 *features*) (acall :version-satisfies (acall :asdf-version) "2.11.4"))))
+    (leave-test "UIOP will break ASDF < 2.011.4 - skipping test." 0))
   (configure-asdf)
   (register-directory *asdf-directory*)
   (register-directory *uiop-directory*)
diff --git a/uiop/uiop.asd b/uiop/uiop.asd
index f4833a59f..fdc451c68 100644
--- a/uiop/uiop.asd
+++ b/uiop/uiop.asd
@@ -1,6 +1,10 @@
 ;;; -*- mode: lisp -*-
 (in-package :asdf)
 
+(unless (or (member :asdf3 *features*)
+            (and (member :asdf2 *features*) (version-satisfies (asdf:asdf-version) "2.11.4")))
+  (error "UIOP requires ASDF 2.011.4 or later."))
+
 (defun call-without-redefinition-warnings (thunk)
   (handler-bind (((or
                    #+allegro simple-warning
diff --git a/upgrade.lisp b/upgrade.lisp
index 6e998bb46..819631f81 100644
--- a/upgrade.lisp
+++ b/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.16")
+         (asdf-version "2.32.17")
          (existing-version (asdf-version)))
     (setf *asdf-version* asdf-version)
     (when (and existing-version (not (equal asdf-version existing-version)))
diff --git a/version.lisp-expr b/version.lisp-expr
index f51c8d06c..a5b59320e 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.32.16"
+"2.32.17"
-- 
GitLab