Frob packages after changes in dependencies.

diff --git a/version.lisp b/version.lisp
index 24e6658..caf8fb6 100644 (file)
--- a/version.lisp
+++ b/version.lisp
@@ -11,10 +11,10 @@
   (asdf:system-source-directory :xcvb))
 
 (defun xcvb-git-checkout-p ()
-  (asdf:probe-file* (asdf:subpathname (get-xcvb-directory) ".git/")))
+  (asdf::probe-file* (asdf::subpathname (get-xcvb-directory) ".git/")))
 
 (defun xcvb-version-file ()
-  (asdf:subpathname (get-xcvb-directory) "version.text"))
+  (asdf::subpathname (get-xcvb-directory) "version.text"))
 
 (defun get-xcvb-version-from-git ()
   (and (xcvb-git-checkout-p)
@@ -36,7 +36,7 @@
 
 (defun make-xcvb-version-file (&optional file)
   (let ((version (get-xcvb-version-from-git))
-        (file (asdf:merge-pathnames* file (xcvb-version-file))))
+        (file (asdf::merge-pathnames* file (xcvb-version-file))))
     (unless version
       (error "Could not get XCVB version from git"))
     (with-open-file (s file :direction :output

diff --git a/virtual-pathnames.lisp b/virtual-pathnames.lisp
index d38c1d9..171b588 100644 (file)
--- a/virtual-pathnames.lisp
+++ b/virtual-pathnames.lisp
@@ -5,7 +5,7 @@
 
 ;;;;; Virtual pathname object.
 
-(define-interface xcvb-interface (eq:<hashable>) ())
+(define-interface xcvb-interface (<hashable>) ())
 
 (defclass virtual-pathname ()
   ((hash :initarg :hash :reader vp-hash)
@@ -13,9 +13,9 @@
    (subpath :initarg :subpath :reader vp-subpath)
    (resolved-namestring :accessor vp-resolved-namestring)))
 
-(defmethod eq:hash ((i xcvb-interface) (vp virtual-pathname))
+(defmethod hash ((i xcvb-interface) (vp virtual-pathname))
   (vp-hash vp))
-(defmethod eq:== ((i xcvb-interface) (vp1 virtual-pathname) (vp2 virtual-pathname))
+(defmethod == ((i xcvb-interface) (vp1 virtual-pathname) (vp2 virtual-pathname))
   (and (equal (vp-root vp1) (vp-root vp2))
        (equal (vp-subpath vp1) (vp-subpath vp2))))