r11539 - packages/trunk/xmahjongg/debian

Tue Nov 30 15:44:59 UTC 2010

Author: roam-guest
Date: 2010-11-30 15:44:57 +0000 (Tue, 30 Nov 2010)
New Revision: 11539

Modified:
   packages/trunk/xmahjongg/debian/changelog
   packages/trunk/xmahjongg/debian/copyright
Log:
Update the copyright file a bit.


Modified: packages/trunk/xmahjongg/debian/changelog
===================================================================

--- packages/trunk/xmahjongg/debian/changelog	2010-11-30 15:36:33 UTC (rev 11538)
+++ packages/trunk/xmahjongg/debian/changelog	2010-11-30 15:44:57 UTC (rev 11539)
@@ -5,6 +5,11 @@
     - drop the quilt dependency
     - drop the README.source file
   * Bump Standards-Version to 3.9.1 with no changes.
+  * Update the copyright file a bit:
+    - convert it to the latest DEP 5 revision (header, no Author fields)
+    - break out the licenses' text into separate sections
+    - change the short name of the GIF files' license (not quite GPL-2+)
+    - bump the year on my copyright notice.
 
  -- Peter Pentchev <roam at ringlet.net>  Mon, 29 Nov 2010 17:18:09 +0200
 

Modified: packages/trunk/xmahjongg/debian/copyright
===================================================================
--- packages/trunk/xmahjongg/debian/copyright	2010-11-30 15:36:33 UTC (rev 11538)
+++ packages/trunk/xmahjongg/debian/copyright	2010-11-30 15:44:57 UTC (rev 11539)
@@ -1,44 +1,20 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?recall=184
-Upstream-Name: xmahjongg
-Upstream-Source: http://www.lcdf.org/xmahjongg/
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: xmahjongg
+Maintainer: Eddie Kohler <eddietwo at lcs.mit.edu>
+Source: http://www.lcdf.org/xmahjongg/
 
 Files: *
-Author: Eddie Kohler <eddietwo at lcs.mit.edu>
 Copyright: Copyright (C) 1993-2000 Eddie Kohler.
 License: GPL-2+
-  (the following is an excerpt from the README file)
-  .
-  All source code is Copyright (C) 1993-2000 Eddie Kohler.
-  .
-  This package is distributed under the GNU General Public License, Version
-  2, or, at your discretion, any later version. The GNU General Public License
-  is available via the Web at <http://www.gnu.org/copyleft/gpl.html>. The GPL
-  is designed to allow you to alter and redistribute the package, as long as
-  you do not remove that freedom from others.
-  .
-  On Debian systems, the complete text of the GNU General Public License
-  can be found in file "/usr/share/common-licenses/GPL-2".
 
 Files: liblcdf/clp.c include/lcdf/clp.h
-Author: Eddie Kohler <kohler at cs.ucla.edu>
 Copyright: Copyright (c) 1997-2005 Eddie Kohler, kohler at cs.ucla.edu
 License: MIT
-  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, subject to the conditions
-  listed in the Click LICENSE file, which is available in full at
-  http://www.pdos.lcs.mit.edu/click/license.html. The conditions include: you
-  must preserve this copyright notice, and you cannot mention the copyright
-  holders in advertising related to the Software without their permission.
-  The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
-  notice is a summary of the Click LICENSE file; the license in that file is
-  legally binding.
 
 Files: liblcdf/giffunc.c liblcdf/gifread.c liblcdf/gifx.c
        include/gif.h include/gifx.h
-Author: Eddie Kohler <eddietwo at lcs.mit.edu>
 Copyright: Copyright (C) 1997-9 Eddie Kohler, eddietwo at lcs.mit.edu
-Licnese: GPL-2+
+Licnese: GIF-GPL-2+
   This file is part of the GIF library.
   .
   The GIF library is free software*. It is distributed under the GNU General
@@ -55,92 +31,38 @@
   can be found in file "/usr/share/common-licenses/GPL-2".
 
 Files: liblcdf/permstr.cc include/lcdf/permstr.hh
-Author: Eddie Kohler <eddietwo at lcs.mit.edu>
 Copyright: Copyright (c) 1998-2004 Eddie Kohler
 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 complete text of the GNU General Public License
-  can be found in file "/usr/share/common-licenses/GPL-2".
 
 Files: liblcdf/straccum.cc liblcdf/string.cc
        include/lcdf/straccum.hh include/lcdf/string.hh
-Author: Eddie Kohler <eddietwo at lcs.mit.edu>
 Copyright: Copyright (c) 1999-2000 Massachusetts Institute of Technology
            Copyright (c) 2001-2005 Eddie Kohler
 License: MIT
-  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, subject to the conditions
-  listed in the Click LICENSE file. These conditions include: you must
-  preserve this copyright notice, and you cannot mention the copyright
-  holders in advertising related to the Software without their permission.
-  The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
-  notice is a summary of the Click LICENSE file; the license in that file is
-  legally binding.
 
 Files: liblcdf/vectorv.cc
-Author: Eddie Kohler <eddietwo at lcs.mit.edu>
 Copyright: Copyright (c) 1999-2004 Massachusetts Institute of Technology
 License: MIT
-  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, subject to the conditions
-  listed in the Click LICENSE file. These conditions include: you must
-  preserve this copyright notice, and you cannot mention the copyright
-  holders in advertising related to the Software without their permission.
-  The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
-  notice is a summary of the Click LICENSE file; the license in that file is
-  legally binding.
 
 Files: include/lcdf/vector.cc include/lcdf/vector.hh
-Author: Eddie Kohler <eddietwo at lcs.mit.edu>
 Copyright: Copyright (c) 1999-2000 Massachusetts Institute of Technology
            Copyright (c) 2001-2003 International Computer Science Institute
 License: MIT
-  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, subject to the conditions
-  listed in the Click LICENSE file. These conditions include: you must
-  preserve this copyright notice, and you cannot mention the copyright
-  holders in advertising related to the Software without their permission.
-  The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
-  notice is a summary of the Click LICENSE file; the license in that file is
-  legally binding.
 
 Files: share/tiles/dorothys.gif
-Author: Dorothy Robinson <mokuren at teleport.com>
-Copyright: Copyright (c) 2000  Dorothy Robinson
+Copyright: Copyright (c) 2000  Dorothy Robinson <mokuren at teleport.com>
 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 complete text of the GNU General Public License
-  can be found in file "/usr/share/common-licenses/GPL-2".
 
 Files: share/tiles/dorwhite.gif
-Author: Dorothy Robinson <mokuren at teleport.com>
-Copyright: Copyright (c) 1988  Dorothy Robinson
+Copyright: Copyright (c) 1988  Dorothy Robinson <mokuren at teleport.com>
 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 complete text of the GNU General Public License
-  can be found in file "/usr/share/common-licenses/GPL-2".
 
 Files: debian/*
-Author: Dave Swegen <dsw at debian.org>
-        Peter Pentchev <roam at ringlet.net>
-Copyright: Copyright (C) 1998-2005  Dave Swegen
-           Copyright (C) 2009  Peter Pentchev
+Copyright: Copyright (C) 1998-2005  Dave Swegen <dsw at debian.org>
+           Copyright (C) 2009, 2010  Peter Pentchev <roam at ringlet.net>
 License: GPL-2+
+
+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
@@ -148,3 +70,14 @@
   .
   On Debian systems, the complete text of the GNU General Public License
   can be found in file "/usr/share/common-licenses/GPL-2".
+
+License: MIT
+  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, subject to the conditions
+  listed in the Click LICENSE file. These conditions include: you must
+  preserve this copyright notice, and you cannot mention the copyright
+  holders in advertising related to the Software without their permission.
+  The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
+  notice is a summary of the Click LICENSE file; the license in that file is
+  legally binding.


