r13521 - packages/trunk/desmume/debian

[Evgeni Golov]

Author: evgeni
Date: 2012-05-01 12:50:22 +0000 (Tue, 01 May 2012)
New Revision: 13521

Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/copyright
Log:
Update debian/copyright for latest format spec



Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2012-05-01 12:22:17 UTC (rev 13520)
+++ packages/trunk/desmume/debian/changelog	2012-05-01 12:50:22 UTC (rev 13521)
@@ -10,8 +10,9 @@
   * Update debian/copyright
   * Add 01_use_system_tinyxml.patch to link against the system tinyxml.
     + Also add libtinyxml-dev to Build-Depends
+  * Update debian/copyright for latest format spec
 
- -- Evgeni Golov <evgeni at debian.org>  Tue, 01 May 2012 14:10:26 +0200
+ -- Evgeni Golov <evgeni at debian.org>  Tue, 01 May 2012 14:49:43 +0200
 
 desmume (0.9.7-2.1) unstable; urgency=low
 

Modified: packages/trunk/desmume/debian/copyright
===================================================================
--- packages/trunk/desmume/debian/copyright	2012-05-01 12:22:17 UTC (rev 13520)
+++ packages/trunk/desmume/debian/copyright	2012-05-01 12:50:22 UTC (rev 13521)
@@ -1,4 +1,4 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: DeSmuME
 Upstream-Contact: Guillaume Duhamel <guillaume at yabause.org>
 Source: http://www.desmume.org
@@ -20,7 +20,8 @@
            2006-2011 adelikat
 License: GPL-2+
 
-Files: src/{common.cpp,GPU_osd.cpp,windows/inputdx.cpp,rtc.cpp,cflash.cpp,MMU.cpp}
+Files: src/common.cpp src/GPU_osd.cpp src/windows/inputdx.cpp 
+ src/rtc.cpp src/cflash.cpp src/MMU.cpp
 Copyright: 2006-2011 Guillaume Duhamel
            2006-2011 Normmatt
            2006-2011 Bernat Muñoz (shash)
@@ -38,26 +39,34 @@
            2006 yopyop
 License: GPL-2+
 
-Files: src/{SPU.cpp,sndsdl.cpp,windows/snddx.cpp}
+Files: src/SPU.cpp src/sndsdl.cpp src/windows/snddx.cpp
 Copyright: 2005-2007 Theo Berkau
 License: GPL-2+
 
-Files: src/{fs-linux.cpp,debug.cpp,ROMReader.cpp,fs-windows.cpp}
+Files: src/fs-linux.cpp src/debug.cpp src/ROMReader.cpp src/fs-windows.cpp
 Copyright: 2006-2011 Guillaume Duhamel
 License: GPL-2+
 
-Files: src/gtk-glade/{keyval_names.cpp,gdk_gl.cpp},
- src/gtk-glade/dTools/{callbacks_2_memview.cpp,callbacks_4_tileview.cpp,callbacks_3_palview.cpp}
+Files: src/gtk-glade/keyval_names.cpp src/gtk-glade/gdk_gl.cpp
+ src/gtk-glade/dTools/callbacks_2_memview.cpp 
+ src/gtk-glade/dTools/callbacks_4_tileview.cpp 
+ src/gtk-glade/dTools/callbacks_3_palview.cpp
 Copyright: 2007 Damien Nozay (damdoum) <damdoum at users.sourceforge.net>
 License: GPL-2+
 
-Files: src/gtk-glade/{main.cpp,callbacks.cpp,callbacks_IO.cpp,dTools/callbacks_1_ioregs.cpp}
+Files: src/gtk-glade/main.cpp src/gtk-glade/callbacks.cpp 
+ src/gtk-glade/callbacks_IO.cpp 
+ src/gtk-glade/dTools/callbacks_1_ioregs.cpp
 Copyright: 2007 Damien Nozay (damdoum) <damdoum at users.sourceforge.net>
            2007 Pascal Giard (evilynux)
 License: GPL-2+
 
-Files: src/{bios.cpp,thumb_instructions.cpp,NDSSystem.cpp,cp15.cpp,armcpu.cpp,Disassembler.cpp},
- src/windows/{palView.cpp,disView.cpp,memView.cpp,mapView.cpp,IORegView.cpp,oamView.cpp,tileView.cpp,ginfo.cpp,CWindow.cpp}
+Files: src/bios.cpp src/thumb_instructions.cpp src/NDSSystem.cpp 
+ src/cp15.cpp src/armcpu.cpp src/Disassembler.cpp
+ src/windows/palView.cpp src/windows/disView.cpp 
+ src/windows/memView.cpp src/windows/mapView.cpp 
+ src/windows/IORegView.cpp src/windows/oamView.cpp 
+ src/windows/tileView.cpp src/windows/ginfo.cpp src/windows/CWindow.cpp
 Copyright: 2006 yopyop
 License: GPL-2+
 
@@ -65,7 +74,7 @@
 Copyright: 2007 Normmatt
 License: GPL-2+
 
-Files: src/{render3D.cpp,matrix.cpp,windows/AboutBox.cpp}
+Files: src/render3D.cpp src/matrix.cpp src/windows/AboutBox.cpp
 Copyright: 2006-2011 shash
 License: GPL-2+
 
@@ -73,22 +82,24 @@
 Copyright: 2007 Pascal Giard
 License: GPL-2+
 
-Files: src/windows/throttle.cpp, src/utils/xstring.cpp
+Files: src/windows/throttle.cpp src/utils/xstring.cpp
 Copyright: 2002 Xodnizel
 License: GPL-2+
  Please note: the files do not have a license header,
  but you can find them in fceux-2.0.3.src.tar.bz2 on
  http://fceultra.sourceforge.net where it says it's GPL-2+.
 
-Files: src/gtk{,-glade}/gdk_3Demu.cpp
+Files: src/gtk/gdk_3Demu.cpp src/gtk-glade/gdk_3Demu.cpp
 Copyright: 2006-2007 Ben Jaques
 License: GPL-2+
 
-Files: src/{FIFO.cpp,arm_instructions.cpp,OGLRender.cpp}
-Copyright: 2006-2007 shash / 2006 yopyop
+Files: src/FIFO.cpp src/arm_instructions.cpp src/OGLRender.cpp
+Copyright: 2006-2007 shash
+Copyright: 2006 yopyop
 License: GPL-2+
 
-Files: src/windows/{lightView.cpp,matrixView.cpp,colorctrl.cpp}
+Files: src/windows/lightView.cpp src/windows/matrixView.cpp 
+ src/windows/colorctrl.cpp
 Copyright: 2007 Acid Burn
 License: GPL-2+
 
@@ -136,19 +147,24 @@
 Copyright: 2002-2004, Yves Berquin <yvesb at users.sourceforge.net>
 License: ZLIB
 
-Files: src/gdbstub/gdbstub.cpp
-Copyright: none, Public Domain, written by Ben Jaques
-License: PD
+Files: src/gdbstub/gdbstub.cpp src/gdbstub/gdbstub_internal.h
+Copyright: 2006 Ben Jaques
+License: MIT
 
+Files: src/gdbstub.h
+Copyright: 2006 Ben Jaques
+License: GPL-2+
+
 Files: src/gtk-glade/glade-xml.cpp
 Copyright: 1998-2002  James Henstridge <james at daa.com.au>
 License: LGPL-2+
 
-Files: src/utils/decrypt/{header.*,decrypt.*,crc.*}
+Files: src/utils/decrypt/header.* src/utils/decrypt/decrypt.* src/utils/decrypt/crc.*
 Copyright: 2005-2006 Rafael Vuijk
 License: GPL-2+
 
-Files: src/windows/{aviout.cpp,ogl.cpp}, src/utils/guid.cpp, src/{movie.cpp,readwrite.cpp}
+Files: src/windows/aviout.cpp src/windows/ogl.cpp src/utils/guid.cpp
+ src/movie.cpp src/readwrite.cpp
 Copyright: 2006-2011 Zeromus
 License: GPL-2+
 
@@ -182,11 +198,15 @@
 Files: debian/*
 Copyright: 2007-2009 Reinhard Tartler <siretart at tauware.de> 
            2007-2009 Pascal Giard <pascal at debian.org>
-           2008-2011 Evgeni Golov <evgeni at debian.org>
+           2008-2012 Evgeni Golov <evgeni at debian.org>
 License: GPL-2+
 
-License: GPL-2+ | GPL-any
+License: GPL-2+
  On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in the '/usr/share/common-licenses/GPL-2' file.
+
+License: GPL-any
+ On Debian systems, the complete text of the GNU General Public License
  can be found in the '/usr/share/common-licenses/GPL' file.
 
 License: LGPL-2+
@@ -238,3 +258,23 @@
  3. This notice may not be removed or altered from any source
  distribution.
 
+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, including without limitation the rights to use, copy, 
+ modify, merge, publish, distribute, sublicense, and/or sell copies 
+ of the Software, and to permit persons to whom the Software is 
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be 
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+ SOFTWARE.