The following commit has been merged in the master branch:
commit 5fd774732060b0f7ee8ada958ec8bfcf84242656
Author: David Paleino da...@debian.org
Date: Sat Jan 19 14:52:21 2013 +0100
Updated debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 6bdd6f2..1314b3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
josm (0.0.svn5608+dfsg1-2) UNRELEASED; urgency=low
* Updated manpage (Closes: #696692).
+ * Updated debian/copyright.
- -- David Paleino da...@debian.org Thu, 27 Dec 2012 11:06:15 +0100
+ -- David Paleino da...@debian.org Sat, 19 Jan 2013 14:52:12 +0100
josm (0.0.svn5608+dfsg1-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index e05ec5b..a50a10b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -98,6 +98,13 @@ Files:
src/org/openstreetmap/josm/data/projection/Ellipsoid.java
Copyright: © 2002, Johan Montagnat jo...@creatis.insa-lyon.fr
License: GPL-3+
+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.
+License: LGPL-2.1+
+
Files: src/org/openstreetmap/josm/io/NmeaReader.java
Copyright: © 2008, Christoph Brill
License: GPL-3+
@@ -110,6 +117,10 @@ Files: src/org/openstreetmap/josm/data/osm/TigerUtils.java
Copyright: © 2007, David Hansen
License: GPL-3+
+Files: src/org/openstreetmap/josm/data/validation/util/Entities.java
+Copyright: ©, Apache Software Foundation
+License: Apache-2.0
+
Files: src/org/openstreetmap/josm/gui/ScrollViewport.java
Copyright: © 2007, Christian Gallioz
License: GPL-3+
@@ -217,6 +228,15 @@ Copyright: © 2009, Rosetta Contributors and Canonical Ltd
2009
© 2009, Chao-Hsiung Liao j_h_l...@yahoo.com.tw
License: GPL-3+
+Files: i18n/convplugin.pl
+ i18n/convpreset.pl
+ i18n/convstyle.pl
+ i18n/convsurveyor.pl
+ i18n/convvalidator.pl
+ i18n/convwms.pl
+Copyright: Dirk Stöcker openstreet...@dstoecker.de
+License: PD
+
License: BSD-3
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -276,3 +296,21 @@ License: LGPL-2.1+
On Debian systems, the complete text of the GNU Lesser General Public License
can be found in `/usr/share/common-licenses/LGPL-2.1'.
+License: Apache-2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the License); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License can be found
+ in `/usr/share/common-licenses/Apache-2.0'.
--
Editor for OpenStreetMap
___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
