[DRE-commits] [SCM] ruby-ferret.git branch, master, updated. debian/0.11.6-3-21-g68f4ccc

Thu Jun 14 21:01:54 UTC 2012

The following commit has been merged in the master branch:
commit e6de0b2cffc1d93d35ffa0d471d11a90614fcee2
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Jun 14 17:09:31 2012 +0200

    update copyright to DEP-5 copyright-format/1.0

diff --git a/debian/copyright b/debian/copyright
index 7f2a2f6..f30fcc6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,43 +1,32 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ferret
 Source: http://rubyforge.org/frs/?group_id=1028
+Comment: source repacked to get rid of the convenience copy of bzlib
 
 Files: *
 Copyright: Copyright (c) 2005-2006 David Balmain
-License:
- 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.
+License: Expat
 
 Files: setup.rb
 Copyright: Copyright (c) 2000-2005 Minero Aoki
-License: LGPL 2.1
+License: LGPL-2.1
 
 Files: ext/q_parser.c
 Copyright: Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-License: GPL2+
-  With Bison exception: allows distributing in derived works under any terms,
-  as long as the derived work is not a parser generator itself (which is not
-  the case).
+License: GPL-2+
+Comment: with Bison exception
+ allows distributing in derived works under any terms, as long as the derived
+ work is not a parser generator itself (which is not the case).
 
 Files: ext/posh.c ext/posh.c
 Copyright: Copyright (c) 2004, Brian Hook
-License:
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: Copyright © 2007-2001 Leandro Nunes dos Santos <leandronunes at colivre.coop.br>, Antonio Terceiro <terceiro at debian.org>
+License: GPL-3+
+
+License: BSD-3-clause
  All rights reserved.
  .
  Redistribution and use in source and binary forms, with or without
@@ -68,9 +57,58 @@ License:
  (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: debian/*
-Copyright: Copyright © 2007-2001 Leandro Nunes dos Santos <leandronunes at colivre.coop.br>, Antonio Terceiro <terceiro at debian.org>
+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.
+
+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, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
 License: GPL-3+
-Comment:
- On Debian systems, the full text of the GPL-3 license can be found at
+ 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 3 of the License, 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.
+ . 
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On debian systems, the full text of this license can be read in the file
  /usr/share/common-licenses/GPL-3.
+
+License: LGPL-2.1
+ This program is free software.  You can distribute/modify this program
+ under the terms of the GNU LGPL, Lesser General Public License version 2.1.
+ .
+ In Debian systems, you can refer to the GNU LGPL 2.1 at
+ /usr/share/common-licenses/LGPL-2.1
+

-- 
ruby-ferret.git

