Commit dc5f659f authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Make asdf.lisp identical to upstream 2.004.

Update debian configuration and documentation.
parent 0be82da2
...@@ -22,6 +22,7 @@ doc/asdf.toc ...@@ -22,6 +22,7 @@ doc/asdf.toc
doc/asdf.tp doc/asdf.tp
doc/asdf.vr doc/asdf.vr
doc/asdf.vrs doc/asdf.vrs
doc/asdf.t2d/
# We build these at various stages in the build and test process # We build these at various stages in the build and test process
LICENSE LICENSE
...@@ -38,3 +39,12 @@ tmp/ ...@@ -38,3 +39,12 @@ tmp/
*.data *.data
test/try-reloading-dependency.asd test/try-reloading-dependency.asd
test/fileMissing.lisp test/fileMissing.lisp
# debian stuff
build-stamp
debian/cl-asdf.debhelper.log
debian/cl-asdf.postinst.debhelper
debian/cl-asdf.prerm.debhelper
debian/cl-asdf.substvars
debian/cl-asdf/
debian/files
...@@ -2190,8 +2190,8 @@ Returns the new tree (which probably shares structure with the old one)" ...@@ -2190,8 +2190,8 @@ Returns the new tree (which probably shares structure with the old one)"
(dolist (name +asdf-methods+) (dolist (name +asdf-methods+)
(let ((keyword (intern (symbol-name name) :keyword))) (let ((keyword (intern (symbol-name name) :keyword)))
(loop :for data = rest :then (cddr data) (loop :for data = rest :then (cddr data)
:for key = (when data (first data)) :for key = (first data)
:for value = (when data (second data)) :for value = (second data)
:while data :while data
:when (eq key keyword) :do :when (eq key keyword) :do
(destructuring-bind (op qual (o c) &body body) value (destructuring-bind (op qual (o c) &body body) value
......
Debian Package cl-asdf Debian Package cl-asdf
---------------------- ----------------------
This package was created for Debian by Kevin M. Rosenberg This package was originally created for Debian by Kevin M. Rosenberg
<kmr@debian.org> in Aug 2002. asdf is not maintained <kmr@debian.org> in Aug 2002. It is now being kept up to date by
in git at http://common-lisp.net/project/asdf/asdf.git Francois-Rene Rideau, who also maintains the upstream ASDF project at
http://common-lisp.net/project/asdf/
To load asdf into your Lisp system, give the command To load ASDF into your Lisp system, you can give the command
(load "/usr/share/common-lisp/source/asdf/asdf.lisp") (load "/usr/share/common-lisp/source/asdf/asdf.lisp")
although in many implementations, you can just use
(require :asdf)
Additionally, there is an optional module that you can load Additionally, there is an optional module that you can load
with the command with the command
(load "/usr/share/common-lisp/source/asdf/wild-modules.lisp") (load "/usr/share/common-lisp/source/asdf/wild-modules.lisp")
This package is build using darcs-buildpackage and the darcs archives can be This package is built from the git repository at
downloaded from http://people.debian.org/~pvaneynd/repository/ git://git.debian.org/git/pkg-common-lisp/cl-asdf.git
This repository should be mostly identical to the release branch at
git://common-lisp.net/projects/asdf/asdf.git
-- Francois-Rene Rideau <fare@tunes.org>, Wed, 14 Jul 2010 13:49:26 -0400
To build this package you need to get the git repository: To build this package you need to get the git repository:
git clone http://git.debian.org/git/pkg-common-lisp/cl-asdf.git git clone git://git.debian.org/git/pkg-common-lisp/cl-asdf.git
Get the upstream branch too: Get the upstream branch too:
...@@ -9,14 +9,14 @@ git checkout -t -b upstream remotes/origin/upstream ...@@ -9,14 +9,14 @@ git checkout -t -b upstream remotes/origin/upstream
Then you need to setup the following remotes: Then you need to setup the following remotes:
git remote add upstream http://common-lisp.net/project/asdf/asdf.git git remote add upstream git://common-lisp.net/projects/asdf/asdf.git
To update the package from upstream do: To update the package from upstream do:
git checkout upstream git checkout upstream
git pull upstream master:upstream git pull upstream release:upstream
git whatchanged git whatchanged
git tag upstream/<date> #git tag upstream/<date> # not necessary anymore, now that we use the same as upstream.
git checkout master git checkout master
git pull . upstream git pull . upstream
......
cl-asdf (2:1.704-2) UNRELEASED; urgency=low cl-asdf (2:2.004-1) unstable; urgency=low
* open for changes * Imported new upstream, try not to diverge from it.
* Remove cl-cclan which was removed from the upstream repository.
* Updated Debian configuration and documentation.
-- Peter Van Eynde <pvaneynd@debian.org> Mon, 19 Apr 2010 21:45:07 +0200 -- Francois-Rene Rideau <fare@tunes.org> Wed, 14 Jul 2010 14:06:50 -0400
cl-asdf (2:1.704-1) unstable; urgency=low cl-asdf (2:1.704-1) unstable; urgency=low
......
test/* test/*
\ No newline at end of file
asdf.lisp wild-modules.lisp asdf-install.lisp usr/share/common-lisp/source/cl-asdf/ asdf.lisp asdf-ecl.lisp wild-modules.lisp asdf.asd build.xcvb usr/share/common-lisp/source/cl-asdf/
\ No newline at end of file
/usr/share/common-lisp/source/cl-cclan/
/usr/share/doc/cl-cclan/
cclan-package.lisp cclan.lisp cclan.asd usr/share/common-lisp/source/cl-port/
# usr/share/common-lisp/source/cl-cclan/ is always empty
cl-cclan binary: package-contains-empty-directory
...@@ -2,12 +2,13 @@ Source: cl-asdf ...@@ -2,12 +2,13 @@ Source: cl-asdf
Section: lisp Section: lisp
Priority: optional Priority: optional
Maintainer: Debian Common Lisp Team <pkg-common-lisp-devel@lists.alioth.debian.org> Maintainer: Debian Common Lisp Team <pkg-common-lisp-devel@lists.alioth.debian.org>
Uploaders: Peter Van Eynde <pvaneynd@debian.org> Uploaders: Peter Van Eynde <pvaneynd@debian.org>,
Francois-Rene Rideau <fare@tunes.org>
Build-Depends: debhelper (>> 7) Build-Depends: debhelper (>> 7)
Build-Depends-Indep: texinfo,texlive-extra-utils, texlive, texlive-generic-recommended, dh-lisp Build-Depends-Indep: texinfo,texlive-extra-utils, texlive, texlive-generic-recommended, dh-lisp
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://common-lisp.net/project/asdf/ Homepage: http://common-lisp.net/project/asdf/
Vcs-Git: http://git.debian.org/git/pkg-common-lisp/cl-asdf.git Vcs-Git: git://git.debian.org/git/pkg-common-lisp/cl-asdf.git
Package: cl-asdf Package: cl-asdf
Architecture: all Architecture: all
...@@ -24,10 +25,3 @@ Description: Another System Definition Facility ...@@ -24,10 +25,3 @@ Description: Another System Definition Facility
common-lisp-controller package. Unlike defsystem3 in CLC, asdf is common-lisp-controller package. Unlike defsystem3 in CLC, asdf is
object-oriented and extensible. object-oriented and extensible.
Package: cl-cclan
Architecture: all
Depends: ${misc:Depends}
Description: Comprehensive Common Lisp Archive Network
cclan is a tool for creating a repository of Common Lisp packages.
cclan utilizes asdf to automatically create installable packages for various
operating systems.
...@@ -16,7 +16,7 @@ clean: ...@@ -16,7 +16,7 @@ clean:
dh_testdir dh_testdir
dh_testroot dh_testroot
rm -f build-stamp rm -f build-stamp
make -C doc clean make -C doc veryclean
dh_clean dh_clean
# Build architecture-dependent files here. # Build architecture-dependent files here.
......
...@@ -27,4 +27,4 @@ clean: ...@@ -27,4 +27,4 @@ clean:
rm -f ${intermediate} rm -f ${intermediate}
veryclean: clean veryclean: clean
rm -f asdf.html asdf.pdf asdf.info rm -f asdf.html asdf.pdf asdf.info
rm -rf asdf/ rm -rf asdf/ asdf.t2d/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment