r72103 - in /trunk/libauthen-krb5-admin-perl/debian: changelog copyright

[rra at users.alioth.debian.org]

Author: rra
Date: Thu Mar 31 18:38:33 2011
New Revision: 72103

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72103
Log:
* Update debian/copyright to the current draft DEP-5 format and add some
  additional copyright statements.  Change the GPL pointer to the GPL v1
  text now that it's in common-licenses.

Modified:
    trunk/libauthen-krb5-admin-perl/debian/changelog
    trunk/libauthen-krb5-admin-perl/debian/copyright

Modified: trunk/libauthen-krb5-admin-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-admin-perl/debian/changelog?rev=72103&op=diff
==============================================================================
--- trunk/libauthen-krb5-admin-perl/debian/changelog (original)
+++ trunk/libauthen-krb5-admin-perl/debian/changelog Thu Mar 31 18:38:33 2011
@@ -9,6 +9,9 @@
     Heimdal KDCs.  Remove the note that the author envisions support for
     other KDC implementations; it's been nine years and this hasn't
     happened, so it's probably not imminent.
+  * Update debian/copyright to the current draft DEP-5 format and add some
+    additional copyright statements.  Change the GPL pointer to the GPL v1
+    text now that it's in common-licenses.
   * Add myself to Uploaders.
   * Update debhelper compatibility level to V8.
   * Update standards version to 3.9.1 (no changes required).

Modified: trunk/libauthen-krb5-admin-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-admin-perl/debian/copyright?rev=72103&op=diff
==============================================================================
--- trunk/libauthen-krb5-admin-perl/debian/copyright (original)
+++ trunk/libauthen-krb5-admin-perl/debian/copyright Thu Mar 31 18:38:33 2011
@@ -1,35 +1,16 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=228
+Format-Specification:
+ http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
 Upstream-Name: Authen-Krb5-Admin
-Upstream-Maintainer: Andrew J. Korty <ajk at iu.edu>
-Upstream-Source: http://search.cpan.org/dist/Authen-Krb5-Admin/
+Upstream-Contact: Andrew J. Korty <ajk at iu.edu>
+Source: http://search.cpan.org/dist/Authen-Krb5-Admin/
 
 Files: *
 Copyright: © 2002, Andrew J. Korty
-License: other
- 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.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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: BSD-2-clause
 
 Files: admin.h
 Copyright: © 2001, Massachusetts Institute of Technology
-License: other
+License: MIT-Kerberos
  Export of this software from the United States of America may
  require a specific license from the United States Government.
  It is the responsibility of any person or organization contemplating
@@ -58,14 +39,20 @@
  This program is free software; you can redistribute it and/or
  modify it under the same terms as Perl itself.
  .
- Perl is distributed under your choice of the GNU General Public License or
- the Artistic License.  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'.
+ Perl is distributed under your choice of the GNU General Public License
+ version 1 or later, or the Artistic License.  On Debian GNU/Linux
+ systems, the complete text of the GNU General Public License can be found
+ in `/usr/share/common-licenses/GPL-1' and the Artistic Licence in
+ `/usr/share/common-licenses/Artistic'.
 
 Files: debian/*
-Copyright: © 2008, Ansgar Burchardt <ansgar at debian.org>
-License: other
+Copyright:
+ © 2008, 2010, Ansgar Burchardt <ansgar at debian.org>
+ © 2009, gregor herrmann <gregoa at debian.org>
+ © 2011, Russ Allbery <rra at debian.org>
+License: BSD-2-clause
+
+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:
@@ -86,4 +73,3 @@
  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.
-