shishi-debian changelog copyright

[Simon Josefsson]

CVSROOT:        /sources/shishi
Module name:    shishi-debian
Changes by:     Simon Josefsson <jas>   13/04/03 17:24:46

Modified files:
        .              : changelog copyright 

Log message:
        Update copyright file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/changelog?cvsroot=shishi&r1=1.137&r2=1.138
http://cvs.savannah.gnu.org/viewcvs/shishi-debian/copyright?cvsroot=shishi&r1=1.24&r2=1.25

Patches:
Index: changelog
===================================================================
RCS file: /sources/shishi/shishi-debian/changelog,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- changelog   3 Apr 2013 11:06:25 -0000       1.137
+++ changelog   3 Apr 2013 17:24:45 -0000       1.138
@@ -1,6 +1,7 @@
 shishi (1.0.2-1) unstable; urgency=low
 
   * New upstream version.
+  * Update copyright file.
 
  -- Simon Josefsson <address@hidden>  Wed, 03 Apr 2013 13:06:04 +0200
 

Index: copyright
===================================================================
RCS file: /sources/shishi/shishi-debian/copyright,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- copyright   12 Mar 2012 19:37:31 -0000      1.24
+++ copyright   3 Apr 2013 17:24:45 -0000       1.25
@@ -1,24 +1,16 @@
-Format-Specification: 
http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=226
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Shishi
-Upstream-Maintainer: Simon Josefsson <address@hidden>
-Upstream-Source: http://www.gnu.org/software/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).
+Source: http://www.gnu.org/software/shishi/
+License: GPL-3+
+Copyright: Simon Josefsson, FSF, others
 
 Files: *
 Copyright: Copyright (C) 2002-2012 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'.
+ option) any later version.  Quoting lib/version.c:
  .
- Most files in lib/ and src/ have a license like this, for example
- quoting lib/version.c:
- .
- * Copyright (C) 2002-2012 Simon Josefsson
+ * Copyright (C) 2002-2013 Simon Josefsson
  *
  * This file is part of Shishi.
  *
@@ -36,12 +28,14 @@
  * along with Shishi; if not, see http://www.gnu.org/licenses or write
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
+ .
+ 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'.
 
 Files: doc/shishi.texi
-Copyright: Copyright 2002-2012 Simon Josefsson.
+Copyright: Copyright 2002-2013 Simon Josefsson
 License: GFDL-1.3+
- Copyright @copyright{} 2002-2012 Simon Josefsson.
- .
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.3 or
  any later version published by the Free Software Foundation; with no
@@ -140,48 +134,15 @@
  * SOFTWARE.
  */
 
-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.  For
- completeness, we mention the license of the code here anyway.  For
- example quoting 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
-
 Files: debian/*
-Copyright: Copyright 2005-2012, Simon Josefsson <address@hidden>
-Copyright: Copyright 2005-2008, Russ Allbery <address@hidden>
-Copyright: Copyright 2009, Petter Reinholdtsen <address@hidden>
-License: GPL-3+
-    The package files were written by Simon Josefsson, Russ Allbery,
-    and Petter Reinholdtsen and are copyright 2005, 2006, 2007, 2008,
-    2009, 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 3 can be found in the file
+Copyright: Copyright 2005-2013 Simon Josefsson <address@hidden>
+Copyright: Copyright 2005-2008 Russ Allbery <address@hidden>
+Copyright: Copyright 2009 Petter Reinholdtsen <address@hidden>
+License: GPL-3+
+ The package files were written by Simon Josefsson, Russ Allbery, and
+ Petter Reinholdtsen 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 3 can be found in the file
     `/usr/share/common-licenses/GPL-3'.
-
-Remaining files are generated by autoconf, automake, libtool, gettext,
-etc and are not discussed further.