The following commit has been merged in the master branch:
commit 34cca073bf0882a193f3f01dc4f9071a5ad3f193
Author: Stephen Kitt <st...@sk2.org>
Date: Sun Feb 5 08:09:56 2012 +0100
Rewrite debian/copyright, using DEP-5 and updating for 2012.
diff --git a/debian/changelog b/debian/changelog
index ce1405f..23b0d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+stella (3.5.5-1) unstable; urgency=low
+
+ * New upstream version.
+ * Rewrite debian/copyright, using DEP-5 and updating for 2012.
+
+ -- Stephen Kitt <st...@sk2.org> Sun, 05 Feb 2012 08:09:05 +0100
+
stella (3.5-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/copyright b/debian/copyright
index 6487ddd..57109af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,59 +1,134 @@
-This package was debianized first by Tom Lear <t...@ticking.accesscom.com> on
-Thu, 7 Oct 1999 08:57:16 -0700.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: stella
+Source: http://stella.sourceforge.net
+Copyright: 1995-2012 Bradford W. Mott, Stephen Anthony and the Stella Team
+License: GPL-2+
-It was adopted by Mario Iseli <ad...@marioiseli.com> on Sat, 08 Apr
-2006 18:38:25 +0200.
+Files: *
+Copyright: 1995-2012 Bradford W. Mott, Stephen Anthony and the Stella
+ Team
+License: GPL-2+
-It was adopted by Stephen Kitt <st...@sk2.org> on Sun, 09 May 2010
-18:32:41 +0200.
+Files: debian/*
+Copyright: 1998-2004 Tom Lear <t...@trap.mtview.ca.us>
+ 2006 Mario Iseli <ad...@marioiseli.com>
+ 2010-2012 Stephen Kitt <st...@sk2.org>
+License: GPL-2+
-It was downloaded from <http://stella.sourceforge.net>
+Files: src/cheat/CheatCodeDialog.* src/common/Array.hxx
+ src/common/SharedPtr.hxx src/common/Stack.hxx
+ src/debugger/gui/* src/emucore/FSNode.* src/gp2x/FSNodeGP2X.cxx
+ src/gui/* src/unix/FSNodePOSIX.cxx src/win32/FSNodeWin32.cxx
+ src/yacc/YaccParser.*
+Copyright: 2002-2004 The ScummVM project
+License: GPL-2+
-Upstream Authors: Bradford W. Mott <bwm...@acm.org>
- Stephen Anthony
- The Stella Team
+Files: src/emucore/MD5.cxx
+Copyright: 1991-1992, RSA Data Security, Inc.
+License: RSA
+ License to copy and use this software is granted provided that it is
+ identified as the "RSA Data Security, Inc. MD5 Message-Digest
+ Algorithm" in all material mentioning or referencing this software or
+ this function.
+ .
+ License is also granted to make and use derivative works provided
+ that such works are identified as "derived from the RSA Data
+ Security, Inc. MD5 Message-Digest Algorithm" in all material
+ mentioning or referencing the derived work.
+ .
+ RSA Data Security, Inc. makes no representations concerning either
+ the merchantability of this software or the suitability of this
+ software for any particular purpose. It is provided "as is" without
+ express or implied warranty of any kind.
+ .
+ These notices must be retained in any copies of any part of this
+ documentation and/or software.
-Copyright information:
+Files: src/emucore/unzip.*
+Copyright: 1998 Gilles Vollant
+License: zlib
- stella is
+Files: src/libpng/*
+Copyright: 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+ 1996-1997 Andreas Dilger
+ 1998-2012 Glenn Randers-Pehrson
+License: libpng
+ The PNG Reference Library is supplied "AS IS". The Contributing
+ Authors and Group 42, Inc. disclaim all warranties, expressed or
+ implied, including, without limitation, the warranties of
+ merchantability and of fitness for any purpose. The Contributing
+ Authors and Group 42, Inc. assume no liability for direct, indirect,
+ incidental, special, exemplary, or consequential damages, which may
+ result from the use of the PNG Reference Library, even if advised of
+ the possibility of such damage.
+ .
+ Permission is hereby granted to use, copy, modify, and distribute
+ this source code, or portions hereof, for any purpose, without fee,
+ subject to the following restrictions:
+ .
+ 1. The origin of this source code must not be misrepresented.
+ .
+ 2. Altered versions must be plainly marked as such and must not be
+ misrepresented as being the original source.
+ .
+ 3. This Copyright notice may not be removed or altered from any
+ source or altered source distribution.
+ .
+ The Contributing Authors and Group 42, Inc. specifically permit,
+ without fee, and encourage the use of this source code as a component
+ to supporting the PNG file format in commercial products. If you use
+ this source code in a product, acknowledgment is not required but
+ would be appreciated.
+ .
+ There is no warranty against interference with your enjoyment of the
+ library or against infringement. There is no warranty that our
+ efforts or the library will fulfill any of your particular purposes
+ or needs. This library is provided with all faults, and the entire
+ risk of satisfactory quality, performance, accuracy, and effort is
+ with the user.
- Copyright © 1995-2010 Bradford W. Mott, Stephen Anthony and the
- Stella Team
+Files: src/macosx/*
+Copyright: 2005-2006 Mark Grebe
+License: GPL-2+
- The following files have additional Copyright notices:
+Files: src/zlib/*
+Copyright: 1995-2010 Jean-loup Gailly and Mark Adler
+License: zlib
- src/macosx/* Copyright © 2005-2006 Mark Grebe
- src/emucore/MD5.cxx Copyright © 1991-2, RSA Data Security, Inc.
- src/zlib/* Copyright © 1995-2006 Jean-loup Gailly and
- Mark Adler
- src/emucore/unzip.* Copyright © 1998 Gilles Vollant
- src/gui/*, src/yacc/YaccParser.*, src/common/Stack.hxx,
- src/common/SharedPtr.hxx, src/common/Array.hxx,
- src/emucore/FSNode.*, src/unix/FSNodePOSIX.cxx, src/debugger/gui/*,
- src/win32/FSNodeWin32.cxx, src/cheat/CheatCodeDialog.*,
- src/gp2x/FSNodeGP2X.cxx
- Copyright © 2002-2004 The ScummVM project
+License: GPL-2+
+ This package 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.
+ .
+ This package 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+ USA.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2'.
-License:
-
- This package 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.
-
- This package 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is
- Copyright © 2010 Stephen Kitt
-and is licensed under the same terms as the packaged software (GPL
-version 2 or later).
+License: zlib
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute
+ it freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source
+ distribution.
--
Atari 2600 Emulator for SDL & the X Window System
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
