From b0256f7a9830a5ef128c86062203529817a185e2 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Wed, 7 Mar 2012 23:12:34 -0600 Subject: [PATCH] debian/copyright: migrate to copyright-format 1.0 Now that an official version of the machine-readable copyright spec has been released and bundled with the debian-policy package, let's follow it. This involves removing some commas and some minor changes to field and short license names and not much else. Syntax checked using the cme tool from libconfig-model-perl. While at it, gather most licenses in stand-alone license paragraphs at the end of the file so the more interesting file->license mapping can fit in a few screenfuls. No semantic change intended. Signed-off-by: Jonathan Nieder --- debian/changelog | 1 + debian/copyright | 419 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 214 insertions(+), 206 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3933541f01..44e89a8753 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ git (1:1.7.9.3-0.1) unstable; urgency=low * checkout -b: allow switching out of an unborn branch (closes: #506480). * debian/control: Standards-Version: 3.9.3.1. + * debian/copyright: adopt copyright-format 1.0. -- Jonathan Nieder Wed, 22 Feb 2012 22:52:20 -0600 diff --git a/debian/copyright b/debian/copyright index b9c235d6f3..75eb66c817 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,99 +1,37 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: git@vger.kernel.org Source: http://code.google.com/p/git-core/downloads/list Files: * Copyright: © 2005-2011, Linus Torvalds and others. License: GPL-2 - You can redistribute this software and/or modify it under the terms of - the GNU General Public License as published by the Free Software - Foundation; version 2 dated June, 1991. - . - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - . - On Debian systems, the complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-2 file. Files: xdiff/* Copyright: © 2003-2009, Davide Libenzi, Johannes E. Schindelin License: LGPL-2.1+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - On Debian systems, the complete text of the GNU Lesser General Public License - can be found in /usr/share/common-licenses/LGPL-2.1. Files: xdiff/xhistogram.c Copyright: © 2010, Google Inc. and other copyright owners as documented in JGit's IP log. License: EDL-1.0 - Redistribution and use in source and binary forms, with or - without modification, are permitted provided that the following - conditions are met: - . - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - . - - Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - . - - Neither the name of the Eclipse Foundation, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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: gitk-git/* +Copyright: © 2005-2011, Paul Mackerras, et al. +License: GPL-2+ Files: git-gui/* Copyright: © 2005-2010, Shawn Pearce, et. al. License: GPL-2+ -Files: git-gui/po/de.po, git-gui/po/fr.po, git-gui/po/glossary/* +Files: git-gui/po/de.po git-gui/po/fr.po git-gui/po/glossary/* Copyright: © 2007-2008, Shawn Pearce, et al. License: GPL-2 - This file is distributed under the same license as the git package. +Comment: This file is distributed under the same license as the git package. Files: git-gui/po/glossary/pt_br.po Copyright: © 2007, Shawn Pearce, et al. License: GPL-2+ - This file is distributed under the same license as the git-gui package. - -Files: git-svn.perl -Copyright: © 2006, Eric Wong -License: GPL-2+ - -Files: gitk-git/* -Copyright: © 2005-2011, Paul Mackerras, et al. -License: GPL-2+ - This program is free software; it may be used, copied, modified - and distributed under the terms of the GNU General Public Licence, - either version 2, or (at your option) any later version. - . - On Debian systems, the complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-2. +Comment: This file is distributed under the same license as the git-gui package. Files: gitweb/static/js/* Copyright: © 2007, Fredrik Kuivinen @@ -102,36 +40,17 @@ Copyright: © 2007, Fredrik Kuivinen © 2011, John 'Warthog9' Hawley License: GPL-2+ +Files: git-svn.perl +Copyright: © 2006, Eric Wong +License: GPL-2+ + Files: vcs-svn/* Copyright: © 2010, David Barr © 2008, Jason Evans © 2005, Stefan Hegny, hydrografix Consulting GmbH, Frankfurt/Main, Germany and others, see http://svn2cc.sarovar.org -License: two-clause BSD-style - 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(s), this list of conditions and the following disclaimer - unmodified other than the allowable addition of one or more - copyright notices. - 2. Redistributions in binary form must reproduce the above copyright - notice(s), this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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. +License: BSD-2-clause Files: imap-send.c Copyright: © 2000-2002, Michael R. Elkins @@ -139,26 +58,30 @@ Copyright: © 2000-2002, Michael R. Elkins © 2004, Theodore Y. Ts'o © 2006, Mike McCormack Name: git-imap-send - drops patches into an imap Drafts folder - derived from isync/mbsync - mailbox synchronizer + derived from isync/mbsync - mailbox synchronizer License: GPL-2+ Files: perl/Git.pm Copyright: © 2006, by Petr Baudis License: GPL-2+ - This module is free software; it may be used, copied, modified - and distributed under the terms of the GNU General Public Licence, - either version 2, or (at your option) any later version. - . - On Debian systems, the complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-2. Files: perl/private-Error.pm Copyright: © 1997-8, Graham Barr -License: Perl - This program is free software; you can redistribute it and/or - modify it under the same terms as Perl itself. +License: GPL-1+ or Artistic-1 + This program is free software; you can redistribute it and/or modify + it under the terms of either: + . + a) the GNU General Public License as published by the Free Software + Foundation; either version 1, or (at your option) any later + version, or + . + b) the "Artistic License" which comes with Perl. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL' and + the Artistic Licence in '/usr/share/common-licenses/Artistic'. -Files: kwset.c, kwset.h +Files: kwset.c kwset.h Copyright: © 1989, 1998, 2000, 2005, Free Software Foundation, Inc. License: GPL-2+ @@ -182,8 +105,97 @@ License: GPL-2+ Files: compat/fnmatch/* Copyright: © 1991-1999, Free Software Foundation, Inc. License: LGPL-2+ - This file is part of the GNU C Library. +Comment: This file is part of the GNU C Library. + +Files: compat/inet_ntop.c compat/inet_pton.c +Copyright: © 1996-2001, Internet Software Consortium. +License: ISC + +Files: compat/win32/poll.c compat/win32/poll.h +Copyright: © 2001-2003, 2006-2011, Free Software Foundation, Inc. +Name: Emulation for poll(2) from gnulib. +License: GPL-2+ + +Files: compat/vcbuild/include/sys/utime.h +Copyright: ? +License: mingw-runtime + +Files: compat/nedmalloc/* +Copyright: © 2005-2006 Niall Douglas +License: Boost + +Files: compat/nedmalloc/malloc.c.h +Copyright: © 2006, KJK::Hyperion +License: dlmalloc + +Files: compat/regex/* +Copyright: © 1985, 1989-93, 1995-2010, Free Software Foundation, Inc. +Name: Extended regular expression matching and search library +License: LGPL-2.1+ + +Files: compat/strtok_r.c +Copyright: © 1991, 1996-1999, 2001, 2004, Free Software Foundation, Inc. +Name: Reentrant string tokenizer. Generic version. +License: LGPL-2.1+ + +Files: compat/obstack.c compat/obstack.h +Copyright: © 1988-1994, 1996-2005, 2009, Free Software Foundation, Inc. +Name: Object stack macros. +License: LGPL-2.1+ + +Files: contrib/fast-import/git-p4 +Copyright: © 2007, Simon Hausmann + © 2007, Trolltech ASA +License: Expat + +Files: contrib/hg-to-git/hg-to-git.py +Copyright: © 2007, Stelian Pop +Name: hg-to-git.py - A Mercurial to GIT converter +License: GPL-2+ + +Files: contrib/mw-to-git/git-remote-mediawiki +Copyright: © 2011 + Jérémie Nikaes + Arnaud Lacurie + Claire Fousse + David Amouyal + Matthieu Moy +License: GPL-2+ + +Files: debian/* +Copyright: © 2005, Sebastian Kuzminsky + © 2005-2006, Andres Salomon + © 2005-2012, Gerrit Pape +License: GPL-2 + +License: GPL-2 + You can redistribute this software and/or modify it under the terms of + the GNU General Public License as published by the Free Software + Foundation; version 2 dated June, 1991. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +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, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +License: LGPL-2+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the @@ -197,8 +209,45 @@ License: LGPL-2+ On Debian systems, the complete text of the GNU Library General Public License can be found in the /usr/share/common-licenses/LGPL-2 file. -Files: compat/inet_ntop.c, compat/inet_pton.c -Copyright: © 1996-2001, Internet Software Consortium. +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + On Debian systems, the complete text of the GNU Lesser General Public License + can be found in /usr/share/common-licenses/LGPL-2.1. + +License: BSD-2-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(s), this list of conditions and the following disclaimer + unmodified other than the allowable addition of one or more + copyright notices. + 2. Redistributions in binary form must reproduce the above copyright + notice(s), this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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. + License: ISC Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -213,14 +262,60 @@ License: ISC ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Files: compat/win32/poll.c, compat/win32/poll.h -Copyright: © 2001-2003, 2006-2011, Free Software Foundation, Inc. -Name: Emulation for poll(2) from gnulib. -License: GPL-2+ +License: Expat + : + . + 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: compat/vcbuild/include/sys/utime.h -Copyright: ? -License: PD +License: EDL-1.0 + Redistribution and use in source and binary forms, with or + without modification, are permitted provided that the following + conditions are met: + . + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + - Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + . + - Neither the name of the Eclipse Foundation, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. + +License: mingw-runtime This file has no copyright assigned and is placed in the Public Domain. This file is a part of the mingw-runtime package. . @@ -231,9 +326,7 @@ License: PD . You are free to use this package and its code without limitation. -Files: compat/nedmalloc/* -Copyright: © 2005-2006 Niall Douglas -License: +License: Boost It is licensed under the Boost Software License which basically means you can do anything you like with it. This does not apply to the malloc.c.h file which remains copyright to others. @@ -262,9 +355,7 @@ License: ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: compat/nedmalloc/malloc.c.h -Copyright: © 2006, KJK::Hyperion -License: +License: dlmalloc This is a version (aka dlmalloc) of malloc/free/realloc written by Doug Lea and released to the public domain, as explained at http://creativecommons.org/licenses/publicdomain. Send questions, @@ -296,87 +387,3 @@ License: 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: compat/regex/* -Copyright: © 1985, 1989-93, 1995-2010, Free Software Foundation, Inc. -Name: Extended regular expression matching and search library -License: LGPL-2.1+ - -Files: compat/strtok_r.c -Copyright: © 1991, 1996-1999, 2001, 2004, Free Software Foundation, Inc. -Name: Reentrant string tokenizer. Generic version. -License: LGPL-2.1+ - -Files: compat/obstack.c, compat/obstack.h -Copyright: © 1988-1994, 1996-2005, 2009, Free Software Foundation, Inc. -Name: Object stack macros. -License: LGPL-2.1+ - -Files: contrib/fast-import/git-p4 -Copyright: © 2007, Simon Hausmann - © 2007, Trolltech ASA -License: MIT - : - . - 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: contrib/hg-to-git/hg-to-git.py -Copyright: © 2007, Stelian Pop -Name: hg-to-git.py - A Mercurial to GIT converter -License: GPL-2+ - -Files: contrib/mw-to-git/git-remote-mediawiki -Copyright: © 2011 - Jérémie Nikaes - Arnaud Lacurie - Claire Fousse - David Amouyal - Matthieu Moy -License: GPL-2+ - -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, or (at your option) - any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - On Debian systems, the complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-2 file. - -Files: debian/* -Copyright: © 2005, Sebastian Kuzminsky - © 2005-2006, Andres Salomon - © 2005-2010, Gerrit Pape -License: GPL-2 - -This package was debianized by Sebastian Kuzminsky -on Thu, 5 May 2005 10:27:14 -0600, -and was adopted by Gerrit Pape -on Wed, 16 Nov 2005 19:37:14 +0000. - -The gitweb package was debianized by Andres Salomon -on Fri, 20 May 2005 11:23:12 -0400, -and adopted to be included in this package -on Thu, 27 Jul 2006 21:43:38 +0000. - -- 2.11.4.GIT