[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4064-3-13-g6ea3c2e

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 6ea3c2e0e2e8000819b1d27e30fda186a4bce525
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Aug 13 23:43:23 2011 +0200

    Some work on the copyright file.

diff --git a/debian/copyright b/debian/copyright
index eaf4a94..5aea06f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,35 +31,11 @@ Files: src/org/openstreetmap/gui/jmapviewer/Coordinate.java,
 Copyright: Copyright (c) 2009 Stefan Zeller
 License: GPL-3+
 
-File: src/org/apache/*
-Copyright: Copyright 2000-2008 Apache Foundation
-License: Apache-2.0
- This file has been taken from the ANT project. The original license
- follows.
- .
- 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 full test of the Apache 2.0 license can be found
- in the `/usr/share/common-licenses/Apache-2.0' file.
-
 Files: debian/*
 Copyright: Copyright (c) 2007-2009 Andreas Putzo
            Copyright (c) 2008 Petter Reinholdtsen
-           Copyright (c) 2008-2009 Giovanni Mascellani
-           Copyright (c) 2009-2010 David Paleino
+           Copyright (c) 2008-2011 Giovanni Mascellani
+           Copyright (c) 2009-2011 David Paleino
 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
@@ -240,3 +216,6 @@ 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.
+
+Files: src/org/openstreetmap/josm/data/imagery/types/*
+X-Comment: autogenerated, TODO

-- 
Editor for OpenStreetMap