[DebianGIS-dev] r2395 - packages/josm/trunk/debian

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2009-08-11 14:03:59 +0000 (Tue, 11 Aug 2009)
New Revision: 2395

Modified:
   packages/josm/trunk/debian/copyright
Log:
debian/copyright updated, after having cleared out upstream that JOSM as a whole
can be considered under GPL-3+


Modified: packages/josm/trunk/debian/copyright
===================================================================
--- packages/josm/trunk/debian/copyright	2009-08-09 08:28:25 UTC (rev 2394)
+++ packages/josm/trunk/debian/copyright	2009-08-11 14:03:59 UTC (rev 2395)
@@ -17,14 +17,14 @@
            Copyright (c) 2007-2008 David Earl <david at frankieandshadow.com>
            Copyright (c) 2007-2008 Ulf Lamping <ulf.lamping at web.de>
            Copyright (c) 2007-2008 Raphael Mack <ramack at raphael-mack.de>
-License: GPL-2+
+License: GPL-3+
  Josm is distributed under the GPL, version 2 or later.  On Debian GNU/Linux
- systems, the complete text of the GNU General Public License Version 2 can be
- found in `/usr/share/common-licenses/GPL-2'.
+ systems, the complete text of the GNU General Public License Version 3 can be
+ found in `/usr/share/common-licenses/GPL-3'.
 
 Files: src/org/openstreetmap/gui/*
 Copyright: Copyright (c) 2008 Jan Peter Stotz
-License: GPL-2
+License: GPL-3+
 
 File: src/org/apache/*
 Copyright: Copyright 2000-2008 Apache Foundation
@@ -54,10 +54,10 @@
 Copyright: Copyright (c) 2007-2009 Andreas Putzo
            Copyright (c) 2008 Petter Reinholdtsen
            Copyright (c) 2008-2009 Giovanni Mascellani
-License: GPL-2+
+License: GPL-3+
  The Debian packaging information is under the GPL, version 2 or later.  On
  Debian GNU/Linux systems, the complete text of the GNU General Public License
- Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 Files: src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java
 Copyright: Copyright (c) 1994-2007 Sun Microsystems, Inc.
@@ -123,23 +123,23 @@
        src/org/openstreetmap/josm/data/projection/LambertEST.java
        src/org/openstreetmap/josm/data/projection/Lambert.java
 Copyright: Copyright (c) 2002 Johan Montagnat <johan at creatis.insa-lyon.fr>
-License: GPL-2
+License: GPL-3+
 
 Files: src/org/openstreetmap/josm/io/NmeaReader.java
 Copyright: Copyright (c) 2008 Christoph Brill
-License: GPL-2
+License: GPL-3+
 
 Files: src/org/openstreetmap/josm/data/osm/Changeset.java
 Copyright: Copyright (c) 2007 Martijn van Oosterhout
-License: GPL-2
+License: GPL-3+
 
 Files: src/org/openstreetmap/josm/data/osm/TigerUtils.java
 Copyright: Copyright (c) 2007 David Hansen
-License: GPL-2
+License: GPL-3+
 
 Files: src/org/openstreetmap/josm/gui/ScrollViewport.java
 Copyright: Copyright (c) 2007 Christian Gallioz
-License: GPL-2
+License: GPL-3+
 
 Files: src/org/openstreetmap/josm/gui/FileDrop.java
 License: PD
@@ -154,37 +154,45 @@
 
 Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
 Copyright: Copyright (c) 2007 Tim Haussmann
-License: GPL-2
+License: GPL-3+
 
-Files: i18n/po/{ar,bg,cs,da,el,es,fi,he,is,ja,nl,ru,sk,sl,sv}.po
+Files: i18n/po/{ar,bg,cs,da,el,es,et,fi,gl,he,is,ja,nb,nl,ro,ru,sk,sl,sv}.po
 Copyright: Copyright (c) 2009 Rosetta Contributers and Canonical Ltd 2009
-License: GPL-2
+License: GPL-3+
+ This file is distributed under the same license as the josm package.
 
 Files: i18n/po/de.po
 Copyright: Copyright (c) 2006,2007 Sven Anders <sven at anders-hamburg.de>
            Copyright (c) 2008 Matthias Merz <openstreetmap at merz.inka.de>
            Copyright (c) 2008, 2009 Dirk Stöcker <openstreetmap at dstoecker.de>
-License: GPL-2
+License: GPL-3+
 
 Files: i18n/po/en_GB.po
 Copyright: Copyright (c) 2006 Immanuel Scholz
-License: GPL-2
+License: GPL-3+
+ This file is distributed under the same license as the josm package.
 
 Files: i18n/po/fr.po
 Copyright: Copyright (c) 2006 Frederic Bonifas <fredericbonifas at gmail.com>
-License: GPL-2
+License: GPL-3+
 
 Files: i18n/po/it.po
 Copyright: Copyright (c) 2009 Davide Prade <davalv at alice.it> and others
-License: GPL-2
+License: GPL-3+
 
 Files: i18n/po/pl.po
 Copyright: Copyright (c) 2008 PAWEŁ MADEJ <nysander at quanteam.pl>
            Copyright (c) 2008 Nabuchodonozor <nabuchodonozor.2nd at gmail.com>
            Copyright (c) 2008 MARCIN FLORYAN <mfloryan at mmsqaure.com>
-License: GPL-2
+License: GPL-3+
 
 Files: i18n/po/tr.po
 Copyright: Copyright (c) 2009 ikinokta
            Copyright (c) 2009 Cezmi Topaloğlu <cezmi.topaloglu at ikinokta.com>
-License: GPL-2
+License: GPL-3+
+
+Files: i18n/po/zh_TW.po
+Copyright: Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+           Copyright (c) 2009 Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>
+License: GPL-3+
+ This file is distributed under the same license as the josm package.