shishi-debian changelog copyright

[shishi-commit]

CVSROOT:        /sources/shishi
Module name:    shishi-debian
Changes by:     Simon Josefsson <jas>   08/09/10 08:01:59

Modified files:
        .              : changelog copyright 

Log message:
        Use machine parseable copyright format.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/changelog?cvsroot=shishi&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/copyright?cvsroot=shishi&r1=1.15&r2=1.16

Patches:
Index: changelog
===================================================================
RCS file: /sources/shishi/shishi-debian/changelog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- changelog   22 Jun 2008 18:43:10 -0000      1.97
+++ changelog   10 Sep 2008 08:01:58 -0000      1.98
@@ -1,3 +1,11 @@
+shishi (0.0.37-2) unstable; urgency=low
+
+  [ Simon Josefsson ]
+  * Update copyright file to follow the format specified in
+    http://wiki.debian.org/Proposals/CopyrightFormat
+
+ -- Simon Josefsson <address@hidden>  Wed, 10 Sep 2008 10:01:16 +0200
+
 shishi (0.0.37-1) unstable; urgency=low
 
   [ Simon Josefsson ]

Index: copyright
===================================================================
RCS file: /sources/shishi/shishi-debian/copyright,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- copyright   2 Jan 2008 20:36:50 -0000       1.15
+++ copyright   10 Sep 2008 08:01:59 -0000      1.16
@@ -1,31 +1,25 @@
+Format-Specification: 
http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=226
+Upstream-Name: Shishi
+Upstream-Maintainer: Simon Josefsson <address@hidden>
+Upstream-Source: http://www.gnu.org/software/shishi/
+
 This package was debianized by Simon Josefsson <address@hidden> on
 Tue, 20 Dec 2005 14:16:27 +0100.
 
-It was downloaded from http://josefsson.org/shishi/
-
 Copyright Holder: Simon Josefsson <address@hidden> (core parts)
   and The Free Software Foundation (minor parts, gnulib, misc files)
   and others (very few files, see below).
 
-Debian packaging copyright:
-
-    The package files were written by Simon Josefsson and Russ
-    Allbery, and are copyright 2005, 2006, 2007, 2008, and may be
-    redistributed and/or modified 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 complete text of the GNU General
-    Public License version 2 can be found in the file
-    `/usr/share/common-licenses/GPL-2'.
-
-License:
+Files: *
+Copyright: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008  Simon 
Josefsson
+License: GPL-3+
+ The entire package is licensed under GPL version 3, or (at your
+ option) any later version.  On Debian systems, the complete text of
+ the GNU General Public License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
 
-The entire package is licensed under GPL version 3, or (at your
-option) any later version.  On Debian systems, the complete text of
-the GNU General Public License version 3 can be found in the file
-`/usr/share/common-licenses/GPL-3'.
-
-Most files in lib/ and src/ have this license (e.g., lib/version.c):
+ Most files in lib/ and src/ have a license like this, for example
+ quoting lib/version.c:
 
  * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Simon Josefsson
  *
@@ -46,14 +40,28 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
 
-The file lib/resolv.c have a different copyright notice:
-
-  Copyright (C) 2003, 2004  Simon Josefsson
-  Copyright (C) 2002 Jeremie Miller, Thomas Muldowney,
-                     Ryan Eatmon, Robert Norris
-
-The file lib/kerberos.asn1 contain an additional license related note:
+Files: doc/shishi.texi
+Copyright: Copyright 2002-2008 Simon Josefsson
+License: GFDL-1.2+
+    Permission is granted to copy, distribute and/or modify this
+    document under the terms of the GNU Free Documentation License,
+    Version 1.2 or any later version published by the Free Software
+    Foundation; with no Invariant Sections, no Front-Cover Texts, and
+    no Back-Cover Texts.  A copy of the license is included in the
+    section entitled ``GNU Free Documentation License''.
 
+ On Debian systems, the complete text of the GNU Free Documentation
+ License Version 1.2 can be found in the file
+ `/usr/share/common-licenses/GFDL-1.2'.
+
+Files: lib/resolv.c
+Copyright: Copyright (C) 2003, 2004  Simon Josefsson
+Copyright: Copyright (C) 2002 Jeremie Miller, Thomas Muldowney, Ryan Eatmon, 
Robert Norris
+License: GPL-3+
+
+Files: lib/kerberos.asn1
+Copyright: Copyright (C) 2002, 2003, 2004, 2006, 2007  Simon Josefsson
+License: GPL-3+
 -- This rest of this file is taken from appendix A of RFC 4120,
 -- http://www.ietf.org/rfc/rfc4120.txt (MD5
 -- f95332f70f18eb9252756c7e2accc141), with two minor modifications
@@ -72,18 +80,47 @@
 -- topic: "Under RFC 3978, it is currently OK to modify code extracts
 -- from RFCs.", see <address@hidden>.
 
-The files in gl/ are copyrighted by the FSF and are copied from gnulib
-(and many in turn are copied from glibc), they (e.g., xmalloc.c)
-exhibit this copyright notice:
-
-   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-   Inc.
-
-The file gl/inet_ntop.c have this license:
+Files: debian/*
+Copyright: Copyright 2005-2008, Simon Josefsson <address@hidden>
+Copyright: Copyright 2005-2008, Russ Allbery <address@hidden>
+License: GPL-3+
+    The package files were written by Simon Josefsson and Russ
+    Allbery, and are copyright 2005, 2006, 2007, 2008, and may be
+    redistributed and/or modified 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.  On Debian systems, the complete text of the GNU General
+    Public License version 2 can be found in the file
+    `/usr/share/common-licenses/GPL-3'.
 
-/*
- * Copyright (c) 1996-1999 by Internet Software Consortium.
+Files: gl/*
+Files: db/gl/*
+Files: src/gl/*
+Files: build-aux/*
+Copyright: Copyright (C) 2007 Free Software Foundation, Inc.
+License: GPL-3+
+ These files are copied from gnulib, and the copyright is normally
+ held by Free Software Foundation, Inc.  For example
+ db/gl/areadlink.c:
+
+   Copyright (C) 2001, 2003-2007 Free Software Foundation, Inc.
+
+   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/>.  */
+
+Files: gl/inet_ntop.c
+Copyright: Copyright (c) 1996-1999 by Internet Software Consortium.
+License: other
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -99,17 +136,33 @@
  * SOFTWARE.
  */
 
-Other files are generated by autoconf, automake, libtool, gettext, etc
-and are not discussed further.
-
-The following license applies to the Shishi manual (doc/shishi.texi):
-
-    Permission is granted to copy, distribute and/or modify this
-    document under the terms of the GNU Free Documentation License,
-    Version 1.2 or any later version published by the Free Software
-    Foundation; with no Invariant Sections, no Front-Cover Texts, and
-    no Back-Cover Texts.  A copy of the license is included in the
-    section entitled ``GNU Free Documentation License''.
+Files: asn1/*
+Copyright: Copyright (C) 2004, 2006, 2008 Free Software Foundation
+Copyright: Copyright (C) 2002  Fabio Fiorina
+License: LGPL-2.1+
+ This is a copy of libtasn1, it is not used by debian packages because
+ we link dynamically to the debian libtasn1 package.  The files have
+ a license such as this (coding.c):
+
+ *      Copyright (C) 2004, 2006, 2008 Free Software Foundation
+ *      Copyright (C) 2002  Fabio Fiorina
+ *
+ * This file is part of LIBTASN1.
+ *
+ * The LIBTASN1 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.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
 
-On Debian systems, the complete text of the GNU Free Documentation
-License can be found in the file `/usr/share/common-licenses/GFDL'.
+Remaining files are generated by autoconf, automake, libtool, gettext,
+etc and are not discussed further.