[josm] 06/10: Update copyright file.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Mar 1 21:39:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 9b5201adf61c59ba8863f2f84e5773d57573277a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Mar 1 07:42:50 2016 +0100
Update copyright file.
Changes:
- Add license & copyright for test validation routines
- Drop © character from copyright statements
---
debian/changelog | 3 ++
debian/copyright | 86 +++++++++++++++++++++++++++++++-------------------------
2 files changed, 51 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 239adbe..59b4eb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ josm (0.0.svn9900+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
* Update Vcs-Git URL to use HTTPS.
* Bump Standards-Version to 3.9.7, no changes.
+ * Update copyright file, changes:
+ - Add license & copyright for test validation routines
+ - Drop © character from copyright statements
-- Bas Couwenberg <sebastic at debian.org> Tue, 01 Mar 2016 06:34:35 +0100
diff --git a/debian/copyright b/debian/copyright
index 6443e20..2715071 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,23 +12,23 @@ Comment: JOSM, and all its integral parts, are released under GPL-2+.
an integral part of JOSM and may be under any license.
Files: *
-Copyright: © Immanuel Scholz <imi at eigenheimstrasse.de>
- © Stefan Breunig
- © David Earl <david at frankieandshadow.com>
- © Gabriel Ebner <ge at gabrielebner.at>
- © Dave Hansen
- © Paul Hartmann
- © Karl Guggisberg
- © Matthias Julius
- © Alexei Kasatkin
- © Jiri Klement
- © Ulf Lamping <ulf.lamping at web.de>
- © Simon Legner
- © Raphael Mack <ramack at raphael-mack.de>
- © Upliner Mikhalych
- © Vincent Privat <vincent at josm.openstreetmap.de>
- © Frederik Ramm <frederik at remote.org>
- © Dirk Stöcker <openstreetmap at dstoecker.de>
+Copyright: Immanuel Scholz <imi at eigenheimstrasse.de>
+ Stefan Breunig
+ David Earl <david at frankieandshadow.com>
+ Gabriel Ebner <ge at gabrielebner.at>
+ Dave Hansen
+ Paul Hartmann
+ Karl Guggisberg
+ Matthias Julius
+ Alexei Kasatkin
+ Jiri Klement
+ Ulf Lamping <ulf.lamping at web.de>
+ Simon Legner
+ Raphael Mack <ramack at raphael-mack.de>
+ Upliner Mikhalych
+ Vincent Privat <vincent at josm.openstreetmap.de>
+ Frederik Ramm <frederik at remote.org>
+ Dirk Stöcker <openstreetmap at dstoecker.de>
Comment: JOSM was originally designed and coded by Immanuel Scholz,
and is now maintained by the OpenStreetMap community.
.
@@ -63,15 +63,15 @@ Comment: JOSM was originally designed and coded by Immanuel Scholz,
License: GPL-2+
Files: debian/*
-Copyright: © 2008, Petter Reinholdtsen <pere at debian.org>
- © 2008-2009, Andreas Putzo <andreas at putzo.net>
- © 2009-2011, Giovanni Mascellani <gio at debian.org>
- © 2010-2014, David Paleino <dapal at debian.org>
+Copyright: 2008, Petter Reinholdtsen <pere at debian.org>
+ 2008-2009, Andreas Putzo <andreas at putzo.net>
+ 2009-2011, Giovanni Mascellani <gio at debian.org>
+ 2010-2014, David Paleino <dapal at debian.org>
License: GPL-3+
Files: data/validator/opening_hours.js
-Copyright: © 2012-2013, Dmitry Marakasov
- © 2013-2014, Robin `ypid` Schneider
+Copyright: 2012-2013, Dmitry Marakasov
+ 2013-2014, Robin `ypid` Schneider
License: BSD-2-Clause
Files: src/com/drew/*
@@ -80,8 +80,8 @@ Copyright: 2002-2015, Drew Noakes
License: Apache-2.0
Files: src/gnu/*
-Copyright: © 1987-1997, Free Software Foundation, Inc.
- © 1998, Aaron M. Renn <arenn at urbanophile.com>
+Copyright: 1987-1997, Free Software Foundation, Inc.
+ 1998, Aaron M. Renn <arenn at urbanophile.com>
License: LGPL-2.1+
Files: src/org/apache/commons/jcs/*
@@ -89,14 +89,14 @@ Copyright: 2001-2015, The Apache Software Foundation.
License: Apache-2.0
Files: src/org/openstreetmap/josm/data/projection/Ellipsoid.java
-Copyright: © 2002, Johan Montagnat <johan at creatis.insa-lyon.fr>
+Copyright: 2002, Johan Montagnat <johan at creatis.insa-lyon.fr>
License: GPL-2+
Files: src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
-Copyright: © 2003, Objectix Pty Ltd.
+Copyright: 2003, Objectix Pty Ltd.
License: LGPL-2.1+
Files: src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -105,11 +105,11 @@ Files: src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java
src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
src/org/openstreetmap/josm/data/validation/util/Entities.java
-Copyright: ©, Apache Software Foundation
+Copyright: Apache Software Foundation
License: Apache-2.0
Files: src/org/openstreetmap/josm/gui/FileDrop.java
-Copyright: ©, Robert Harder
+Copyright: Robert Harder
License: PD
code from: http://iharder.sourceforge.net/current/java/filedrop/
(public domain) with only very small additions
@@ -121,25 +121,25 @@ License: PD
the files, move the Java packages, whatever you want.
Files: src/org/openstreetmap/josm/io/remotecontrol/DNSName.java
-Copyright: © 1997, 2010, Oracle and/or its affiliates.
+Copyright: 1997, 2010, Oracle and/or its affiliates.
License: GPL-2+
Files: src/org/openstreetmap/josm/tools/Diff.java
-Copyright: © 2000, Business Management Systems, Inc.
+Copyright: 2000, Business Management Systems, Inc.
License: GPL-1+
Files: src/org/openstreetmap/josm/tools/AlphanumComparator.java
-Copyright: ©, Daniel Migowski, Andre Bogus, and David Koelle and others
+Copyright: Daniel Migowski, Andre Bogus, and David Koelle and others
License: LGPL-2.1+
Files: src/org/jdesktop/*
src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
-Copyright: © 2004, Sun Microsystems, Inc.
+Copyright: 2004, Sun Microsystems, Inc.
License: LGPL-2.1+
Files: src/javax/json/*
src/org/glassfish/json/*
-Copyright: © 2011-2013, Oracle and/or its affiliates
+Copyright: 2011-2013, Oracle and/or its affiliates
Comment: The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
and Distribution License("CDDL") (collectively, the "License"). You
@@ -176,16 +176,16 @@ Comment: The contents of this file are subject to the terms of either the GNU
License: GPL-2 with Classpath exception or CDDL-1.1
Files: i18n/po/*.po
-Copyright: © 2006-2013, 2015, Rosetta Contributers
- © 2006-2013, 2015, Canonical Ltd
+Copyright: 2006-2013, 2015, Rosetta Contributers
+ 2006-2013, 2015, Canonical Ltd
License: BSD-3-Clause
Files: i18n/po/en_GB.po
-Copyright: © 2006, Immanuel Scholz
+Copyright: 2006, Immanuel Scholz
License: BSD-3-Clause
Files: i18n/po/tr.po
-Copyright: © 2009, ikinokta
+Copyright: 2009, ikinokta
License: BSD-3-Clause
Files: i18n/convcss.pl
@@ -199,6 +199,16 @@ Copyright: Dirk Stöcker <openstreetmap at dstoecker.de>
License: public-domain
Public domain, no rights reserved.
+Files: test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java
+ test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java
+ test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java
+ test/unit/org/openstreetmap/josm/data/validation/routines/InetAddressValidatorTest.java
+ test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java
+ test/unit/org/openstreetmap/josm/data/validation/routines/ResultPair.java
+ test/unit/org/openstreetmap/josm/data/validation/routines/UrlValidatorTest.java
+Copyright: Apache Software Foundation
+License: Apache-2.0
+
License: BSD-2-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git
More information about the Pkg-grass-devel
mailing list