[SCM] Debian packaging of eekboek branch, master, updated. upstream/2.00.03-203-g0a61c67

Sat Jan 21 19:12:20 UTC 2012

The following commit has been merged in the master branch:
commit 16f83c6bdc5a77db594a25e5fecd15562ca070b3
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jan 21 19:25:07 2012 +0100

    debian/copyright: update formatting and info.

diff --git a/debian/copyright b/debian/copyright
index d0578b9..5719d47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,11 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Johan Vromans <jvromans at squirrel.nl>
-Upstream-Source: http://search.cpan.org/dist/EekBoek/
-Upstream-Name: EekBoek
+Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
+Maintainer: Johan Vromans (jvromans at squirrel.nl)
+Source: http://search.cpan.org/dist/EekBoek/
+Name: EekBoek
 
 Files: *
-Copyright: Squirrel Consultancy
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2005-2011, Squirrel Consultancy
+License: Artistic or GPL-1+
 
 Files: eekboek-mode.el
 Copyright: 2007, Johan Vromans <jv at phoenix.squirrel.nl>
@@ -15,54 +13,78 @@ License: GPL-2+
 
 Files: inc/IPC/*
 Copyright: 2003, R. Barrie Slaymaker, Jr. <barries at slaysys.com>
-License: GPL-any | Artistic | BSD-3
+License: Artistic or GPL-1+ or BSD-3
 
-Files: inc/Module/*
-Copyright: 2001-2005, Ken Williams <kwilliams at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Files: inc/Module/Build/*
+Copyright: 2001-2006, Ken Williams <kwilliams at cpan.org>
+License: Artistic or GPL-1+
 
-Files: lib/EB/Assert.pm
+Files: lib/EB/CPAN/Assert.pm
 Copyright: 2001-2007, Michael G Schwern <schwern at pobox.com>
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
-Files: lib/EB/Expression.pm
-Copyright: 2003, Parliament Hill Computers Ltd.
-License-Alias: Perl
-License: Artistic | GPL-1+
+Files: lib/EB/CPAN/Locale/gettext_pp.pm
+Copyright: 2002-2009, Guido Flohr <guido at imperia.net>
+License: GPL-2+
 
 Files: lib/EB/Shell/Base.pm
 Copyright: 2003, Darren Chamberlain <darren at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright: 2008-2009, Johan Vromans <jvromans at squirrel.nl>
- 2008-2009, Joost van Baal <joostvb at mdcc.cx>
+Copyright: 2008, 2009, 2010, Joost van Baal <joostvb at debian.org>
+ 2008, Johan Vromans <jvromans at squirrel.nl>
  2009, Nathan Handler <nhandler at ubuntu.com>
-License: Artistic | GPL-1+
-It is assumed that the debian/* files are released under the same license as
-the upstream source
+ 2010, 2011, Thijs Kinkhorst <thijs at debian.org>
+ 2012, gregor herrmann <gregoa at debian.org>
+License: Artistic or GPL-1+
 
 License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in /usr/share/common-licenses/Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
 
 License: GPL-1+
-    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 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+ 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 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
 
 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.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/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.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: BSD-3
+ 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
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 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.

-- 
Debian packaging of eekboek

