The following commit has been merged in the master branch: commit 80d011defd001e9c5f7a0918c254e6a700a80c0e Author: Ralf Treinen <trei...@free.fr> Date: Wed Jan 16 21:07:13 2013 +0100
debian/copyright: format 1.0 diff --git a/debian/changelog b/debian/changelog index 5e06180..c1f8dc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-tools (20120103-3) UNRELEASED; urgency=low + + * debian/copyright: migrate to machine-readable format 1.0 + + -- Ralf Treinen <trei...@debian.org> Wed, 16 Jan 2013 21:03:29 +0100 + ocaml-tools (20120103-2) unstable; urgency=low * Fix debian/rules targets to call install before binary-indep diff --git a/debian/copyright b/debian/copyright index 88835b2..f819da9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,29 +1,16 @@ -This package was debianized by Ralf Treinen <trei...@debian.org> on -Sat, 24 Mar 2001 18:49:15 +0100. - -ocaml-autoconf --------------- - -Downloaded from http://ocaml-autoconf.forge.ocamlcore.org/ - -Upstream Authors: Richard W.M. Jones and Stefano Zacchiroli +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Files: ocaml-autoconf/* +Source: http://ocaml-autoconf.forge.ocamlcore.org/ Copyright: © 2009 Richard W.M. Jones © 2009 Stefano Zacchiroli © 2000-2005 Olivier Andrieu © 2000-2005 Jean-Christophe Filliâtre © 2000-2005 Georges Mariano - -License: - -This program is distributed under the BSD "3-clauses" license: - - Copyright (c) The Regents of the University of California. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright @@ -32,57 +19,46 @@ This program is distributed under the BSD "3-clauses" license: 3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - -configure.in and Makefile.in ----------------------------- -Downloaded from http://www.lri.fr/~filliatr/software.en.html - -Upstream Author: Jean-Christophe Filliâtre <filli...@lri.fr> - + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +Files: autoconf/* +Source: http://www.lri.fr/~filliatr/software.en.html +Upstream-Contact: Jean-Christophe Filliâtre <filli...@lri.fr> Copyright: © 2001 Jean-Christophe Filliâtre - -License: - -This program is distributed under the GNU Library General Public -License version 2. On a Debian system the GNU LGPL can be found in -the file /usr/share/common-licenses/LGPL-2 . - - -omlet ------ -Downloaded from http://www.vim.org/scripts/script.php?script_id=1196 - -Upstream Author: David Baelde <david.bae...@ens-lyon.org> - -Copyright (C) 2005 David Baelde - +License: LGPL-2 + This program is distributed under the GNU Library General Public + License version 2. On a Debian system the GNU LGPL can be found in + the file /usr/share/common-licenses/LGPL-2 . + +Files: omlet-0.13/* +Source: http://www.vim.org/scripts/script.php?script_id=1196 +Upstream-Contact: David Baelde <david.bae...@ens-lyon.org> +Copyright: (C) 2005 David Baelde +License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. + . + On Debian systems you can find a copy of this license in + /usr/share/common-licenses/GPL-2 + +Files: ocamldot/* +Source: http://www.research.att.com/~trevor/ocamldot/index.html +Upstream-Contact: Trevor Jim <tre...@research.att.com> +Copyright: disclaimed by the author +License: public-domain + Ocamldot was written by Trevor Jim. It is in the public domain; use + it however you like, at your own risk. -On Debian systems you can find a copy of this license in -/usr/share/common-licenses/GPL-2 - -ocamldot --------- -Dowloaded from http://www.research.att.com/~trevor/ocamldot/index.html - -Upstream Author: Trevor Jim <tre...@research.att.com> - -Copyright: - -Ocamldot was written by Trevor Jim. It is in the public domain; use -it however you like, at your own risk. -- ocaml-tools packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits