From 6971b653506eaeabb310ad2cee42ebf2f7b0d42a Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Wed, 11 Mar 2015 23:40:42 -0400 Subject: [PATCH] Import debian tweaks from the minimakefile branch --- debian/cl-asdf.dirs | 1 + debian/cl-asdf.install | 2 +- debian/control | 5 ++- debian/copyright | 84 ++++++++++++++++++++++-------------------- 4 files changed, 50 insertions(+), 42 deletions(-) diff --git a/debian/cl-asdf.dirs b/debian/cl-asdf.dirs index 79b5aecd..79daeb80 100644 --- a/debian/cl-asdf.dirs +++ b/debian/cl-asdf.dirs @@ -3,6 +3,7 @@ /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/common-lisp/source/cl-asdf/tools/ /usr/share/doc/cl-asdf/ /usr/share/doc/cl-asdf/examples/ /etc/common-lisp/source-registry.conf.d/ diff --git a/debian/cl-asdf.install b/debian/cl-asdf.install index 5048d5ef..9260b40a 100644 --- a/debian/cl-asdf.install +++ b/debian/cl-asdf.install @@ -1 +1 @@ -uiop/ *.lisp build/ contrib/ asdf.asd build.xcvb version.lisp-expr usr/share/common-lisp/source/cl-asdf/ +uiop/ *.lisp build/ contrib/ tools/ asdf.asd build.xcvb version.lisp-expr usr/share/common-lisp/source/cl-asdf/ diff --git a/debian/control b/debian/control index 9ff5cff3..6316a4e7 100644 --- a/debian/control +++ b/debian/control @@ -6,11 +6,11 @@ Uploaders: Peter Van Eynde <pvaneynd@debian.org>, Milan Zamazal <pdm@zamazal.org>, Christoph Egger <christoph@debian.org>, Julien Danjou <acid@debian.org>, - Francois-Rene Rideau <fare@tunes.org>, + François-René Rideau <fare@tunes.org>, Robert P. Goldman <rpgoldman@sift.info> Build-Depends: debhelper (>> 7) Build-Depends-Indep: texinfo, texlive-extra-utils, texlive, texlive-generic-recommended -Standards-Version: 3.9.5 +Standards-Version: 3.9.6.1 Homepage: http://common-lisp.net/project/asdf/ Vcs-Git: git://common-lisp.net/projects/asdf/asdf.git @@ -20,6 +20,7 @@ Recommends: common-lisp-controller, sbcl | lisp-compiler Replaces: sbcl-common (<= 1:0.9.13.0-2) Breaks: sbcl-common (<= 1:0.9.13.0-2), common-lisp-controller (<< 7.3) Depends: ${misc:Depends} +Suggests: cl-launch (>= 4.1) Description: Another System Definition Facility ASDF provides the functionality of make and ld.so for Common Lisp software: It drives compilation and dynamic loading for complex Lisp systems diff --git a/debian/copyright b/debian/copyright index b7ed5c60..97654c96 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,39 +1,45 @@ -This package was initially debianized by Kevin M. Rosenberg <kmr@debian.org> on -Fri, 16 Aug 2002 23:14:49 -0600. -Peter Van Eynde took over in 2005. Then from 2010 to 2014, Francois-Rene Rideau -maintained the debian package as part of the upstream git repository at - git://common-lisp.net/projects/asdf/asdf.git - -The debian related changes and files are licensed according to the GPL-v2, see -/usr/share/common-licenses/GPL-2 - -Upstream Authors: Dan Barlow <dan@telent.net>, Francois-Rene Rideau -(fare@tunes.org), Robert P. Goldman (rpgoldman@sift.net) & Contributors. - -Copyright: - -(This is the MIT / X Consortium license as taken from - http://www.opensource.org/licenses/mit-license.html on or about - Monday; July 13, 2009) - -Copyright (c) 2001-2014 Daniel Barlow, Francois-Rene Rideau, Robert P. Goldman, -and contributors - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: asdf +Upstream-Contact: asdf-devel <asdf-devel@common-lisp.net> +Source: http://common-lisp.net/project/asdf/ + +Files: * +Copyright: 2001-2015 Daniel Barlow, Francois-Rene Rideau, Robert P. Goldman, and contributors +Comment: This is the MIT license, but Debian, after GNU, calls it the Expat license + to unambiguously distinguish it from other licenses once used by MIT. +License: Expat + On Debian systems, the full text of the Expat License can be found in the file + `/usr/share/common-licenses/Expat'. + . + (This is the MIT / X Consortium license as taken from + http://www.opensource.org/licenses/mit-license.html on or about + Monday; July 13, 2009) + . + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: debian/* +Copyright: 2002 Kevin M. Rosenberg <kmr@debian.org> +License: GPL-2 + On Debian systems, the full text of the GNU GPL v2 can be found in the file + `/usr/share/common-licenses/GPL-2'. +Comment: This package was initially debianized by Kevin M. Rosenberg <kmr@debian.org> + on Fri, 16 Aug 2002 23:14:49 -0600. + Peter Van Eynde took over in 2005. Then from 2010 to 2014, Francois-Rene Rideau + maintained the debian package as part of the upstream git repository. -- GitLab