[josm] 02/02: Update copyright file, correct license from GPL-3+ to BSD-3-Clause for JOSM translations.

Fri Nov 14 19:24:29 UTC 2014

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm.

commit e8b163de75578a956394b61e415967b133f2d705
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Nov 14 20:11:47 2014 +0100

    Update copyright file, correct license from GPL-3+ to BSD-3-Clause for JOSM translations.
---
 debian/changelog |   3 +-
 debian/copyright | 102 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f50d43c..308920b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ josm (0.0.svn7643+dfsg1-2) UNRELEASED; urgency=medium
   * Update watch file to use the pkg-grass JOSM Redirector.
   * Update copyright file:
     - Add comment with the GPL-2+/GPL-3+/Apache-2.0 information from LICENSE file
-    - Correct license from GPL-3+ to GPL-2+
+    - Correct license from GPL-3+ to GPL-2+ for JOSM
     - Update JOSM contributors list
     - Add License section for GPL-2 with Classpath exception and CDDL-1.1
     - Add Files section for Glassfish JSON source using GPL-2 with Classpath
@@ -12,6 +12,7 @@ josm (0.0.svn7643+dfsg1-2) UNRELEASED; urgency=medium
     - Add Files section for openhours Javascript source using BSD-2
     - Add License section for GPL-1+
     - Add Files section for Diff source using GPL-1+
+    - Correct license from GPL-3+ to BSD-3-Clause for JOSM translations.
     (LP: #1273178)
   * Strip comments from translations, but preserve copyright header.
 
diff --git a/debian/copyright b/debian/copyright
index fed8124..270491d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -166,61 +166,18 @@ Comment: The contents of this file are subject to the terms of either the GNU
  holder.
 License: GPL-2 with Classpath exception or CDDL-1.1
 
-Files: i18n/po/ar.po
- i18n/po/bg.po
- i18n/po/cs.po
- i18n/po/da.po
- i18n/po/el.po
- i18n/po/es.po
- i18n/po/et.po
- i18n/po/fi.po
- i18n/po/gl.po
- i18n/po/he.po
- i18n/po/is.po
- i18n/po/ja.po
- i18n/po/nb.po
- i18n/po/nl.po
- i18n/po/ro.po
- i18n/po/ru.po
- i18n/po/sk.po
- i18n/po/sl.po
- i18n/po/sv.po
-Copyright: © 2009, Rosetta Contributers and Canonical Ltd 2009
-License: GPL-3+
-
-Files: i18n/po/de.po
-Copyright: © 2006-2007, Sven Anders <sven at anders-hamburg.de>
- © 2008, Matthias Merz <openstreetmap at merz.inka.de>
- © 2008-2009, Dirk Stöcker <openstreetmap at dstoecker.de>
-License: GPL-3+
+Files: i18n/po/*.po
+Copyright: © 2006-2013, Rosetta Contributers
+ © 2006-2013, Canonical Ltd
+License: BSD-3-Clause
 
 Files: i18n/po/en_GB.po
 Copyright: © 2006, Immanuel Scholz
-License: GPL-3+
-
-Files: i18n/po/fr.po
-Copyright: © 2006, Frederic Bonifas <fredericbonifas at gmail.com>
-License: GPL-3+
-
-Files: i18n/po/it.po
-Copyright: © 2009, Davide Prade <davalv at alice.it> and others
-License: GPL-3+
-
-Files: i18n/po/pl.po
-Copyright: © 2008, Paweł Madej <nysander at quanteam.pl>
- © 2008, Nabuchodonozor <nabuchodonozor.2nd at gmail.com>
- © 2008, Marcin Floryan <mfloryan at mmsqaure.com>
-License: GPL-3+
+License: BSD-3-Clause
 
 Files: i18n/po/tr.po
 Copyright: © 2009, ikinokta
- © 2009, Cezmi Topaloğlu <cezmi.topaloglu at ikinokta.com>
-License: GPL-3+
-
-Files: i18n/po/zh_TW.po
-Copyright: © 2009, Rosetta Contributors and Canonical Ltd 2009
- © 2009, Chao-Hsiung Liao <j_h_liau at yahoo.com.tw>
-License: GPL-3+
+License: BSD-3-Clause
 
 Files: i18n/convplugins.pl
  i18n/convpreset.pl
@@ -255,6 +212,35 @@ License: BSD-2-Clause
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ .
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
+ .
+   * Neither the name of the <ORGANIZATION> nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: GPL-1+
  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
@@ -264,6 +250,24 @@ License: GPL-1+
  On Debian systems, the complete text of version 1 of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-1'.
 
+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.
+ .
+ This program 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 program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
 License: GPL-2 with Classpath exception
  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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git

